[vlmc-devel] Tools: cleanup the includes

Jean-Baptiste Kempf git at videolan.org
Sat Mar 1 15:02:31 CET 2014


vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 15:01:02 2014 +0100| [719cfc4957309b2772ea54f6e60179f232e39208] | committer: Jean-Baptiste Kempf

Tools: cleanup the includes

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

 src/Tools/ErrorHandler.cpp           |    2 +-
 src/Tools/RendererEventWatcher.cpp   |    2 +-
 src/Tools/RendererEventWatcher.h     |    2 +-
 src/Tools/UnixBacktraceGenerator.cpp |    2 +-
 src/Tools/VlmcLogger.cpp             |    9 +++++----
 src/Tools/VlmcLogger.h               |    4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Tools/ErrorHandler.cpp b/src/Tools/ErrorHandler.cpp
index 5eb6586..0be4c3f 100644
--- a/src/Tools/ErrorHandler.cpp
+++ b/src/Tools/ErrorHandler.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "ErrorHandler.h"
+#include "Tools/ErrorHandler.h"
 
 QString
 ErrorHandler::lastError()
diff --git a/src/Tools/RendererEventWatcher.cpp b/src/Tools/RendererEventWatcher.cpp
index a5828e2..3054f2d 100644
--- a/src/Tools/RendererEventWatcher.cpp
+++ b/src/Tools/RendererEventWatcher.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "RendererEventWatcher.h"
+#include "Tools/RendererEventWatcher.h"
 
 RendererEventWatcher::RendererEventWatcher(QObject *parent) :
     QObject(parent)
diff --git a/src/Tools/RendererEventWatcher.h b/src/Tools/RendererEventWatcher.h
index 7042b22..47ee871 100644
--- a/src/Tools/RendererEventWatcher.h
+++ b/src/Tools/RendererEventWatcher.h
@@ -24,7 +24,7 @@
 #define RENDEREREVENTWATCHER_H
 
 #include <QObject>
-#include "ISourceRenderer.h"
+#include "Backend/ISourceRenderer.h"
 
 class RendererEventWatcher : public QObject, public Backend::ISourceRendererEventCb
 {
diff --git a/src/Tools/UnixBacktraceGenerator.cpp b/src/Tools/UnixBacktraceGenerator.cpp
index 4a35521..7052a75 100644
--- a/src/Tools/UnixBacktraceGenerator.cpp
+++ b/src/Tools/UnixBacktraceGenerator.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "BacktraceGenerator.h"
+#include "Tools/BacktraceGenerator.h"
 
 #include <execinfo.h>
 #include <cxxabi.h>
diff --git a/src/Tools/VlmcLogger.cpp b/src/Tools/VlmcLogger.cpp
index 3c29307..bd77439 100644
--- a/src/Tools/VlmcLogger.cpp
+++ b/src/Tools/VlmcLogger.cpp
@@ -20,15 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "SettingsManager.h"
-#include "VlmcLogger.h"
-#include "VlmcDebug.h"
-
 #include <QCoreApplication>
 #include <QDesktopServices>
 #include <QStringList>
 #include <QThread>
 
+#include "Settings/SettingsManager.h"
+#include "Tools/VlmcLogger.h"
+#include "Tools/VlmcDebug.h"
+
+
 VlmcLogger::VlmcLogger()
     : m_logFile( NULL )
     , m_backendLogLevel( Backend::IBackend::None )
diff --git a/src/Tools/VlmcLogger.h b/src/Tools/VlmcLogger.h
index 4608f8e..cfd2128 100644
--- a/src/Tools/VlmcLogger.h
+++ b/src/Tools/VlmcLogger.h
@@ -26,8 +26,8 @@
 #include <QObject>
 #include <cstdio>
 
-#include "IBackend.h"
-#include "Singleton.hpp"
+#include "Backend/IBackend.h"
+#include "Tools/Singleton.hpp"
 
 /**
  *  \warning    Do not use qDebug() qWarning() etc... from here, unless you know exactly what you're doing



More information about the Vlmc-devel mailing list