Rename file according to their classes

src/Backend/VLC/VLCBackend.cpp

@@ -25,7 +25,6 @@
 #include "VLCBackend.h"
 #include "VLCSource.h"
 #include "VLCMemorySource.h"
-#include "Settings/SettingsManager.h"
 #include "Tools/VlmcDebug.h"
 #include "Tools/VlmcLogger.h"
 

src/CMakeLists.txt

@@ -46,7 +46,7 @@ SET(VLMC_SRCS
     Services/YouTube/YouTubeFeedParser.cpp
     Services/YouTube/YouTubeService.cpp
     Services/YouTube/YouTubeUploader.cpp
-    Settings/SettingsManager.cpp
+    Settings/Settings.cpp
     Settings/SettingValue.cpp
     Tools/ErrorHandler.cpp
     Tools/MemoryPool.hpp
@@ -146,7 +146,7 @@ ELSE(NOT WITH_GUI)
         Gui/settings/Panel.cpp
         Gui/settings/PathWidget.cpp
         Gui/settings/PreferenceWidget.cpp
-        Gui/settings/Settings.cpp
+        Gui/settings/SettingsDialog.cpp
         Gui/settings/StringWidget.cpp
         Gui/timeline/AbstractGraphicsItem.cpp
         Gui/timeline/AbstractGraphicsMediaItem.cpp

src/Commands/KeyboardShortcutHelper.cpp

@@ -24,7 +24,7 @@
 
 #include "KeyboardShortcutHelper.h"
 
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 KeyboardShortcutHelper::KeyboardShortcutHelper( const QString& name, QWidget* parent ) :
         QShortcut( parent ),

src/Gui/MainWindow.cpp

@@ -53,6 +53,7 @@
 #include "WorkflowFileRendererDialog.h"
 #include "export/RendererSettings.h"
 #include "export/ShareOnInternet.h"
+#include "settings/SettingsDialog.h"
 
 /* Widgets */
 #include "DockWidgetManager.h"
@@ -68,7 +69,7 @@
 #include "project/GuiProjectManager.h"
 #include "wizard/ProjectWizard.h"
 #include "settings/Settings.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "LanguageHelper.h"
 #include "Commands/KeyboardShortcutHelper.h"
 

src/Gui/export/RendererSettings.cpp

@@ -22,7 +22,7 @@
 
 #include "Media/Media.h"
 #include "RendererSettings.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "ui_RendererSettings.h"
 
 #include <QCompleter>

src/Gui/export/ShareOnInternet.cpp

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "ShareOnInternet.h"
 #include "Tools/VlmcDebug.h"
 #include "Services/AbstractSharingService.h"

src/Gui/import/ImportController.cpp

@@ -33,7 +33,7 @@
 #include "Library/Library.h"
 #include "Media/Media.h"
 #include "Metadata/MetaDataManager.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "TagWidget.h"
 #include "Media/Transcoder.h"
 #include "Tools/VlmcDebug.h"

src/Gui/project/GuiProjectManager.cpp

@@ -26,7 +26,7 @@
 #include "Main/Project.h"
 #include "Library/Library.h"
 #include "Workflow/MainWorkflow.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Project/Workspace.h"
 
 #include "timeline/Timeline.h"

src/Gui/settings/KeyboardShortcutInput.cpp

@@ -24,7 +24,7 @@
 #include <QKeySequence>
 #include <QTimer>
 
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "KeyboardShortcutInput.h"
 
 KeyboardShortcutInput::KeyboardShortcutInput( const QString& name,

src/Gui/settings/LanguageWidget.cpp

@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "LanguageWidget.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Settings/SettingValue.h"
 #include "Tools/VlmcDebug.h"
 

src/Gui/settings/Panel.cpp

@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #include "Panel.h"
-#include "Settings.h"
+#include "SettingsDialog.h"
 
 #include <QWidget>
 #include <QVBoxLayout>

src/Gui/settings/PreferenceWidget.h

@@ -28,7 +28,7 @@
 #include <QScrollArea>
 #include <QString>
 #include <QHash>
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 class   ISettingsCategoryWidget;
 class   SettingValue;

src/Gui/settings/Settings.cpp → src/Gui/settings/SettingsDialog.cpp

 /*****************************************************************************
- * Settings.cpp: Generic preferences interface
+ * SettingsDialog.cpp: Generic preferences interface
  *****************************************************************************
  * Copyright (C) 2008-2014 VideoLAN
  *
@@ -22,10 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "Settings.h"
+#include "SettingsDialog.h"
 
 #include "PreferenceWidget.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Panel.h"
 
 #include <QAbstractButton>

src/Gui/settings/Settings.h → src/Gui/settings/SettingsDialog.h

 /*****************************************************************************
- * Settings.h: generic preferences interface
+ * SettingsDialog.h: generic preferences interface
  *****************************************************************************
  * Copyright (C) 2008-2014 VideoLAN
  *
@@ -24,7 +24,7 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 #include <QDialog>
 #include <QString>

src/Gui/timeline/TracksRuler.cpp

@@ -27,7 +27,7 @@
 #include <QPolygon>
 #include "TracksRuler.h"
 #include "TracksView.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 const int TracksRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725, 1500, 3000, 6000, 12000};
 

src/Gui/timeline/TracksScene.cpp

@@ -29,7 +29,7 @@
 #include "GraphicsMovieItem.h"
 #include "GraphicsTrack.h"
 #include "Main/Project.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Timeline.h"
 #include "Workflow/TrackWorkflow.h"
 

src/Gui/wizard/GeneralPage.cpp

@@ -26,7 +26,7 @@
 
 #include "GeneralPage.h"
 #include "ProjectWizard.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Project/ProjectManager.h"
 
 GeneralPage::GeneralPage( QWidget *parent ) :

src/Gui/wizard/ProjectWizard.cpp

@@ -26,7 +26,7 @@
 #include <QWizardPage>
 #include "project/GuiProjectManager.h"
 #include "ProjectWizard.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "WelcomePage.h"
 #include "OpenPage.h"
 #include "GeneralPage.h"

src/Gui/wizard/VideoPage.cpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include "VideoPage.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 VideoPage::VideoPage( QWidget* parent ) :
     QWizardPage( parent )

src/Gui/wizard/WelcomePage.cpp

@@ -23,7 +23,7 @@
 #include "WelcomePage.h"
 
 #include "project/GuiProjectManager.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 #include <QFileDialog>
 #include <QLabel>

src/Library/Library.cpp

@@ -31,7 +31,7 @@
 #include "Media/Clip.h"
 #include "Media/Media.h"
 #include "Metadata/MetaDataManager.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcDebug.h"
 #include "Project/Workspace.h"
 

src/Library/MediaContainer.cpp

@@ -29,7 +29,7 @@
 #include "Media/Clip.h"
 #include "Media/Media.h"
 #include "Metadata/MetaDataManager.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcDebug.h"
 #include "Project/Workspace.h"
 

src/Main/Core.cpp

@@ -31,7 +31,7 @@
 
 #include <Backend/IBackend.h>
 #include <EffectsEngine/EffectsEngine.h>
-#include <Settings/SettingsManager.h>
+#include <Settings/Settings.h>
 #include <Tools/VlmcLogger.h>
 
 Core::Core()

src/Main/Project.cpp

@@ -27,7 +27,7 @@
 #include "Library/Library.h"
 #include "Workflow/MainWorkflow.h"
 #include "Project/Workspace.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 
 Project::Project()
 {

src/Media/Transcoder.cpp

@@ -29,7 +29,7 @@
 #include "Media/Media.h"
 #include "Metadata/MetaDataManager.h"
 #include "Gui/widgets/NotificationZone.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/RendererEventWatcher.h"
 
 Transcoder::Transcoder( Media* media )

src/Project/ProjectManager.cpp

@@ -27,7 +27,7 @@
 #include "Library/Library.h"
 #include "Workflow/MainWorkflow.h"
 #include "Gui/project/GuiProjectManager.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Gui/timeline/Timeline.h"
 #include "Tools/VlmcDebug.h"
 #include "Renderer/WorkflowRenderer.h"

src/Project/Workspace.cpp

@@ -26,7 +26,7 @@
 #include "Media/Clip.h"
 #include "Library/Library.h"
 #include "Media/Media.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcDebug.h"
 
 #include "Project/WorkspaceWorker.h"

src/Project/WorkspaceWorker.cpp

@@ -23,7 +23,7 @@
 #include "Project/WorkspaceWorker.h"
 
 #include "Media/Media.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcDebug.h"
 
 #include <cerrno>

src/Renderer/WorkflowFileRenderer.cpp

@@ -22,7 +22,7 @@
 
 #include "vlmc.h"
 #include "WorkflowFileRenderer.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "VLCMedia.h"
 #include "VLCMediaPlayer.h"
 

src/Renderer/WorkflowRenderer.cpp

@@ -41,7 +41,7 @@
 #include "Backend/ISource.h"
 #include "Workflow/MainWorkflow.h"
 #include "Gui/preview/RenderWidget.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcDebug.h"
 #include "Workflow/Types.h"
 

src/Settings/SettingsManager.cpp → src/Settings/Settings.cpp

 /*****************************************************************************
- * SettingsManager.cpp: Backend settings manager
+ * Settings.cpp: Backend settings manager
  *****************************************************************************
  * Copyright (C) 2008-2014 VideoLAN
  *
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "SettingsManager.h"
+#include "Settings.h"
 #include "SettingValue.h"
 #include "Tools/VlmcDebug.h"
 

src/Settings/SettingsManager.h → src/Settings/Settings.h

 /*****************************************************************************
- * SettingsManager.h: Backend settings manager
+ * Settings.h: Backend settings manager
  *****************************************************************************
  * Copyright (C) 2008-2014 VideoLAN
  *

src/Tools/VlmcLogger.cpp

@@ -25,7 +25,7 @@
 #include <QThread>
 
 #include "Main/Core.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcLogger.h"
 #include "Tools/VlmcDebug.h"
 

src/Workflow/ImageClipWorkflow.cpp

@@ -32,7 +32,7 @@
 #include "Backend/ISourceRenderer.h"
 #include "MainWorkflow.h"
 #include "Media/Media.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Workflow/Types.h"
 
 ImageClipWorkflow::ImageClipWorkflow( ClipHelper *ch ) :

src/Workflow/MainWorkflow.cpp

@@ -30,7 +30,7 @@
 #include "MainWorkflow.h"
 #include "TrackWorkflow.h"
 #include "TrackHandler.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "Tools/VlmcDebug.h"
 #include "Workflow/Types.h"
 

src/Workflow/VideoClipWorkflow.cpp

@@ -27,7 +27,7 @@
 #include "Media/Media.h"
 #include "Backend/ISource.h"
 #include "Backend/ISourceRenderer.h"
-#include "Settings/SettingsManager.h"
+#include "Settings/Settings.h"
 #include "VideoClipWorkflow.h"
 #include "VLCMedia.h"
 #include "Tools/VlmcDebug.h"