diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-03-06 18:22:36 +1100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-03-15 21:25:56 +0000 |
| commit | 90b670f5bfd95e879426b73a14c8347ae3bc80b2 (patch) | |
| tree | 56bfd101856edb75ccaa975da23ace09fe304303 /avmedia | |
| parent | 3b384f0c6e3effeeb7226798b57020b3a68b20c4 (diff) | |
vcl: move graph.[hx]xx to graphic.[hc]xx
It's IMO a bit confusing to see a "graph" header that doesn't
strictly deal with graphs, but graphics.
Backporting to 5.1 series to allow for easier backporting of
other potential hotfixes.
Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3
Reviewed-on: https://gerrit.libreoffice.org/22949
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglframegrabber.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcframegrabber.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index cd2eadf9e9a8..11dae9f54295 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -26,7 +26,7 @@ #include <gst/video/video.h> #include <gst/video/gstvideosink.h> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/bmpacc.hxx> #include <string> diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index bf54b01e042b..9d6dd04096ae 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -21,7 +21,7 @@ #include "player.hxx" #include <tools/stream.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/cvtgrf.hxx> #include <unotools/localfilehelper.hxx> diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx index 083cb60be74b..a720c8eeafd7 100644 --- a/avmedia/source/opengl/oglframegrabber.cxx +++ b/avmedia/source/opengl/oglframegrabber.cxx @@ -11,7 +11,7 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/salbtype.hxx> #include <vcl/bmpacc.hxx> diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 4aade3c89233..33170a870c19 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -13,7 +13,7 @@ #include <cppuhelper/supportsservice.hxx> #include <tools/stream.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/graphicfilter.hxx> #include <tools/urlobj.hxx> #include <vcl/opengl/OpenGLHelper.hxx> diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index e3cc4809bccb..3065637b639e 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -21,7 +21,7 @@ #include "player.hxx" #include <tools/stream.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/cvtgrf.hxx> #include <unotools/localfilehelper.hxx> diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 850b72f1cb3d..5ee29fbbe15f 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -21,7 +21,7 @@ #include <iostream> #include <osl/conditn.hxx> #include <osl/file.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/bmpacc.hxx> #include <vcl/pngread.hxx> #include <avmedia/mediawindow.hxx> diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 4d6305c8ca12..f1f811976386 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -38,7 +38,7 @@ #include <cppuhelper/supportsservice.hxx> #include <osl/file.hxx> #include <tools/stream.hxx> -#include <vcl/graph.hxx> +#include <vcl/graphic.hxx> #include <vcl/dibtools.hxx> #define AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_DirectX" |