summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-07-08 15:01:23 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-09 10:49:06 +0200
commit7af90cc93b76996f0f338c6a1285997531281e75 (patch)
tree5bcc07cf1cdcccc9b7b14ead80b3fbe46e179693 /avmedia
parent432a935d4e178b4e1e54c2ec864cb5e05bb03d9b (diff)
Add missing sal/log.hxx headers
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes. This commit adds missing headers to every file found by: grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG') to directories from a* to configmgr Change-Id: I6ea1a7f992b1f835f5bac7a725e1135abee3f85a Reviewed-on: https://gerrit.libreoffice.org/57170 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/framework/mediaitem.cxx1
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx1
-rw-r--r--avmedia/source/macavf/framegrabber.mm1
-rw-r--r--avmedia/source/quicktime/manager.mm1
-rw-r--r--avmedia/source/quicktime/player.mm2
-rw-r--r--avmedia/source/quicktime/window.mm2
-rw-r--r--avmedia/source/viewer/mediawindow.cxx1
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx1
-rw-r--r--avmedia/source/vlc/vlcframegrabber.cxx1
-rw-r--r--avmedia/source/vlc/vlcmanager.cxx1
-rw-r--r--avmedia/source/vlc/vlcuno.cxx1
-rw-r--r--avmedia/source/vlc/wrapper/Media.cxx1
12 files changed, 14 insertions, 0 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 88339aec607d..851e501e18cb 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <rtl/ustrbuf.hxx>
+#include <sal/log.hxx>
#include <ucbhelper/content.hxx>
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 598e7f6ea4c1..d42f91038a42 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -31,6 +31,7 @@
#include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
#include <rtl/string.hxx>
#include <salhelper/thread.hxx>
#include <vcl/svapp.hxx>
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index 07bf7000bbcb..fc9ef1e1cdaf 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -20,6 +20,7 @@
#include "framegrabber.hxx"
#include "player.hxx"
+#include <sal/log.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
#include <vcl/cvtgrf.hxx>
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index 735b282d07a1..4d9ab9617398 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -21,6 +21,7 @@
#include "player.hxx"
#include <tools/urlobj.hxx>
#include <osl/diagnose.h>
+#include <sal/log.hxx>
using namespace ::com::sun::star;
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index d1c44306834f..57499ba8a54a 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -23,6 +23,8 @@
#include "framegrabber.hxx"
#include "window.hxx"
+#include <sal/log.hxx>
+
using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index db3c2a6ff1ba..faf71baaedb5 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -23,6 +23,8 @@
#include "window.hxx"
#include "player.hxx"
+#include <sal/log.hxx>
+
using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 0fd10f508bca..03dadbee4fb3 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <memory>
+#include <sal/log.hxx>
#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 75c2d9a70af2..65bf3d6b8498 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -29,6 +29,7 @@
#include <algorithm>
#include <cmath>
+#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/urlobj.hxx>
#include <unotools/securityoptions.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index eedbeacf3574..99b08060b3c4 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -29,6 +29,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <tools/stream.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
#include "vlcframegrabber.hxx"
#include "vlcplayer.hxx"
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index a37622304b4f..0b61eeb7d3f7 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -11,6 +11,7 @@
#include <boost/lexical_cast.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
#include "vlcmanager.hxx"
#include "vlcplayer.hxx"
#include <wrapper/Instance.hxx>
diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx
index 774a0a2b96ec..c9f1d7da1dd4 100644
--- a/avmedia/source/vlc/vlcuno.cxx
+++ b/avmedia/source/vlc/vlcuno.cxx
@@ -19,6 +19,7 @@
#include <comphelper/processfactory.hxx>
#include <officecfg/Office/Common.hxx>
+#include <sal/log.hxx>
#include "vlccommon.hxx"
#include "vlcmanager.hxx"
diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx
index 0d8d3d17374f..9f23472d30f8 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -13,6 +13,7 @@
#include <wrapper/Instance.hxx>
#include "Types.hxx"
#include <wrapper/Common.hxx>
+#include <sal/log.hxx>
struct libvlc_instance_t;