[vlmc-devel] Remove unused and reorder includes

[Jean-Baptiste Kempf]

vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 18:26:36 2014 +0100| [03b0005f4b1a012c19ad462bffff3f1ab77ef910] | committer: Jean-Baptiste Kempf

Remove unused and reorder includes

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=03b0005f4b1a012c19ad462bffff3f1ab77ef910
---

 src/Commands/Commands.cpp               |    1 -
 src/Commands/Commands.h                 |    2 --
 src/Commands/KeyboardShortcutHelper.cpp |    1 -
 src/EffectsEngine/EffectHelper.h        |    1 -
 src/Library/Library.h                   |    1 -
 src/Media/Media.cpp                     |    3 ++-
 src/Media/Media.h                       |    2 --
 src/Media/Transcoder.cpp                |    6 +++---
 src/Metadata/MetaDataManager.h          |    4 ++--
 9 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/Commands/Commands.cpp b/src/Commands/Commands.cpp
index 3e22338..5191e08 100644
--- a/src/Commands/Commands.cpp
+++ b/src/Commands/Commands.cpp
@@ -29,7 +29,6 @@
 #include "Workflow/ClipHelper.h"
 #include "EffectsEngine/EffectHelper.h"
 #include "EffectsEngine/EffectInstance.h"
-#include "Workflow/MainWorkflow.h"
 #include "Workflow/TrackWorkflow.h"
 
 #ifdef WITH_GUI
diff --git a/src/Commands/Commands.h b/src/Commands/Commands.h
index bd5c0b4..3d59111 100644
--- a/src/Commands/Commands.h
+++ b/src/Commands/Commands.h
@@ -30,10 +30,8 @@
 # include <QUndoCommand>
 #endif
 #include <QObject>
-#include <QVector>
 
 #include "Workflow/MainWorkflow.h"
-#include "Workflow/Types.h"
 
 class   Clip;
 class   ClipHelper;
diff --git a/src/Commands/KeyboardShortcutHelper.cpp b/src/Commands/KeyboardShortcutHelper.cpp
index 9548d4c..6c292d4 100644
--- a/src/Commands/KeyboardShortcutHelper.cpp
+++ b/src/Commands/KeyboardShortcutHelper.cpp
@@ -24,7 +24,6 @@
 
 #include "KeyboardShortcutHelper.h"
 
-#include "Settings/SettingValue.h"
 #include "Settings/SettingsManager.h"
 
 KeyboardShortcutHelper::KeyboardShortcutHelper( const QString& name, QWidget* parent ) :
diff --git a/src/EffectsEngine/EffectHelper.h b/src/EffectsEngine/EffectHelper.h
index 58e0bbe..347ca58 100644
--- a/src/EffectsEngine/EffectHelper.h
+++ b/src/EffectsEngine/EffectHelper.h
@@ -27,7 +27,6 @@ class   EffectInstance;
 class   EffectUser;
 
 #include <QObject>
-#include <QUuid>
 #include <QMetaType>
 
 #include "Workflow/Helper.h"
diff --git a/src/Library/Library.h b/src/Library/Library.h
index dd1758c..6c10ec2 100644
--- a/src/Library/Library.h
+++ b/src/Library/Library.h
@@ -34,7 +34,6 @@
 #include "MediaContainer.h"
 
 #include <QObject>
-#include <QAtomicInt>
 #include <QXmlStreamWriter>
 
 class   QDomElement;
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp
index ac02fbf..6aae126 100644
--- a/src/Media/Media.cpp
+++ b/src/Media/Media.cpp
@@ -26,6 +26,8 @@
   * It's used by the Library
   */
 
+#include <QUrl>
+
 #include "Media.h"
 
 #include "Clip.h"
@@ -35,7 +37,6 @@
 #include "Backend/ISource.h"
 #include "Backend/IBackend.h"
 
-#include <QUrl>
 
 const QString   Media::VideoExtensions = "*.avi *.3gp *.amv *.asf *.divx *.dv *.flv *.gxf "
                                          "*.iso *.m1v *.m2v *.m2t *.m2ts *.m4v *.mkv *.mov "
diff --git a/src/Media/Media.h b/src/Media/Media.h
index c0d3697..5cae489 100644
--- a/src/Media/Media.h
+++ b/src/Media/Media.h
@@ -30,9 +30,7 @@
 #define MEDIA_H__
 
 #include "config.h"
-#include <QList>
 #include <QString>
-#include <QUuid>
 #include <QObject>
 #include <QFileInfo>
 #include <QXmlStreamWriter>
diff --git a/src/Media/Transcoder.cpp b/src/Media/Transcoder.cpp
index bca8107..85ad05c 100644
--- a/src/Media/Transcoder.cpp
+++ b/src/Media/Transcoder.cpp
@@ -20,18 +20,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QFileInfo>
+
 #include "Transcoder.h"
 
 #include "Backend/ISource.h"
 #include "Backend/ISourceRenderer.h"
 #include "Media/Media.h"
 #include "Metadata/MetaDataManager.h"
-#include "NotificationZone.h"
+#include "Gui/widgets/NotificationZone.h"
 #include "Settings/SettingsManager.h"
 #include "Tools/RendererEventWatcher.h"
 
-#include <QFileInfo>
-
 Transcoder::Transcoder( Media* media )
     : m_media( media )
     , m_renderer( NULL )
diff --git a/src/Metadata/MetaDataManager.h b/src/Metadata/MetaDataManager.h
index 6b4a263..37d61cd 100644
--- a/src/Metadata/MetaDataManager.h
+++ b/src/Metadata/MetaDataManager.h
@@ -23,12 +23,12 @@
 #ifndef METADATAMANAGER_H
 #define METADATAMANAGER_H
 
-#include "Tools/Singleton.hpp"
-
 #include <QThread>
 #include <QQueue>
 #include <QMutex>
 
+#include "Tools/Singleton.hpp"
+
 class   Media;
 namespace LibVLCpp
 {