[vlmc-devel] Remove useless QUuid forward declarations.
Hugo Beauzée-Luyssen
git at videolan.org
Wed Feb 5 23:35:05 CET 2014
vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Feb 6 00:04:52 2014 +0200| [90fcf0655b8470f1519ad4c8a9558c5b5550b05c] | committer: Hugo Beauzée-Luyssen
Remove useless QUuid forward declarations.
Replace another one with the actual include, since QUuid is a class on
Qt5 but a struct on Qt4
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=90fcf0655b8470f1519ad4c8a9558c5b5550b05c
---
src/Gui/timeline/AbstractGraphicsItem.h | 3 +--
src/Gui/timeline/GraphicsEffectItem.h | 2 --
src/Renderer/ClipRenderer.h | 1 -
src/Renderer/GenericRenderer.h | 3 +--
src/Renderer/WorkflowRenderer.h | 1 -
5 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/Gui/timeline/AbstractGraphicsItem.h b/src/Gui/timeline/AbstractGraphicsItem.h
index 2f6959b..a2a63ef 100644
--- a/src/Gui/timeline/AbstractGraphicsItem.h
+++ b/src/Gui/timeline/AbstractGraphicsItem.h
@@ -24,6 +24,7 @@
#define ABSTRACTGRAPHICSITEM_H
#include <QGraphicsItem>
+#include <QUuid>
class GraphicsTrack;
class TrackWorkflow;
@@ -31,8 +32,6 @@ class TracksScene;
class TracksView;
class EffectUser;
-struct QUuid;
-
namespace Workflow
{
class Helper;
diff --git a/src/Gui/timeline/GraphicsEffectItem.h b/src/Gui/timeline/GraphicsEffectItem.h
index 3caf08f..7684365 100644
--- a/src/Gui/timeline/GraphicsEffectItem.h
+++ b/src/Gui/timeline/GraphicsEffectItem.h
@@ -29,8 +29,6 @@
class EffectUser;
class AbstractGraphicsMediaItem;
-struct QUuid;
-
class GraphicsEffectItem : public AbstractGraphicsItem
{
Q_OBJECT
diff --git a/src/Renderer/ClipRenderer.h b/src/Renderer/ClipRenderer.h
index 32a752e..889bb81 100644
--- a/src/Renderer/ClipRenderer.h
+++ b/src/Renderer/ClipRenderer.h
@@ -29,7 +29,6 @@
class Clip;
class Media;
-struct QUuid;
namespace LibVLCpp
{
diff --git a/src/Renderer/GenericRenderer.h b/src/Renderer/GenericRenderer.h
index 4016d19..ea32b52 100644
--- a/src/Renderer/GenericRenderer.h
+++ b/src/Renderer/GenericRenderer.h
@@ -35,7 +35,6 @@
class Clip;
class Media;
-struct QUuid;
namespace LibVLCpp
{
class MediaPlayer;
@@ -47,7 +46,7 @@ namespace LibVLCpp
class GenericRenderer : public EffectUser
{
Q_OBJECT
- Q_DISABLE_COPY( GenericRenderer );
+ Q_DISABLE_COPY( GenericRenderer )
protected:
explicit GenericRenderer();
diff --git a/src/Renderer/WorkflowRenderer.h b/src/Renderer/WorkflowRenderer.h
index e7b798c..99e95ea 100644
--- a/src/Renderer/WorkflowRenderer.h
+++ b/src/Renderer/WorkflowRenderer.h
@@ -33,7 +33,6 @@ class Clip;
class QWidget;
class QWaitCondition;
class QMutex;
-struct QUuid;
namespace LibVLCpp
{
More information about the Vlmc-devel
mailing list