fixed coding style

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

14 files changed, 26 insertions, 26 deletions

diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index efa5e6c48..e36112a86 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -116,7 +116,7 @@ QMMPStarter::QMMPStarter() : QObject()
                 return;
             }
 
-            if(flags & CommandLineHandler::NO_START)
+            if(flags & CommandLineHandler::NoStart)
             {
                 m_exit_code = EXIT_SUCCESS;
                 m_finished = true;
diff --git a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
index 4ea09b94d..4b5bba8eb 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
+++ b/src/plugins/CommandLineOptions/PlayListOption/playlistoption.cpp
@@ -39,14 +39,14 @@ void PlayListOption::registerOprions()
     registerOption(PL_SHUFFLE_TOGGLE, "--pl-shuffle-toggle", tr("Toggle playlist shuffle"));
     registerOption(PL_STATE, "--pl-state", tr("Show playlist options"));
 
-    setOptionFlags(PL_HELP, NO_START);
-    setOptionFlags(PL_LIST, HIDDEN_FROM_HELP);
-    setOptionFlags(PL_DUMP, HIDDEN_FROM_HELP);
-    setOptionFlags(PL_PLAY, HIDDEN_FROM_HELP);
-    setOptionFlags(PL_CLEAR, HIDDEN_FROM_HELP);
-    setOptionFlags(PL_REPEATE_TOGGLE, HIDDEN_FROM_HELP);
-    setOptionFlags(PL_SHUFFLE_TOGGLE, HIDDEN_FROM_HELP);
-    setOptionFlags(PL_STATE, HIDDEN_FROM_HELP);
+    setOptionFlags(PL_HELP, NoStart);
+    setOptionFlags(PL_LIST, HiddenFromHelp);
+    setOptionFlags(PL_DUMP, HiddenFromHelp);
+    setOptionFlags(PL_PLAY, HiddenFromHelp);
+    setOptionFlags(PL_CLEAR, HiddenFromHelp);
+    setOptionFlags(PL_REPEATE_TOGGLE, HiddenFromHelp);
+    setOptionFlags(PL_SHUFFLE_TOGGLE, HiddenFromHelp);
+    setOptionFlags(PL_STATE, HiddenFromHelp);
 }
 
 QString PlayListOption::shortName() const
diff --git a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
index 78aaea45a..c554aef48 100644
--- a/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
+++ b/src/plugins/CommandLineOptions/StatusOption/statusoption.cpp
@@ -32,7 +32,7 @@ void StatusOption::registerOprions()
                    QStringList() << "fmt");
     registerOption(NOW_PLAYING_SYNTAX, "--nowplaying-syntax", tr("Print --nowplaying syntax"));
 
-    setOptionFlags(NOW_PLAYING_SYNTAX, NO_START);
+    setOptionFlags(NOW_PLAYING_SYNTAX, NoStart);
 }
 
 QString StatusOption::shortName() const
diff --git a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
index a114424e8..e1592a3ab 100644
--- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
+++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp
@@ -25,7 +25,7 @@
 #include "mplayermetadatamodel.h"
 
 MplayerMetaDataModel::MplayerMetaDataModel(const QString &path)
-    : MetaDataModel(true, MetaDataModel::COMPLETE_PROPERTY_LIST)
+    : MetaDataModel(true, MetaDataModel::CompletePropertyList)
 {
     m_path = path;
 }
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index 884c05502..c4b2301b7 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -33,7 +33,7 @@
 
 FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly)
 #ifdef HAS_PICTURE_LIST
-    : MetaDataModel(true, MetaDataModel::IS_COVER_EDITABLE)
+    : MetaDataModel(true, MetaDataModel::IsCoverEditable)
 #else
     : MetaDataModel(true)
 #endif
diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
index 8771865d4..5f9a0357e 100644
--- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
+++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
@@ -37,7 +37,7 @@
 #include "mpegmetadatamodel.h"
 
 MPEGMetaDataModel::MPEGMetaDataModel(bool using_rusxmms, const QString &path, bool readOnly) :
-    MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE)
+    MetaDataModel(readOnly, MetaDataModel::IsCoverEditable)
 {
     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
     m_file = new TagLib::MPEG::File(m_stream, TagLib::ID3v2::FrameFactory::instance());
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index a28f88154..b46025a26 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -30,7 +30,7 @@
 
 OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly)
 #ifdef HAS_PICTURE_LIST
-    : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE)
+    : MetaDataModel(readOnly, MetaDataModel::IsCoverEditable)
 #else
     : MetaDataModel(readOnly)
 #endif
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 8ece55ceb..94a49ae59 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -30,7 +30,7 @@
 
 VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly)
 #ifdef HAS_PICTURE_LIST
-    : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE)
+    : MetaDataModel(readOnly, MetaDataModel::IsCoverEditable)
 #else
     : MetaDataModel(readOnly)
 #endif
