[vlmc-devel] Rename Settings class to SettingsDialog

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Sun Mar  9 20:35:38 2014 +0100| [dc3c2856a69b423ef3864b600250d6590235cb0f] | committer: Hugo Beauzée-Luyssen

Rename Settings class to SettingsDialog

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

 src/Gui/MainWindow.cpp        |    4 ++--
 src/Gui/MainWindow.h          |    8 ++++----
 src/Gui/settings/Panel.cpp    |    2 +-
 src/Gui/settings/Settings.cpp |   14 +++++++-------
 src/Gui/settings/Settings.h   |    6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 3bdcd7f..4c4c010 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -543,7 +543,7 @@ MainWindow::initToolbar()
 void
 MainWindow::createGlobalPreferences()
 {
-    m_globalPreferences = new Settings( SettingsManager::Vlmc, this );
+    m_globalPreferences = new SettingsDialog( SettingsManager::Vlmc, this );
     m_globalPreferences->addCategory( "vlmc", QT_TRANSLATE_NOOP( "Settings", "General" ), SettingsManager::Vlmc,
                                      QIcon( ":/images/vlmc" ) );
     m_globalPreferences->addCategory( "keyboard", QT_TRANSLATE_NOOP( "Settings", "Keyboard" ), SettingsManager::Vlmc,
@@ -576,7 +576,7 @@ MainWindow::loadGlobalProxySettings()
 void
 MainWindow::createProjectPreferences()
 {
-    m_projectPreferences = new Settings( SettingsManager::Project, this );
+    m_projectPreferences = new SettingsDialog( SettingsManager::Project, this );
     m_projectPreferences->addCategory( "general", QT_TRANSLATE_NOOP( "Settings", "General" ), SettingsManager::Project,
                                    QIcon( ":/images/vlmc" ) );
     m_projectPreferences->addCategory( "video", QT_TRANSLATE_NOOP( "Settings", "Video" ), SettingsManager::Project,
diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
index 633d4c3..20524ae 100644
--- a/src/Gui/MainWindow.h
+++ b/src/Gui/MainWindow.h
@@ -37,7 +37,7 @@ class   ImportController;
 class   MediaLibrary;
 class   PreviewWidget;
 class   ProjectWizard;
-class   Settings;
+class   SettingsDialog;
 class   Timeline;
 class   WorkflowFileRenderer;
 class   WorkflowRenderer;
@@ -131,9 +131,9 @@ private:
     PreviewWidget*          m_projectPreview;
     WorkflowFileRenderer*   m_fileRenderer;
     WorkflowRenderer        *m_renderer;
-    Settings*               m_globalPreferences;
-    Settings*               m_DefaultProjectPreferences;
-    Settings*               m_projectPreferences;
+    SettingsDialog*               m_globalPreferences;
+    SettingsDialog*               m_DefaultProjectPreferences;
+    SettingsDialog*               m_projectPreferences;
     ProjectWizard*          m_pWizard;
     ImportController*       m_importController;
     MediaLibrary            *m_mediaLibrary;
diff --git a/src/Gui/settings/Panel.cpp b/src/Gui/settings/Panel.cpp
index d23a767..8311f63 100644
--- a/src/Gui/settings/Panel.cpp
+++ b/src/Gui/settings/Panel.cpp
@@ -85,7 +85,7 @@ Panel::retranslate()
 
     while ( it != ite )
     {
-        it.key()->setText( Settings::tr( it.value() ) );
+        it.key()->setText( SettingsDialog::tr( it.value() ) );
         ++it;
     }
 }
diff --git a/src/Gui/settings/Settings.cpp b/src/Gui/settings/Settings.cpp
index 05e5f57..e8444c1 100644
--- a/src/Gui/settings/Settings.cpp
+++ b/src/Gui/settings/Settings.cpp
@@ -37,7 +37,7 @@
 #include <QScrollArea>
 #include <QStackedLayout>
 
-Settings::Settings( SettingsManager::Type type, QWidget *parent ) :
+SettingsDialog::SettingsDialog( SettingsManager::Type type, QWidget *parent ) :
     QDialog( parent ),
     m_type( type )
 {
@@ -62,7 +62,7 @@ Settings::Settings( SettingsManager::Type type, QWidget *parent ) :
 }
 
 void
-Settings::addCategory( const QString &name, const char *label,
+SettingsDialog::addCategory( const QString &name, const char *label,
                        SettingsManager::Type type,
                        const QIcon &icon )
 {
@@ -77,7 +77,7 @@ Settings::addCategory( const QString &name, const char *label,
 }
 
 void
-Settings::buildLayout()
+SettingsDialog::buildLayout()
 {
     // Create the left panel
     m_panel = new Panel( this );
@@ -102,7 +102,7 @@ Settings::buildLayout()
 }
 
 void
-Settings::buttonClicked( QAbstractButton *button )
+SettingsDialog::buttonClicked( QAbstractButton *button )
 {
     switch ( m_buttons->standardButton( button ) )
     {
@@ -144,7 +144,7 @@ Settings::buttonClicked( QAbstractButton *button )
 }
 
 void
-Settings::switchWidget( int index )
+SettingsDialog::switchWidget( int index )
 {
     m_stackedLayout->setCurrentIndex( index );
 
@@ -153,7 +153,7 @@ Settings::switchWidget( int index )
 }
 
 void
-Settings::changeEvent( QEvent *e )
+SettingsDialog::changeEvent( QEvent *e )
 {
     switch ( e->type() )
     {
@@ -166,7 +166,7 @@ Settings::changeEvent( QEvent *e )
 }
 
 void
-Settings::retranslateUi()
+SettingsDialog::retranslateUi()
 {
     PreferenceWidget *pWidget = qobject_cast<PreferenceWidget*>(
             m_stackedLayout->widget( m_stackedLayout->currentIndex() ) );
diff --git a/src/Gui/settings/Settings.h b/src/Gui/settings/Settings.h
index 76afaec..fc6c219 100644
--- a/src/Gui/settings/Settings.h
+++ b/src/Gui/settings/Settings.h
@@ -39,13 +39,13 @@ class QStackedLayout;
 class   Panel;
 class   PreferenceWidget;
 
-class   Settings : public QDialog
+class   SettingsDialog : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY( Settings )
+    Q_DISABLE_COPY( SettingsDialog )
 
     public:
-        Settings( SettingsManager::Type type, QWidget *parent = 0 );
+        SettingsDialog( SettingsManager::Type type, QWidget *parent = 0 );
 
         void                        addCategory( const QString& categorieName,
                                                  const char *label,