[vlmc-devel] Gui/settings: rework includes folders
Jean-Baptiste Kempf
git at videolan.org
Sat Mar 1 16:59:56 CET 2014
vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 1 16:54:56 2014 +0100| [ceac621cd0e214d1700ef1dfb75b246dae1d1388] | committer: Jean-Baptiste Kempf
Gui/settings: rework includes folders
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=ceac621cd0e214d1700ef1dfb75b246dae1d1388
---
src/Gui/settings/BoolWidget.cpp | 2 +-
src/Gui/settings/ColorWidget.cpp | 2 +-
src/Gui/settings/DoubleSliderWidget.cpp | 2 +-
src/Gui/settings/DoubleWidget.cpp | 2 +-
src/Gui/settings/ISettingsCategoryWidget.h | 2 +-
src/Gui/settings/IntWidget.cpp | 2 +-
src/Gui/settings/KeyboardShortcut.cpp | 2 +-
src/Gui/settings/KeyboardShortcutInput.cpp | 2 +-
src/Gui/settings/LanguageWidget.cpp | 6 +++---
src/Gui/settings/PathWidget.cpp | 2 +-
src/Gui/settings/PreferenceWidget.cpp | 1 -
src/Gui/settings/PreferenceWidget.h | 2 +-
src/Gui/settings/Settings.cpp | 2 +-
src/Gui/settings/Settings.h | 2 +-
src/Gui/settings/StringWidget.cpp | 2 +-
15 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/Gui/settings/BoolWidget.cpp b/src/Gui/settings/BoolWidget.cpp
index ef047ea..e168c91 100644
--- a/src/Gui/settings/BoolWidget.cpp
+++ b/src/Gui/settings/BoolWidget.cpp
@@ -21,7 +21,7 @@
*****************************************************************************/
#include "BoolWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QCheckBox>
diff --git a/src/Gui/settings/ColorWidget.cpp b/src/Gui/settings/ColorWidget.cpp
index 05b28b5..db01949 100644
--- a/src/Gui/settings/ColorWidget.cpp
+++ b/src/Gui/settings/ColorWidget.cpp
@@ -22,7 +22,7 @@
#include "ColorWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QColorDialog>
#include <QPushButton>
diff --git a/src/Gui/settings/DoubleSliderWidget.cpp b/src/Gui/settings/DoubleSliderWidget.cpp
index b809249..3966bdb 100644
--- a/src/Gui/settings/DoubleSliderWidget.cpp
+++ b/src/Gui/settings/DoubleSliderWidget.cpp
@@ -22,7 +22,7 @@
#include "DoubleSliderWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QHBoxLayout>
#include <QLabel>
diff --git a/src/Gui/settings/DoubleWidget.cpp b/src/Gui/settings/DoubleWidget.cpp
index 57a7d6a..78d1564 100644
--- a/src/Gui/settings/DoubleWidget.cpp
+++ b/src/Gui/settings/DoubleWidget.cpp
@@ -21,7 +21,7 @@
*****************************************************************************/
#include "DoubleWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QDoubleSpinBox>
diff --git a/src/Gui/settings/ISettingsCategoryWidget.h b/src/Gui/settings/ISettingsCategoryWidget.h
index c76df70..cf98267 100644
--- a/src/Gui/settings/ISettingsCategoryWidget.h
+++ b/src/Gui/settings/ISettingsCategoryWidget.h
@@ -24,7 +24,7 @@
#ifndef ISETTINGSCATEGORYWIDGET_H
#define ISETTINGSCATEGORYWIDGET_H
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
class QVariant;
diff --git a/src/Gui/settings/IntWidget.cpp b/src/Gui/settings/IntWidget.cpp
index 7f131a5..b0ae269 100644
--- a/src/Gui/settings/IntWidget.cpp
+++ b/src/Gui/settings/IntWidget.cpp
@@ -21,7 +21,7 @@
*****************************************************************************/
#include "IntWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QSpinBox>
diff --git a/src/Gui/settings/KeyboardShortcut.cpp b/src/Gui/settings/KeyboardShortcut.cpp
index 1ba5fee..9b765cf 100644
--- a/src/Gui/settings/KeyboardShortcut.cpp
+++ b/src/Gui/settings/KeyboardShortcut.cpp
@@ -22,7 +22,7 @@
#include "KeyboardShortcut.h"
#include "KeyboardShortcutInput.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
KeyboardShortcut::KeyboardShortcut( SettingValue *s, QWidget *parent /*= NULL*/ ) :
ISettingsCategoryWidget( parent, s )
diff --git a/src/Gui/settings/KeyboardShortcutInput.cpp b/src/Gui/settings/KeyboardShortcutInput.cpp
index 98c4afb..3ff917e 100644
--- a/src/Gui/settings/KeyboardShortcutInput.cpp
+++ b/src/Gui/settings/KeyboardShortcutInput.cpp
@@ -24,7 +24,7 @@
#include <QKeySequence>
#include <QTimer>
-#include "SettingsManager.h"
+#include "Settings/SettingsManager.h"
#include "KeyboardShortcutInput.h"
KeyboardShortcutInput::KeyboardShortcutInput( const QString& name,
diff --git a/src/Gui/settings/LanguageWidget.cpp b/src/Gui/settings/LanguageWidget.cpp
index ad80890..f58c9c9 100644
--- a/src/Gui/settings/LanguageWidget.cpp
+++ b/src/Gui/settings/LanguageWidget.cpp
@@ -22,9 +22,9 @@
#include "config.h"
#include "LanguageWidget.h"
-#include "SettingsManager.h"
-#include "SettingValue.h"
-#include "VlmcDebug.h"
+#include "Settings/SettingsManager.h"
+#include "Settings/SettingValue.h"
+#include "Tools/VlmcDebug.h"
#include <QApplication>
#include <QComboBox>
diff --git a/src/Gui/settings/PathWidget.cpp b/src/Gui/settings/PathWidget.cpp
index 37571df..e77854b 100644
--- a/src/Gui/settings/PathWidget.cpp
+++ b/src/Gui/settings/PathWidget.cpp
@@ -21,7 +21,7 @@
*****************************************************************************/
#include "PathWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QEvent>
#include <QFileDialog>
diff --git a/src/Gui/settings/PreferenceWidget.cpp b/src/Gui/settings/PreferenceWidget.cpp
index f2ccc54..87fe55e 100644
--- a/src/Gui/settings/PreferenceWidget.cpp
+++ b/src/Gui/settings/PreferenceWidget.cpp
@@ -24,7 +24,6 @@
#include "ISettingsCategoryWidget.h"
#include "PreferenceWidget.h"
-#include "SettingsManager.h"
#include "BoolWidget.h"
#include "DoubleWidget.h"
diff --git a/src/Gui/settings/PreferenceWidget.h b/src/Gui/settings/PreferenceWidget.h
index e878b14..c37b71e 100644
--- a/src/Gui/settings/PreferenceWidget.h
+++ b/src/Gui/settings/PreferenceWidget.h
@@ -28,7 +28,7 @@
#include <QScrollArea>
#include <QString>
#include <QHash>
-#include "SettingsManager.h"
+#include "Settings/SettingsManager.h"
class ISettingsCategoryWidget;
class SettingValue;
diff --git a/src/Gui/settings/Settings.cpp b/src/Gui/settings/Settings.cpp
index 1d17fd6..9f40320 100644
--- a/src/Gui/settings/Settings.cpp
+++ b/src/Gui/settings/Settings.cpp
@@ -25,7 +25,7 @@
#include "Settings.h"
#include "PreferenceWidget.h"
-#include "SettingsManager.h"
+#include "Settings/SettingsManager.h"
#include "Panel.h"
#include <QAbstractButton>
diff --git a/src/Gui/settings/Settings.h b/src/Gui/settings/Settings.h
index fc667c8..76afaec 100644
--- a/src/Gui/settings/Settings.h
+++ b/src/Gui/settings/Settings.h
@@ -24,7 +24,7 @@
#ifndef SETTINGS_H
#define SETTINGS_H
-#include "SettingsManager.h"
+#include "Settings/SettingsManager.h"
#include <QDialog>
#include <QString>
diff --git a/src/Gui/settings/StringWidget.cpp b/src/Gui/settings/StringWidget.cpp
index 2f8404d..ad3b44d 100644
--- a/src/Gui/settings/StringWidget.cpp
+++ b/src/Gui/settings/StringWidget.cpp
@@ -21,7 +21,7 @@
*****************************************************************************/
#include "StringWidget.h"
-#include "SettingValue.h"
+#include "Settings/SettingValue.h"
#include <QLineEdit>
More information about the Vlmc-devel
mailing list