[Libreoffice-commits] core.git: avmedia/source
Mike Kaganski
mike.kaganski at collabora.com
Mon Oct 9 10:43:34 UTC 2017
avmedia/source/avmediadummy.cxx | 2 +-
avmedia/source/framework/MediaControlBase.cxx | 8 ++++----
avmedia/source/framework/mediacontrol.cxx | 8 ++++----
avmedia/source/framework/mediaitem.cxx | 2 +-
avmedia/source/framework/mediaplayer.cxx | 6 +++---
avmedia/source/framework/mediatoolbox.cxx | 2 +-
avmedia/source/framework/modeltools.cxx | 4 ++--
avmedia/source/gstreamer/gstmanager.hxx | 2 +-
avmedia/source/gstreamer/gstplayer.hxx | 2 +-
avmedia/source/macavf/framegrabber.hxx | 2 +-
avmedia/source/macavf/manager.hxx | 2 +-
avmedia/source/macavf/player.hxx | 2 +-
avmedia/source/macavf/window.hxx | 2 +-
avmedia/source/quicktime/framegrabber.hxx | 2 +-
avmedia/source/quicktime/manager.hxx | 2 +-
avmedia/source/quicktime/player.hxx | 2 +-
avmedia/source/quicktime/window.hxx | 2 +-
avmedia/source/viewer/mediawindow.cxx | 12 ++++++------
avmedia/source/viewer/mediawindow_impl.cxx | 8 ++++----
avmedia/source/viewer/mediawindow_impl.hxx | 2 +-
avmedia/source/win/framegrabber.hxx | 2 +-
avmedia/source/win/manager.hxx | 2 +-
avmedia/source/win/player.hxx | 2 +-
avmedia/source/win/window.hxx | 2 +-
24 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit 2a64f24417a15d6963235bc0d6c836e853c9dfd1
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Mon Oct 9 09:40:18 2017 +0300
avmedia: consistently use "" and <> in include directives
Change-Id: Ic8d0dee5b0af986214dd5967400651903b84422b
Reviewed-on: https://gerrit.libreoffice.org/43269
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index 28f99d0a4dad..36793857f248 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -36,7 +36,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
-#include "mediamisc.hxx"
+#include <mediamisc.hxx>
using namespace ::com::sun::star;
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index b1998202dbe4..9b844907cbec 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -26,10 +26,10 @@
#include <svtools/miscopt.hxx>
#include <tools/time.hxx>
#include <vcl/lstbox.hxx>
-#include "bitmaps.hlst"
-#include "strings.hrc"
-#include "helpids.h"
-#include "mediamisc.hxx"
+#include <bitmaps.hlst>
+#include <strings.hrc>
+#include <helpids.h>
+#include <mediamisc.hxx>
using ::rtl::OUString;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index a50b7d236722..e7ea43d2eb4c 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "mediacontrol.hxx"
-#include "strings.hrc"
-#include "mediamisc.hxx"
+#include <mediacontrol.hxx>
+#include <strings.hrc>
+#include <mediamisc.hxx>
#include <avmedia/mediawindow.hxx>
#include <avmedia/mediaplayer.hxx>
-#include "helpids.h"
+#include <helpids.h>
#include <tools/time.hxx>
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index bbb44b5931ca..88339aec607d 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -36,7 +36,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
-#include "mediamisc.hxx"
+#include <mediamisc.hxx>
using namespace ::com::sun::star;
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index a544d5103fc0..452d1f1c1566 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -20,9 +20,9 @@
#include <avmedia/mediaplayer.hxx>
#include <avmedia/mediawindow.hxx>
#include <avmedia/mediaitem.hxx>
-#include "mediamisc.hxx"
-#include "strings.hrc"
-#include "helpids.h"
+#include <mediamisc.hxx>
+#include <strings.hrc>
+#include <helpids.h>
#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index b40c07fc3c89..bab89da6ce0d 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -19,7 +19,7 @@
#include <avmedia/mediatoolbox.hxx>
#include <avmedia/mediaitem.hxx>
-#include "mediacontrol.hxx"
+#include <mediacontrol.hxx>
#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 8addb30967e5..76d947954a3c 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -9,7 +9,7 @@
#include <avmedia/modeltools.hxx>
#include <avmedia/mediaitem.hxx>
-#include "mediamisc.hxx"
+#include <mediamisc.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
@@ -31,7 +31,7 @@
#include <config_features.h>
#if HAVE_FEATURE_COLLADA
-#include <collada_headers.hxx>
+#include "collada_headers.hxx"
#include <GLTFAsset.h>
#endif
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 24c057e3d545..2b695541d9ab 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -22,7 +22,7 @@
#include "gstcommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XManager.hpp"
+#include <com/sun/star/media/XManager.hpp>
namespace avmedia { namespace gstreamer {
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 61dc3c14cc58..58f4a02eb100 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -23,7 +23,7 @@
#include <osl/conditn.hxx>
#include "gstcommon.hxx"
-#include "com/sun/star/media/XPlayer.hpp"
+#include <com/sun/star/media/XPlayer.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 7f4681ef4364..ee1ccaac1199 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -23,7 +23,7 @@
#include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XFrameGrabber.hpp"
+#include <com/sun/star/media/XFrameGrabber.hpp>
namespace avmedia { namespace macavf {
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 7761cc7d91e9..e20385725988 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -23,7 +23,7 @@
#include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XManager.hpp"
+#include <com/sun/star/media/XManager.hpp>
namespace avmedia { namespace macavf {
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 176f6f502cea..9a42de477197 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -24,7 +24,7 @@
#include "macavfcommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XPlayer.hpp"
+#include <com/sun/star/media/XPlayer.hpp>
namespace avmedia { namespace macavf {
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 54c9038ced3a..709f35371772 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -24,7 +24,7 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include "com/sun/star/media/XPlayerWindow.hpp"
+#include <com/sun/star/media/XPlayerWindow.hpp>
@interface MyMediaView : NSView
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 2441e7538e6b..6d5c999eaf2c 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -23,7 +23,7 @@
#include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XFrameGrabber.hpp"
+#include <com/sun/star/media/XFrameGrabber.hpp>
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 113fd7728bbd..45e170d4ec10 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -23,7 +23,7 @@
#include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XManager.hpp"
+#include <com/sun/star/media/XManager.hpp>
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index f145c79fb120..5e4269cbef17 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -22,7 +22,7 @@
#include "quicktimecommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XPlayer.hpp"
+#include <com/sun/star/media/XPlayer.hpp>
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 8e2ec9f1cd16..a2f51ffb1f95 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -24,7 +24,7 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include "com/sun/star/media/XPlayerWindow.hpp"
+#include <com/sun/star/media/XPlayerWindow.hpp>
namespace avmedia { namespace quicktime {
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 304384cb2761..217e8fa7ea76 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -19,9 +19,9 @@
#include <avmedia/mediawindow.hxx>
#include "mediawindow_impl.hxx"
-#include "mediamisc.hxx"
-#include "bitmaps.hlst"
-#include "strings.hrc"
+#include <mediamisc.hxx>
+#include <bitmaps.hlst>
+#include <strings.hrc>
#include <tools/urlobj.hxx>
#include <vcl/layout.hxx>
#include <unotools/pathoptions.hxx>
@@ -29,9 +29,9 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/media/XManager.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"
+#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <memory>
#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index d5bc7a50ef63..004d56f1f7d6 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -22,10 +22,10 @@
#include <iostream>
#include "mediawindow_impl.hxx"
#include "mediaevent_impl.hxx"
-#include "mediamisc.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
-#include "helpids.h"
+#include <mediamisc.hxx>
+#include <strings.hrc>
+#include <bitmaps.hlst>
+#include <helpids.h>
#include <algorithm>
#include <cmath>
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index 68fbaeb8a0d1..2c7d8f33cc81 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -23,7 +23,7 @@
#include <svtools/transfer.hxx>
#include <vcl/syschild.hxx>
-#include "mediacontrol.hxx"
+#include <mediacontrol.hxx>
namespace com { namespace sun { namespace star { namespace media {
class XPlayer;
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 88ac4fc04674..ba496fa5b99f 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -22,7 +22,7 @@
#include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XFrameGrabber.hpp"
+#include <com/sun/star/media/XFrameGrabber.hpp>
struct IMediaDet;
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 80454708319c..8fee893f9177 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -22,7 +22,7 @@
#include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
-#include "com/sun/star/media/XManager.hpp"
+#include <com/sun/star/media/XManager.hpp>
namespace avmedia { namespace win {
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 02fb5ec8e9c8..a95445bf33a0 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -26,7 +26,7 @@
#include "wincommon.hxx"
-#include "com/sun/star/media/XPlayer.hpp"
+#include <com/sun/star/media/XPlayer.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 141c7abd6b6a..7f7da597ccd8 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -28,7 +28,7 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include "com/sun/star/media/XPlayerWindow.hpp"
+#include <com/sun/star/media/XPlayerWindow.hpp>
struct IVideoWindow;
More information about the Libreoffice-commits
mailing list