diff options
Diffstat (limited to 'src/qmmpui')
| -rw-r--r-- | src/qmmpui/commandlinemanager.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/detailsdialog.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/filedialog.h | 2 | ||||
| -rw-r--r-- | src/qmmpui/general.h | 2 | ||||
| -rw-r--r-- | src/qmmpui/generalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/mediaplayer.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/metadataformatter.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/playlistmodel.cpp | 10 | ||||
| -rw-r--r-- | src/qmmpui/playlistmodel.h | 2 | ||||
| -rw-r--r-- | src/qmmpui/playlistsettings.cpp | 6 | ||||
| -rw-r--r-- | src/qmmpui/playstate.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/templateeditor.cpp | 2 |
12 files changed, 20 insertions, 20 deletions
diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp index 82c8d7861..cb128dc51 100644 --- a/src/qmmpui/commandlinemanager.cpp +++ b/src/qmmpui/commandlinemanager.cpp @@ -98,7 +98,7 @@ bool CommandLineManager::hasOption(const QString &opt_str) foreach(CommandLineOption *opt, *m_options) { if (opt->identify(opt_str)) - return TRUE; + return true; } return FALSE; } diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index 3ab9f35ca..a63290311 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.cpp @@ -53,7 +53,7 @@ DetailsDialog::DetailsDialog(AbstractPlaylistItem *item, QWidget *parent) foreach(QString title, m_metaDataModel->descriptions().keys()) { QTextEdit *textEdit = new QTextEdit(this); - textEdit->setReadOnly(TRUE); + textEdit->setReadOnly(true); textEdit->setPlainText(m_metaDataModel->descriptions().value(title)); ui.tabWidget->addTab(textEdit, title); } @@ -66,7 +66,7 @@ DetailsDialog::~DetailsDialog() void DetailsDialog::printInfo() { - QList <FileInfo *> flist = MetaDataManager::instance()->createPlayList(m_path, TRUE); + QList <FileInfo *> flist = MetaDataManager::instance()->createPlayList(m_path, true); QMap <Qmmp::MetaData, QString> metaData; if(!flist.isEmpty() && QFile::exists(m_item->url())) metaData = flist.at(0)->metaData(); diff --git a/src/qmmpui/filedialog.h b/src/qmmpui/filedialog.h index 7395ffea0..1f0478eb7 100644 --- a/src/qmmpui/filedialog.h +++ b/src/qmmpui/filedialog.h @@ -219,7 +219,7 @@ protected: */ virtual bool modal()const { - return TRUE; + return true; }; /*! * Object destructor diff --git a/src/qmmpui/general.h b/src/qmmpui/general.h index 8ead65b37..700a021b2 100644 --- a/src/qmmpui/general.h +++ b/src/qmmpui/general.h @@ -54,7 +54,7 @@ public: * @param factory General plugin factory. * @param enable Plugin enable state (\b true - enable, \b false - disable) */ - static void setEnabled(GeneralFactory* factory, bool enable = TRUE); + static void setEnabled(GeneralFactory* factory, bool enable = true); /*! * Returns \b true if general plugin is enabled, otherwise returns \b false * @param factory General plugin factory. diff --git a/src/qmmpui/generalhandler.cpp b/src/qmmpui/generalhandler.cpp index fa8659046..8981796e3 100644 --- a/src/qmmpui/generalhandler.cpp +++ b/src/qmmpui/generalhandler.cpp @@ -97,7 +97,7 @@ bool GeneralHandler::visibilityControl() foreach(factory, *General::factories()) { if (General::isEnabled(factory) && factory->properties().visibilityControl) - return TRUE; + return true; } return FALSE; } diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index bf6648470..a444ad646 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -202,7 +202,7 @@ void MediaPlayer::updateNextUrl() { if(m_pl_manager->currentPlayList()->nextItem() && !isRepeatable()) { - m_core->play(m_pl_manager->currentPlayList()->nextItem()->url(), TRUE); + m_core->play(m_pl_manager->currentPlayList()->nextItem()->url(), true); m_nextUrl = m_pl_manager->currentPlayList()->nextItem()->url(); qDebug("MediaPlayer: sending next url"); } diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp index 073c6ef88..bd1501b4a 100644 --- a/src/qmmpui/metadataformatter.cpp +++ b/src/qmmpui/metadataformatter.cpp @@ -108,7 +108,7 @@ QString MetaDataFormatter::processIfKeyWord(QString title) return title; } //process condition - bool cond = TRUE; + bool cond = true; foreach(QString arg, args.at(0).split("%&")) { cond &= !arg.isEmpty(); diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 01ec148f1..1518db19c 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -172,7 +172,7 @@ bool PlayListModel::setCurrent(int c) m_currentItem = m_items.at(c); emit currentChanged(); emit listChanged(); - return TRUE; + return true; } bool PlayListModel::next() @@ -180,7 +180,7 @@ bool PlayListModel::next() if (!isEmptyQueue()) { setCurrentToQueued(); - return TRUE; + return true; } if (isFileLoaderRunning()) @@ -377,7 +377,7 @@ void PlayListModel::invertSelection() void PlayListModel::selectAll() { for (int i = 0; i<m_items.size(); ++i) - m_items.at(i)->setSelected(TRUE); + m_items.at(i)->setSelected(true); emit listChanged(); } @@ -466,7 +466,7 @@ bool PlayListModel::setFileList(const QStringList & l) if (!model_cleared) { clear(); - model_cleared = TRUE; + model_cleared = true; } if (f_info.isDir()) addDirectory(str); @@ -897,7 +897,7 @@ bool PlayListModel::isFileLoaderRunning() const { foreach(FileLoader* l,m_running_loaders) if (l && l->isRunning()) - return TRUE; + return true; return FALSE; } diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h index d61dea152..396b87640 100644 --- a/src/qmmpui/playlistmodel.h +++ b/src/qmmpui/playlistmodel.h @@ -356,7 +356,7 @@ public slots: void addDirectory(const QString& dir); /*! * Removes previous items and loads list of files (regular files or directories), - * returns \b TRUE if at least one file has been successfully loaded, + * returns \b true if at least one file has been successfully loaded, * otherwise returns \b FALSE */ bool setFileList(const QStringList &l); diff --git a/src/qmmpui/playlistsettings.cpp b/src/qmmpui/playlistsettings.cpp index 416da8df5..5fec65c19 100644 --- a/src/qmmpui/playlistsettings.cpp +++ b/src/qmmpui/playlistsettings.cpp @@ -28,9 +28,9 @@ PlaylistSettings::PlaylistSettings() { QSettings s (Qmmp::configFile(), QSettings::IniFormat); m_format = s.value("PlayList/title_format", "%p%if(%p&%t, - ,)%t").toString(); - m_convertUnderscore = s.value ("PlayList/convert_underscore", TRUE).toBool(); - m_convertTwenty = s.value ("PlayList/convert_twenty", TRUE).toBool(); - m_useMetadata = s.value ("PlayList/load_metadata", TRUE).toBool(); + m_convertUnderscore = s.value ("PlayList/convert_underscore", true).toBool(); + m_convertTwenty = s.value ("PlayList/convert_twenty", true).toBool(); + m_useMetadata = s.value ("PlayList/load_metadata", true).toBool(); } PlaylistSettings::~PlaylistSettings() diff --git a/src/qmmpui/playstate.cpp b/src/qmmpui/playstate.cpp index ad9da3bdf..56657beb7 100644 --- a/src/qmmpui/playstate.cpp +++ b/src/qmmpui/playstate.cpp @@ -66,7 +66,7 @@ bool ShufflePlayState::previous() if (itm_count > 1) m_shuffled_current --; m_model->setCurrent(m_shuffled_indexes.at(m_shuffled_current)); - return TRUE; + return true; } return FALSE; } @@ -124,7 +124,7 @@ bool NormalPlayState::previous() if ( m_model->currentRow() < 1 && !m_model->isRepeatableList()) return FALSE; else if (m_model->setCurrent(m_model->currentRow() - 1)) - return TRUE; + return true; else if (m_model->isRepeatableList()) return m_model->setCurrent(m_model->items().count() - 1); } diff --git a/src/qmmpui/templateeditor.cpp b/src/qmmpui/templateeditor.cpp index 203f91e6a..ac6fa45af 100644 --- a/src/qmmpui/templateeditor.cpp +++ b/src/qmmpui/templateeditor.cpp @@ -85,7 +85,7 @@ QString TemplateEditor::getTemplate (QWidget *parent, const QString &title, cons if(editor->exec() == QDialog::Accepted) { if(ok) - *ok = TRUE; + *ok = true; QString t = editor->currentTemplate(); editor->deleteLater(); return t; |
