[vlmc-devel] Media/Library: rework includes folders

[Jean-Baptiste Kempf]

vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 16:54:03 2014 +0100| [8611fea280a0c7a50a22c2976b2f6a1e64b821e8] | committer: Jean-Baptiste Kempf

Media/Library: rework includes folders

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

 src/Library/Library.cpp          |   12 ++++++------
 src/Library/Library.h            |    2 +-
 src/Library/MediaContainer.cpp   |   12 ++++++------
 src/Metadata/MetaDataManager.cpp |    4 ++--
 src/Metadata/MetaDataManager.h   |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index 528d04f..6ca39a1 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -27,13 +27,13 @@
   * It can load and unload Clips (Clip.h/Clip.cpp)
   */
 
-#include "Clip.h"
 #include "Library.h"
-#include "Media.h"
-#include "MetaDataManager.h"
-#include "SettingsManager.h"
-#include "VlmcDebug.h"
-#include "Workspace.h"
+#include "Media/Clip.h"
+#include "Media/Media.h"
+#include "Metadata/MetaDataManager.h"
+#include "Settings/SettingsManager.h"
+#include "Tools/VlmcDebug.h"
+#include "Project/Workspace.h"
 
 #include <QDomElement>
 #include <QHash>
diff --git a/src/Library/Library.h b/src/Library/Library.h
index 5ea43e8..dd1758c 100644
--- a/src/Library/Library.h
+++ b/src/Library/Library.h
@@ -30,7 +30,7 @@
 #ifndef LIBRARY_H
 #define LIBRARY_H
 
-#include "Singleton.hpp"
+#include "Tools/Singleton.hpp"
 #include "MediaContainer.h"
 
 #include <QObject>
diff --git a/src/Library/MediaContainer.cpp b/src/Library/MediaContainer.cpp
index 2d63359..7b042ba 100644
--- a/src/Library/MediaContainer.cpp
+++ b/src/Library/MediaContainer.cpp
@@ -24,14 +24,14 @@
 #include <QDomElement>
 #include <QUuid>
 
-#include "Clip.h"
 #include "Library.h"
 #include "MediaContainer.h"
-#include "Media.h"
-#include "MetaDataManager.h"
-#include "SettingsManager.h"
-#include "VlmcDebug.h"
-#include "Workspace.h"
+#include "Media/Clip.h"
+#include "Media/Media.h"
+#include "Metadata/MetaDataManager.h"
+#include "Settings/SettingsManager.h"
+#include "Tools/VlmcDebug.h"
+#include "Project/Workspace.h"
 
 MediaContainer::MediaContainer( Clip* parent /*= NULL*/ ) : m_parent( parent )
 {
diff --git a/src/Metadata/MetaDataManager.cpp b/src/Metadata/MetaDataManager.cpp
index 77131d0..110c681 100644
--- a/src/Metadata/MetaDataManager.cpp
+++ b/src/Metadata/MetaDataManager.cpp
@@ -22,8 +22,8 @@
 
 #include <QMutexLocker>
 
-#include "ISource.h"
-#include "Media.h"
+#include "Backend/ISource.h"
+#include "Media/Media.h"
 #include "MetaDataManager.h"
 
 MetaDataManager::MetaDataManager()
diff --git a/src/Metadata/MetaDataManager.h b/src/Metadata/MetaDataManager.h
index 917651a..6b4a263 100644
--- a/src/Metadata/MetaDataManager.h
+++ b/src/Metadata/MetaDataManager.h
@@ -23,7 +23,7 @@
 #ifndef METADATAMANAGER_H
 #define METADATAMANAGER_H
 
-#include "Singleton.hpp"
+#include "Tools/Singleton.hpp"
 
 #include <QThread>
 #include <QQueue>