diff options
author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2014-07-08 21:27:51 +0300 |
---|---|---|
committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2014-07-08 21:27:51 +0300 |
commit | cd9b979211a9bda4568f99fecb3febc2943387e3 (patch) | |
tree | 37170219bb8b940a3623755391114163dbfe8f81 | |
parent | f69bb74c656e44bfdb70896b1bc9e18735ed1b93 (diff) |
Replace all <gst/gstfoo.h> headers with <gst/gst.h>
Fixes compilation problems with some configurations and it's
more politically correct as well, since we are not supposed
to use <gst/gstfoo.h> headers directly.
-rw-r--r-- | src/QGst/allocator.cpp | 4 | ||||
-rw-r--r-- | src/QGst/bin.cpp | 3 | ||||
-rw-r--r-- | src/QGst/bufferlist.cpp | 2 | ||||
-rw-r--r-- | src/QGst/caps.cpp | 3 | ||||
-rw-r--r-- | src/QGst/childproxy.cpp | 3 | ||||
-rw-r--r-- | src/QGst/clock.cpp | 5 | ||||
-rw-r--r-- | src/QGst/clocktime.cpp | 4 | ||||
-rw-r--r-- | src/QGst/element.cpp | 3 | ||||
-rw-r--r-- | src/QGst/elementfactory.cpp | 4 | ||||
-rw-r--r-- | src/QGst/ghostpad.cpp | 2 | ||||
-rw-r--r-- | src/QGst/memory.cpp | 7 | ||||
-rw-r--r-- | src/QGst/object.cpp | 2 | ||||
-rw-r--r-- | src/QGst/pad.cpp | 3 | ||||
-rw-r--r-- | src/QGst/parse.cpp | 2 | ||||
-rw-r--r-- | src/QGst/pipeline.cpp | 2 | ||||
-rw-r--r-- | src/QGst/pluginfeature.cpp | 2 | ||||
-rw-r--r-- | src/QGst/structure.cpp | 2 | ||||
-rw-r--r-- | src/QGst/taglist.cpp | 3 | ||||
-rw-r--r-- | src/QGst/urihandler.cpp | 3 | ||||
-rw-r--r-- | src/QGst/value.cpp | 4 |
20 files changed, 20 insertions, 43 deletions
diff --git a/src/QGst/allocator.cpp b/src/QGst/allocator.cpp index 5cad804..fc3cb89 100644 --- a/src/QGst/allocator.cpp +++ b/src/QGst/allocator.cpp @@ -16,9 +16,7 @@ */ #include "allocator.h" -#include <gst/gstobject.h> -#include <gst/gstminiobject.h> -#include <gst/gstallocator.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/bin.cpp b/src/QGst/bin.cpp index efb5ba4..eec9886 100644 --- a/src/QGst/bin.cpp +++ b/src/QGst/bin.cpp @@ -17,8 +17,7 @@ #include "bin.h" #include "pad.h" #include "../QGlib/error.h" -#include <gst/gstbin.h> -#include <gst/gstutils.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/bufferlist.cpp b/src/QGst/bufferlist.cpp index deecb8a..9a77df9 100644 --- a/src/QGst/bufferlist.cpp +++ b/src/QGst/bufferlist.cpp @@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "bufferlist.h" -#include <gst/gstbufferlist.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp index 8d2b05f..3824d82 100644 --- a/src/QGst/caps.cpp +++ b/src/QGst/caps.cpp @@ -19,8 +19,7 @@ #include "../QGlib/string_p.h" #include "objectstore_p.h" #include <QtCore/QDebug> -#include <gst/gstcaps.h> -#include <gst/gstvalue.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/childproxy.cpp b/src/QGst/childproxy.cpp index ae5d41a..faa1aaa 100644 --- a/src/QGst/childproxy.cpp +++ b/src/QGst/childproxy.cpp @@ -15,8 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "childproxy.h" -#include <gst/gstobject.h> -#include <gst/gstchildproxy.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/clock.cpp b/src/QGst/clock.cpp index 147be9a..e129c8e 100644 --- a/src/QGst/clock.cpp +++ b/src/QGst/clock.cpp @@ -18,10 +18,7 @@ #include "clock.h" #include <QtCore/QTime> -#include <glib-object.h> -#include <gst/gstconfig.h> -#include <gst/gstclock.h> -#include <gst/gstsystemclock.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/clocktime.cpp b/src/QGst/clocktime.cpp index 8fad87b..ae75d2c 100644 --- a/src/QGst/clocktime.cpp +++ b/src/QGst/clocktime.cpp @@ -18,9 +18,7 @@ #include "clocktime.h" #include <QtCore/QTime> -#include <glib-object.h> -#include <gst/gstconfig.h> -#include <gst/gstclock.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/element.cpp b/src/QGst/element.cpp index ef14aff..95b3aca 100644 --- a/src/QGst/element.cpp +++ b/src/QGst/element.cpp @@ -19,8 +19,7 @@ #include "query.h" #include "clock.h" #include "event.h" -#include <gst/gstelement.h> -#include <gst/gstutils.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/elementfactory.cpp b/src/QGst/elementfactory.cpp index 18eed85..a2b687c 100644 --- a/src/QGst/elementfactory.cpp +++ b/src/QGst/elementfactory.cpp @@ -16,9 +16,7 @@ */ #include "elementfactory.h" #include "element.h" -#include <gst/gstelement.h> -#include <gst/gstelementfactory.h> -#include <gst/gstutils.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/ghostpad.cpp b/src/QGst/ghostpad.cpp index ab2738a..e05c33e 100644 --- a/src/QGst/ghostpad.cpp +++ b/src/QGst/ghostpad.cpp @@ -15,7 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "ghostpad.h" -#include <gst/gstghostpad.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/memory.cpp b/src/QGst/memory.cpp index fa1e7eb..c3b55e3 100644 --- a/src/QGst/memory.cpp +++ b/src/QGst/memory.cpp @@ -17,12 +17,7 @@ #include "allocator.h" #include "memory.h" #include "buffer.h" - -#include <gst/gstobject.h> -#include <gst/gstminiobject.h> -#include <gst/gstallocator.h> -#include <gst/gstmemory.h> -#include <gst/gstbuffer.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/object.cpp b/src/QGst/object.cpp index c889316..f337ed3 100644 --- a/src/QGst/object.cpp +++ b/src/QGst/object.cpp @@ -16,7 +16,7 @@ */ #include "object.h" #include "../QGlib/string_p.h" -#include <gst/gstobject.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/pad.cpp b/src/QGst/pad.cpp index 73302a5..5132460 100644 --- a/src/QGst/pad.cpp +++ b/src/QGst/pad.cpp @@ -20,8 +20,7 @@ #include "query.h" #include "event.h" #include <QtCore/QDebug> -#include <gst/gstpad.h> -#include <gst/gstutils.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/parse.cpp b/src/QGst/parse.cpp index 490f5ec..354340a 100644 --- a/src/QGst/parse.cpp +++ b/src/QGst/parse.cpp @@ -17,7 +17,7 @@ #include "parse.h" #include "element.h" #include "../QGlib/error.h" -#include <gst/gstparse.h> +#include <gst/gst.h> namespace QGst { namespace Parse { diff --git a/src/QGst/pipeline.cpp b/src/QGst/pipeline.cpp index d09c727..aedfe63 100644 --- a/src/QGst/pipeline.cpp +++ b/src/QGst/pipeline.cpp @@ -17,7 +17,7 @@ #include "pipeline.h" #include "bus.h" #include "clock.h" -#include <gst/gstpipeline.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/pluginfeature.cpp b/src/QGst/pluginfeature.cpp index 053d24c..cb40a20 100644 --- a/src/QGst/pluginfeature.cpp +++ b/src/QGst/pluginfeature.cpp @@ -15,7 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "pluginfeature.h" -#include <gst/gstpluginfeature.h> +#include <gst/gst.h> namespace QGst { diff --git a/src/QGst/structure.cpp b/src/QGst/structure.cpp index cf86185..15e0247 100644 --- a/src/QGst/structure.cpp +++ b/src/QGst/structure.cpp @@ -22,7 +22,7 @@ #include "miniobject.h" #include "caps.h" #include "../QGlib/string_p.h" -#include <gst/gststructure.h> +#include <gst/gst.h> #include <QtCore/QDebug> namespace QGst { diff --git a/src/QGst/taglist.cpp b/src/QGst/taglist.cpp index caaf814..5a7a58a 100644 --- a/src/QGst/taglist.cpp +++ b/src/QGst/taglist.cpp @@ -20,8 +20,7 @@ #include "taglist.h" #include "sample.h" #include "../QGlib/string_p.h" -#include <gst/gsttaglist.h> -#include <gst/gstvalue.h> +#include <gst/gst.h> #include <QtCore/QDebug> #include <QtCore/QDate> diff --git a/src/QGst/urihandler.cpp b/src/QGst/urihandler.cpp index 86f6613..6256b41 100644 --- a/src/QGst/urihandler.cpp +++ b/src/QGst/urihandler.cpp @@ -16,8 +16,7 @@ */ #include "urihandler.h" #include "element.h" -#include <gst/gstelementfactory.h> -#include <gst/gsturi.h> +#include <gst/gst.h> #include <QtCore/QUrl> #include <QtCore/QStringList> diff --git a/src/QGst/value.cpp b/src/QGst/value.cpp index e8db72b..1e13b8f 100644 --- a/src/QGst/value.cpp +++ b/src/QGst/value.cpp @@ -20,9 +20,7 @@ #include "structure.h" #include "../QGlib/value.h" #include <cmath> -#include <gst/gstvalue.h> -#include <gst/gstminiobject.h> -#include <gst/gstdatetime.h> +#include <gst/gst.h> namespace QGlib { |