[Libreoffice-commits] core.git: avmedia/inc avmedia/IwyuFilter_avmedia.yaml avmedia/source

Gabor Kelemen (via logerrit) logerrit at kemper.freedesktop.org
Thu Jan 30 09:02:40 UTC 2020 

 avmedia/IwyuFilter_avmedia.yaml               |    9 +++++++++
 avmedia/inc/mediacontrol.hxx                  |    2 --
 avmedia/source/avmediadummy.cxx               |   14 +-------------
 avmedia/source/framework/MediaControlBase.cxx |    1 -
 avmedia/source/framework/mediacontrol.cxx     |    8 --------
 avmedia/source/framework/mediaitem.cxx        |    1 -
 avmedia/source/framework/mediaplayer.cxx      |    1 -
 avmedia/source/framework/mediatoolbox.cxx     |    3 ---
 avmedia/source/framework/soundhandler.cxx     |    3 +--
 avmedia/source/framework/soundhandler.hxx     |    3 ---
 avmedia/source/inc/mediamisc.hxx              |    1 -
 avmedia/source/viewer/mediaevent_impl.cxx     |    1 -
 avmedia/source/viewer/mediawindow.cxx         |    5 ++---
 avmedia/source/viewer/mediawindow_impl.cxx    |    8 --------
 14 files changed, 13 insertions(+), 47 deletions(-)

New commits:
commit e265037d6c655675416116b19882c3c29bb7bf40
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Fri Jan 24 00:12:52 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 30 10:02:09 2020 +0100

    tdf#42949 Fix IWYU warnings in avmedia/
    
    Except for MAC and WIN specific parts
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: I1066aa31f45a8c81ddaa7d52d7c81aa09741c8d8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87312
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/avmedia/IwyuFilter_avmedia.yaml b/avmedia/IwyuFilter_avmedia.yaml
new file mode 100644
index 000000000000..17d0a1299876
--- /dev/null
+++ b/avmedia/IwyuFilter_avmedia.yaml
@@ -0,0 +1,9 @@
+---
+assumeFilename: avmedia/source/gstreamer/gstplayer.cxx
+blacklist:
+    avmedia/source/viewer/mediawindow_impl.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    avmedia/source/viewer/mediawindow.cxx:
+    # Actually used
+    - com/sun/star/media/XPlayer.hpp
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index bdf0ce300005..9172195eea71 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -26,8 +26,6 @@
 #include <vcl/idle.hxx>
 #include <vcl/slider.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/image.hxx>
 #include <vcl/fixed.hxx>
 #include <avmedia/MediaControlBase.hxx>
 
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index ac1a59ea8a1c..6c6ada0163e9 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -20,19 +20,7 @@
 #include <avmedia/mediaitem.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/document/XStorageBasedDocument.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/uri/UriReferenceFactory.hpp>
-#include <com/sun/star/uri/XUriReference.hpp>
-#include <com/sun/star/uri/XUriReferenceFactory.hpp>
-
-#include <rtl/ustrbuf.hxx>
-
-#include <ucbhelper/content.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index 4caedac9db2b..f2e32cf7a182 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <avmedia/MediaControlBase.hxx>
-#include <avmedia/mediawindow.hxx>
 #include <avmedia/mediaplayer.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/slider.hxx>
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index e194a2296fef..43f04ce40b3e 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -21,18 +21,10 @@
 #include <strings.hrc>
 #include <mediamisc.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <avmedia/mediaplayer.hxx>
 #include <helpids.h>
-#include <tools/time.hxx>
-#include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/weld.hxx>
-#include <unotools/syslocale.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <math.h>
-#include <algorithm>
 #include <avmedia/MediaControlBase.hxx>
 
 namespace avmedia
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index d89300971664..c75900fee6b0 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <ucbhelper/content.hxx>
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 717f99369e7f..258f23ff4645 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -25,7 +25,6 @@
 #include <helpids.h>
 
 #include <svl/stritem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 8c15adbb900d..69aeb220295c 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -22,9 +22,6 @@
 #include <mediacontrol.hxx>
 
 #include <tools/debug.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
 
 #include <comphelper/propertysequence.hxx>
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 926671f64c69..cf341f7226a5 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 
-#include <rtl/ustrbuf.hxx>
-
+#include <avmedia/mediawindow.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 256b59b19ccf..43dd28abace2 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/util/URL.hpp>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <cppuhelper/weak.hxx>
 
@@ -37,8 +36,6 @@
 #include <vcl/idle.hxx>
 #include <tools/link.hxx>
 #include <toolkit/helper/mutexhelper.hxx>
-#include <avmedia/mediawindow.hxx>
-#include <osl/mutex.hxx>
 
 namespace avmedia{
 
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 99c230badbb9..873146e19807 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
 #define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
 
-#include <config_features.h>
 #include <unotools/resmgr.hxx>
 
 #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index c90d12c32729..2adae068bb7a 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "mediaevent_impl.hxx"
-#include "mediawindow_impl.hxx"
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 521c4151f98f..45c132df06a7 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -26,10 +26,9 @@
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/media/XManager.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 9d2245b0a274..c6cb20df7a36 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <iostream>
 #include "mediawindow_impl.hxx"
 #include "mediaevent_impl.hxx"
@@ -27,14 +25,12 @@
 #include <helpids.h>
 
 #include <algorithm>
-#include <cmath>
 
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <unotools/securityoptions.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
@@ -43,10 +39,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/media/XManager.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <vcl/sysdata.hxx>
-#if HAVE_FEATURE_OPENGL
-#include <vcl/opengl/OpenGLContext.hxx>
-#endif
 using namespace ::com::sun::star;
 
 namespace avmedia::priv {

More information about the Libreoffice-commits mailing list