diff options
Diffstat (limited to 'src/qmmpui')
| -rw-r--r-- | src/qmmpui/commandlinehandler.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/commandlinehandler.h | 4 | ||||
| -rw-r--r-- | src/qmmpui/commandlinemanager.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/covereditor.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/detailsdialog.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
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")); |