diff --git a/src/qmmp/metadatamodel.h b/src/qmmp/metadatamodel.h
index 567d83a61..e5130ccd1 100644
--- a/src/qmmp/metadatamodel.h
+++ b/src/qmmp/metadatamodel.h
@@ -85,9 +85,9 @@ public:
      */
     enum DialogHint
     {
-        NO_HINTS = 0x0,               /*!< Default value. */
-        IS_COVER_EDITABLE = 0x1,      /*!< Enable cover editor. */
-        COMPLETE_PROPERTY_LIST = 0x2  /*!< Show properties from \b extraProperties() only (ignore other sources) */
+        NoHints = 0x0,              /*!< Default value. */
+        IsCoverEditable = 0x1,      /*!< Enable cover editor. */
+        CompletePropertyList = 0x2  /*!< Show properties from \b extraProperties() only (ignore other sources) */
     };
     Q_DECLARE_FLAGS(DialogHints, DialogHint)
     /*!
@@ -95,7 +95,7 @@ public:
      * @param readOnly Open file in read-only mode (\b true - enabled, \b false - disable).
      * @param hints Details dialog settings.
      */
-    MetaDataModel(bool readOnly, DialogHints hints = NO_HINTS);
+    MetaDataModel(bool readOnly, DialogHints hints = NoHints);
     /*!
      * Destructor.
      */
diff --git a/src/qmmpui/commandlinehandler.cpp b/src/qmmpui/commandlinehandler.cpp
index e8a5e81da..85263e16c 100644
--- a/src/qmmpui/commandlinehandler.cpp
+++ b/src/qmmpui/commandlinehandler.cpp
@@ -25,7 +25,7 @@ QStringList CommandLineHandler::helpString() const
     QStringList out;
     foreach (const CommandLineOption &opt, m_options.values())
     {
-        if(opt.flags & HIDDEN_FROM_HELP)
+        if(opt.flags & HiddenFromHelp)
             continue;
         else if(opt.values.isEmpty())
             out << opt.names.join(", ") + "||" + opt.helpString;
diff --git a/src/qmmpui/commandlinehandler.h b/src/qmmpui/commandlinehandler.h
index 315a39dae..300ad00c7 100644
--- a/src/qmmpui/commandlinehandler.h
+++ b/src/qmmpui/commandlinehandler.h
@@ -81,8 +81,8 @@ public:
      */
     enum OptionFlag
     {
-        HIDDEN_FROM_HELP = 0x1, /*!< Hide this option in the user-visible help output. */
-        NO_START = 0x2          /*!< Do not start player instance (useful for extra help options). */
+        HiddenFromHelp = 0x1,  /*!< Hide this option in the user-visible help output. */
+        NoStart = 0x2          /*!< Do not start player instance (useful for extra help options). */
     };
     Q_DECLARE_FLAGS(OptionFlags, OptionFlag)
     /*!
diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp
index c7e04e88c..ed3c774a7 100644
--- a/src/qmmpui/commandlinemanager.cpp
+++ b/src/qmmpui/commandlinemanager.cpp
@@ -82,7 +82,7 @@ QString CommandLineManager::executeCommand(const QString &name, const QStringLis
         if(id < 0)
             continue;
 
-        if(started || (opt->flags(id) & CommandLineHandler::NO_START))
+        if(started || (opt->flags(id) & CommandLineHandler::NoStart))
             return opt->executeCommand(id, args);
         else
         {
diff --git a/src/qmmpui/covereditor.cpp b/src/qmmpui/covereditor.cpp
index b198bb717..a47dae44a 100644
--- a/src/qmmpui/covereditor.cpp
+++ b/src/qmmpui/covereditor.cpp
@@ -28,7 +28,7 @@ CoverEditor::CoverEditor(MetaDataModel *model, const QString &coverPath, QWidget
     m_ui.setupUi(this);
     m_model = model;
     m_coverPath = coverPath;
-    m_editable = m_model && (m_model->dialogHints() & MetaDataModel::IS_COVER_EDITABLE) && !m_model->isReadOnly();
+    m_editable = m_model && (m_model->dialogHints() & MetaDataModel::IsCoverEditable) && !m_model->isReadOnly();
 
     m_ui.sourceComboBox->addItem(tr("External file"));
     m_ui.sourceComboBox->addItem(tr("Tag"));
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index 37fb98986..0480d5077 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -202,7 +202,7 @@ void DetailsDialog::updatePage()
         coverPixmap = m_metaDataModel->cover();
     }
 
-    if((m_metaDataModel && (m_metaDataModel->dialogHints() & MetaDataModel::IS_COVER_EDITABLE)) ||
+    if((m_metaDataModel && (m_metaDataModel->dialogHints() & MetaDataModel::IsCoverEditable)) ||
             !coverPath.isEmpty() ||
             !coverPixmap.isNull())
     {
@@ -265,7 +265,7 @@ void DetailsDialog::printInfo()
     QList<MetaDataItem> items;
     if(m_info.duration() > 0)
         items << MetaDataItem(tr("Duration"), MetaDataFormatter::formatDuration(m_info.duration()));
-    if(!m_metaDataModel || !(m_metaDataModel->dialogHints() & MetaDataModel::COMPLETE_PROPERTY_LIST))
+    if(!m_metaDataModel || !(m_metaDataModel->dialogHints() & MetaDataModel::CompletePropertyList))
     {
         items << MetaDataItem(tr("Bitrate"), m_info.value(Qmmp::BITRATE).toInt(), tr("kbps"));
         items << MetaDataItem(tr("Sample rate"), m_info.value(Qmmp::SAMPLERATE).toInt(), tr("Hz"));