refactoring

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8418 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 14 insertions, 14 deletions

diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 210b68169..dc4b24fde 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -106,7 +106,7 @@ void ConfigDialog::readSettings()
         //playlist options
         QmmpUiSettings *guis = QmmpUiSettings::instance();
         m_ui->groupLineEdit->setText(guis->groupFormat());
-        m_ui->metadataCheckBox->setChecked(guis->useMetadata());
+        m_ui->metadataCheckBox->setChecked(guis->useMetaData());
         m_ui->underscoresCheckBox->setChecked(guis->convertUnderscore());
         m_ui->per20CheckBox->setChecked(guis->convertTwenty());
         m_ui->clearPrevPLCheckBox->setChecked(guis->clearPreviousPlayList());
@@ -376,7 +376,7 @@ void ConfigDialog::saveSettings()
     if (QmmpUiSettings *guis = QmmpUiSettings::instance())
     {
         guis->setGroupFormat(m_ui->groupLineEdit->text().trimmed());
-        guis->setUseMetadata(m_ui->metadataCheckBox->isChecked());
+        guis->setUseMetaData(m_ui->metadataCheckBox->isChecked());
         guis->setConvertUnderscore(m_ui->underscoresCheckBox->isChecked());
         guis->setConvertTwenty(m_ui->per20CheckBox->isChecked());
         guis->setClearPreviousPlayList(m_ui->clearPrevPLCheckBox->isChecked());
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index e11f14fdf..37b6a2b75 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -245,7 +245,7 @@ void FileLoader::addPlayList(const QString &fmt, const QByteArray &data)
         MetaDataManager::instance()->prepareForAnotherThread();
         PlayListParser::loadFormats();
         m_filters = MetaDataManager::instance()->nameFilters();
-        m_parts = m_settings->useMetadata() ? TrackInfo::AllParts : TrackInfo::NoParts;
+        m_parts = m_settings->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts;
     }
     start(QThread::IdlePriority);
 }
@@ -271,7 +271,7 @@ void FileLoader::insert(PlayListItem *before, const QStringList &paths)
     {
         MetaDataManager::instance()->prepareForAnotherThread();
         m_filters = MetaDataManager::instance()->nameFilters();
-        m_parts = m_settings->useMetadata() ? TrackInfo::AllParts : TrackInfo::NoParts;
+        m_parts = m_settings->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts;
     }
     start(QThread::IdlePriority);
 }
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index adc37f896..027719a8e 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -463,7 +463,7 @@ void PlayListTask::run()
 
         //create new playlist tracks
         QStringList ignoredFiles;
-        TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetadata() ? TrackInfo::AllParts : TrackInfo::NoParts;
+        TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts;
         foreach(QFileInfo f, l)
         {
             QStringList ignored;
diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp
index 574b111cf..bb52472b1 100644
--- a/src/qmmpui/qmmpuisettings.cpp
+++ b/src/qmmpui/qmmpuisettings.cpp
@@ -39,7 +39,7 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     m_group_format = s.value("group_format", "%p%if(%p&%a, - %if(%y,[%y] ,),)%a").toString();
     m_convertUnderscore = s.value ("convert_underscore", true).toBool();
     m_convertTwenty = s.value ("convert_twenty", true).toBool();
-    m_useMetadata = s.value ("load_metadata", true).toBool();
+    m_useMetaData = s.value ("load_metadata", true).toBool();
     m_autosave_playlist = s.value("autosave", true).toBool();
     m_repeate_list = s.value("repeate_list",false).toBool();
     m_shuffle = s.value("shuffle",false).toBool();
@@ -111,9 +111,9 @@ bool QmmpUiSettings::convertTwenty() const
     return m_convertTwenty;
 }
 
-bool QmmpUiSettings::useMetadata() const
+bool QmmpUiSettings::useMetaData() const
 {
-    return m_useMetadata;
+    return m_useMetaData;
 }
 
 void QmmpUiSettings::setConvertUnderscore(bool yes)
@@ -139,9 +139,9 @@ void QmmpUiSettings::setGroupFormat(const QString &groupFormat)
     }
 }
 
-void QmmpUiSettings::setUseMetadata(bool yes)
+void QmmpUiSettings::setUseMetaData(bool yes)
 {
-    m_useMetadata = yes;
+    m_useMetaData = yes;
 }
 
 bool QmmpUiSettings::resumeOnStartup() const
@@ -171,7 +171,7 @@ void QmmpUiSettings::sync()
     s.setValue("PlayList/group_format", m_group_format);
     s.setValue("PlayList/convert_underscore", m_convertUnderscore);
     s.setValue("PlayList/convert_twenty", m_convertTwenty);
-    s.setValue("PlayList/load_metadata", m_useMetadata);
+    s.setValue("PlayList/load_metadata", m_useMetaData);
     s.setValue("PlayList/autosave", m_autosave_playlist);
     s.setValue("PlayList/repeate_list", m_repeate_list);
     s.setValue("PlayList/shuffle", m_shuffle);
diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h
index d614fa466..685122ccb 100644
--- a/src/qmmpui/qmmpuisettings.h
+++ b/src/qmmpui/qmmpuisettings.h
@@ -58,7 +58,7 @@ public:
     /*!
      * Returns the state of metadata usage (\b true - use, \b false - not use).
      */
-    bool useMetadata() const;
+    bool useMetaData() const;
     /*!
      * Returns playlist group format.
      */
@@ -102,7 +102,7 @@ public:
      * Sets metadata usage option state to \b enabled
      * @param enabled Option state (\b true - enabled, \b false - disabled)
      */
-    void setUseMetadata(bool enabled);
+    void setUseMetaData(bool enabled);
     /*!
      * Returns \b true if option "Resume On Startup" is enabled, otherwise returns \b false
      */
@@ -248,7 +248,7 @@ private:
     //playlist
     QString m_group_format;
     bool m_convertUnderscore, m_convertTwenty;
-    bool m_useMetadata;
+    bool m_useMetaData;
     bool m_autosave_playlist;
     bool m_repeate_list;
     bool m_shuffle;