diff options
Diffstat (limited to 'src/qmmpui')
41 files changed, 133 insertions, 133 deletions
diff --git a/src/qmmpui/aboutdialog_p.h b/src/qmmpui/aboutdialog_p.h index 3857c48e6..4c7b97775 100644 --- a/src/qmmpui/aboutdialog_p.h +++ b/src/qmmpui/aboutdialog_p.h @@ -33,7 +33,7 @@ class AboutDialog : public QDialog, private Ui::AboutDialog { Q_OBJECT public: - AboutDialog(QWidget* parent = 0); + AboutDialog(QWidget* parent = nullptr); ~AboutDialog(); private: diff --git a/src/qmmpui/addurldialog.cpp b/src/qmmpui/addurldialog.cpp index 73a0b52ac..e121cf51e 100644 --- a/src/qmmpui/addurldialog.cpp +++ b/src/qmmpui/addurldialog.cpp @@ -61,7 +61,7 @@ AddUrlDialog::~AddUrlDialog() settings.setValue("URLDialog/history", m_history); } -QPointer<AddUrlDialog> AddUrlDialog::m_instance = 0; +QPointer<AddUrlDialog> AddUrlDialog::m_instance = nullptr; void AddUrlDialog::popup(QWidget* parent, PlayListModel* model) { diff --git a/src/qmmpui/columneditor_p.h b/src/qmmpui/columneditor_p.h index 2c49973c1..60883df0f 100644 --- a/src/qmmpui/columneditor_p.h +++ b/src/qmmpui/columneditor_p.h @@ -34,7 +34,7 @@ class ColumnEditor : public QDialog { Q_OBJECT public: - explicit ColumnEditor(const QString &name, const QString &patt, QWidget *parent = 0); + explicit ColumnEditor(const QString &name, const QString &patt, QWidget *parent = nullptr); ~ColumnEditor(); QString name() const; diff --git a/src/qmmpui/commandlinemanager.cpp b/src/qmmpui/commandlinemanager.cpp index 295e78cdb..c7e04e88c 100644 --- a/src/qmmpui/commandlinemanager.cpp +++ b/src/qmmpui/commandlinemanager.cpp @@ -32,8 +32,8 @@ #include "mediaplayer.h" #include "commandlinemanager.h" -QList<CommandLineHandler *> *CommandLineManager::m_options = 0; -QHash<CommandLineHandler*, QString> *CommandLineManager::m_files = 0; +QList<CommandLineHandler *> *CommandLineManager::m_options = nullptr; +QHash<CommandLineHandler*, QString> *CommandLineManager::m_files = nullptr; void CommandLineManager::checkOptions() { @@ -51,7 +51,7 @@ void CommandLineManager::checkOptions() else qWarning("CommandLineManager: %s", qPrintable(loader.errorString ())); - CommandLineHandler *option = 0; + CommandLineHandler *option = nullptr; if (plugin) option = qobject_cast<CommandLineHandler *>(plugin); @@ -99,7 +99,7 @@ bool CommandLineManager::hasOption(const QString &opt_str, CommandLineHandler::O { checkOptions(); if(flags) - *flags = 0; + *flags = nullptr; foreach(CommandLineHandler *opt, *m_options) { int id = opt->identify(opt_str); diff --git a/src/qmmpui/commandlinemanager.h b/src/qmmpui/commandlinemanager.h index 88a6177b7..9deb02ab7 100644 --- a/src/qmmpui/commandlinemanager.h +++ b/src/qmmpui/commandlinemanager.h @@ -42,7 +42,7 @@ public: /*! * Return \b true if command \b opt_str is supported, otherwise returns \b false. */ - static bool hasOption(const QString &opt_str, CommandLineHandler::OptionFlags *flags = 0); + static bool hasOption(const QString &opt_str, CommandLineHandler::OptionFlags *flags = nullptr); /*! * Prints usage to stdout. */ diff --git a/src/qmmpui/configdialog.h b/src/qmmpui/configdialog.h index 6f773e727..8b1df9b67 100644 --- a/src/qmmpui/configdialog.h +++ b/src/qmmpui/configdialog.h @@ -46,7 +46,7 @@ public: * Constructor. * @param parent Parent widget */ - ConfigDialog(QWidget *parent = 0); + ConfigDialog(QWidget *parent = nullptr); /*! * Destructor */ diff --git a/src/qmmpui/covereditor_p.h b/src/qmmpui/covereditor_p.h index 4cf7f649f..6621865a1 100644 --- a/src/qmmpui/covereditor_p.h +++ b/src/qmmpui/covereditor_p.h @@ -37,7 +37,7 @@ class CoverEditor : public QWidget { Q_OBJECT public: - explicit CoverEditor(MetaDataModel *model, const QString &coverPath, QWidget *parent = 0); + explicit CoverEditor(MetaDataModel *model, const QString &coverPath, QWidget *parent = nullptr); bool isEditable() const; void save(); diff --git a/src/qmmpui/coverviewer_p.h b/src/qmmpui/coverviewer_p.h index dbe3ba65b..28b438d1b 100644 --- a/src/qmmpui/coverviewer_p.h +++ b/src/qmmpui/coverviewer_p.h @@ -34,7 +34,7 @@ class CoverViewer : public QWidget { Q_OBJECT public: - CoverViewer(QWidget *parent = 0); + CoverViewer(QWidget *parent = nullptr); ~CoverViewer(); diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index 8258f3d2a..f11ae8e54 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.cpp @@ -44,7 +44,7 @@ DetailsDialog::DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent) m_ui->directoryButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon)); m_ui->nextButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowRight)); m_ui->prevButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_ArrowLeft)); - m_metaDataModel = 0; + m_metaDataModel = nullptr; m_page = 0; m_tracks = tracks; updatePage(); @@ -56,7 +56,7 @@ DetailsDialog::~DetailsDialog() if(m_metaDataModel) { delete m_metaDataModel; - m_metaDataModel = 0; + m_metaDataModel = nullptr; } delete m_ui; } @@ -85,7 +85,7 @@ void DetailsDialog::on_buttonBox_clicked(QAbstractButton *button) if(m_ui->buttonBox->standardButton(button) == QDialogButtonBox::Save) { TagEditor *tagEditor = qobject_cast<TagEditor *>(m_ui->tabWidget->currentWidget()); - CoverEditor *coverEditor = 0; + CoverEditor *coverEditor = nullptr; if(tagEditor) tagEditor->save(); else if((coverEditor = qobject_cast<CoverEditor *>(m_ui->tabWidget->currentWidget()))) @@ -100,7 +100,7 @@ void DetailsDialog::on_buttonBox_clicked(QAbstractButton *button) if(m_metaDataModel) { delete m_metaDataModel; - m_metaDataModel = 0; + m_metaDataModel = nullptr; } reject(); } @@ -108,7 +108,7 @@ void DetailsDialog::on_buttonBox_clicked(QAbstractButton *button) void DetailsDialog::on_tabWidget_currentChanged(int index) { - CoverEditor *coverEditor = 0; + CoverEditor *coverEditor = nullptr; if(qobject_cast<TagEditor *>(m_ui->tabWidget->widget(index))) m_ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(m_metaDataModel && !m_metaDataModel->isReadOnly()); else if((coverEditor = qobject_cast<CoverEditor *>(m_ui->tabWidget->currentWidget()))) @@ -141,7 +141,7 @@ void DetailsDialog::closeEvent(QCloseEvent *) if(m_metaDataModel) { delete m_metaDataModel; - m_metaDataModel = 0; + m_metaDataModel = nullptr; } } @@ -150,7 +150,7 @@ void DetailsDialog::updatePage() if(m_metaDataModel) { delete m_metaDataModel; - m_metaDataModel = 0; + m_metaDataModel = nullptr; } while (m_ui->tabWidget->count() > 1) diff --git a/src/qmmpui/detailsdialog.h b/src/qmmpui/detailsdialog.h index 357cf14f0..de1fe3a0b 100644 --- a/src/qmmpui/detailsdialog.h +++ b/src/qmmpui/detailsdialog.h @@ -48,7 +48,7 @@ public: * @param tracks a list of tracks which should be used. * @param parent Parent widget. */ - DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent = 0); + DetailsDialog(QList<PlayListTrack *> tracks, QWidget *parent = nullptr); /*! * Destructor. */ diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp index 75cef24e2..05804a75c 100644 --- a/src/qmmpui/filedialog.cpp +++ b/src/qmmpui/filedialog.cpp @@ -30,9 +30,9 @@ #include "qtfiledialog_p.h" //static functions -FileDialog* FileDialog::m_instance = 0; -QList<QmmpUiPluginCache*> *FileDialog::m_cache = 0; -FileDialogFactory *FileDialog::m_currentFactory = 0; +FileDialog* FileDialog::m_instance = nullptr; +QList<QmmpUiPluginCache*> *FileDialog::m_cache = nullptr; +FileDialogFactory *FileDialog::m_currentFactory = nullptr; void FileDialog::loadPlugins() { @@ -163,7 +163,7 @@ void FileDialog::popup(QWidget *parent, FileDialog* FileDialog::instance() { loadPlugins(); - FileDialogFactory *selected = 0; + FileDialogFactory *selected = nullptr; QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QString name = settings.value("FileDialog", "qt_dialog").toString(); @@ -185,7 +185,7 @@ FileDialog* FileDialog::instance() if(m_instance) { delete m_instance; - m_instance = 0; + m_instance = nullptr; } m_currentFactory = selected; @@ -196,7 +196,7 @@ FileDialog* FileDialog::instance() //base implementation FileDialog::FileDialog() : QObject(), m_initialized(false) { - m_lastDir = 0; + m_lastDir = nullptr; } FileDialog::~FileDialog() {} diff --git a/src/qmmpui/filedialog.h b/src/qmmpui/filedialog.h index a9099c374..405fb7db5 100644 --- a/src/qmmpui/filedialog.h +++ b/src/qmmpui/filedialog.h @@ -74,7 +74,7 @@ public: * @param caption Dialog title. * @param dir Default directory. */ - static QString getExistingDirectory(QWidget *parent = 0, + static QString getExistingDirectory(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString()); /*! @@ -87,11 +87,11 @@ public: * (example: "Audio (*.mp3 *.ogg);;Text files (*.txt);;XML files (*.xml)"). * @param selectedFilter Default selected filter */ - static QString getOpenFileName(QWidget *parent = 0, + static QString getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = 0); + QString *selectedFilter = nullptr); /*! * This is a static function that will open modal file dialog and * return an existing file selected by the user. @@ -102,11 +102,11 @@ public: * (example: "Audio (*.mp3 *.ogg);;Text files (*.txt);;XML files (*.xml)"). * @param selectedFilter Default selected filter. */ - static QStringList getOpenFileNames(QWidget *parent = 0, + static QStringList getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = 0); + QString *selectedFilter = nullptr); /*! * This is a static function that will open modal file dialog and * return a file name selected by the user. The file does not have to exist. @@ -117,11 +117,11 @@ public: * (example: "Audio (*.mp3 *.ogg);;Text files (*.txt);;XML files (*.xml)"). * @param selectedFilter Default selected filter. */ - static QString getSaveFileName (QWidget *parent = 0, + static QString getSaveFileName (QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = 0); + QString *selectedFilter = nullptr); /*! * Opens nonmodal file dialog. Selected file dialog should support nonmodal mode. * Otherwise this function creates modal dialog. @@ -138,11 +138,11 @@ public: * m_playListModel, SLOT(addFileList(QStringList)), * tr("Choose a directory")); */ - static void popup(QWidget *parent = 0, + static void popup(QWidget *parent = nullptr, Mode mode = AddFiles, - QString *dir = 0, - QObject *receiver = 0, - const char *member = 0, + QString *dir = nullptr, + QObject *receiver = nullptr, + const char *member = nullptr, const QString &caption = QString(), const QString &filters = QString()); @@ -186,7 +186,7 @@ protected: */ virtual QStringList exec(QWidget *parent, const QString &dir, Mode mode, const QString &caption, const QString &filter = QString(), - QString *selectedFilter = 0) = 0; + QString *selectedFilter = nullptr) = 0; private slots: void updateLastDir(const QStringList&); diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index ac3a43749..5650e17e1 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -289,19 +289,19 @@ void FileLoader::run() void FileLoader::add(const QString &path) { - insert(0, QStringList() << path); + insert(nullptr, QStringList() << path); } void FileLoader::add(const QStringList &paths) { - insert(0, paths); + insert(nullptr, paths); } void FileLoader::addPlayList(const QString &fmt, const QByteArray &data) { m_mutex.lock(); LoaderTask task; - task.before = 0; + task.before = nullptr; task.playListFormat = fmt; task.playListContent = data; m_tasks.append(task); diff --git a/src/qmmpui/fileloader_p.h b/src/qmmpui/fileloader_p.h index f6b68f7c1..02772f726 100644 --- a/src/qmmpui/fileloader_p.h +++ b/src/qmmpui/fileloader_p.h @@ -49,7 +49,7 @@ public: * Constructs FileLoader object. * @param parent QObject parent */ - FileLoader(QObject *parent = 0); + FileLoader(QObject *parent = nullptr); /*! * Object destructor. */ @@ -83,10 +83,10 @@ signals: private: void run(); - QList<PlayListTrack*> processFile(const QString &path, QStringList *ignoredPaths = 0); + QList<PlayListTrack*> processFile(const QString &path, QStringList *ignoredPaths = nullptr); void insertPlayList(const QString &fmt, const QByteArray &contents, PlayListItem *before); void insertPlayList(const QString &path, PlayListItem *before); - void addDirectory(const QString &s, PlayListItem *before = 0); + void addDirectory(const QString &s, PlayListItem *before = nullptr); bool checkRestrictFilters(const QFileInfo &info); bool checkExcludeFilters(const QFileInfo &info); void removeIgnoredTracks(QList<PlayListTrack *> *tracks, const QStringList &ignoredPaths); diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp index c233ef2d4..420277afd 100644 --- a/src/qmmpui/general.cpp +++ b/src/qmmpui/general.cpp @@ -25,10 +25,10 @@ #include "qmmpuiplugincache_p.h" #include "general.h" -QList<QmmpUiPluginCache*> *General::m_cache = 0; +QList<QmmpUiPluginCache*> *General::m_cache = nullptr; QStringList General::m_enabledNames; -QHash <GeneralFactory*, QObject*> *General::m_generals = 0; -QObject *General::m_parent = 0; +QHash <GeneralFactory*, QObject*> *General::m_generals = nullptr; +QObject *General::m_parent = nullptr; void General::loadPlugins() { diff --git a/src/qmmpui/groupedcontainer.cpp b/src/qmmpui/groupedcontainer.cpp index 76a0bdaea..5b9bd562f 100644 --- a/src/qmmpui/groupedcontainer.cpp +++ b/src/qmmpui/groupedcontainer.cpp @@ -209,7 +209,7 @@ PlayListItem *GroupedContainer::item(int index) const if(index >= count() || index < 0) { qWarning("GroupedContainer: index is out of range"); - return 0; + return nullptr; } return m_items.at(index); } @@ -219,7 +219,7 @@ PlayListTrack *GroupedContainer::track(int index) const updateCache(); PlayListItem *i = item(index); if(!i || i->isGroup()) - return 0; + return nullptr; return dynamic_cast<PlayListTrack *> (i); } @@ -228,7 +228,7 @@ PlayListGroup *GroupedContainer::group(int index) const PlayListItem *i = item(index); if(i && i->isGroup()) return dynamic_cast<PlayListGroup *> (i); - return 0; + return nullptr; } bool GroupedContainer::contains(PlayListItem *item) const @@ -259,7 +259,7 @@ PlayListTrack *GroupedContainer::findTrack(int number) const } firstNumber += group->count(); } - return 0; + return nullptr; } void GroupedContainer::removeTrack(PlayListTrack *track) @@ -290,7 +290,7 @@ void GroupedContainer::removeTracks(QList<PlayListTrack *> tracks) bool GroupedContainer::move(QList<int> indexes, int from, int to) { updateCache(); - PlayListGroup *group = 0; + PlayListGroup *group = nullptr; int firstIndex = 0, lastIndex = 0; for(int i = 0; i < m_groups.count(); ++i) diff --git a/src/qmmpui/jumptotrackdialog_p.h b/src/qmmpui/jumptotrackdialog_p.h index ae5b5a8d4..6cffc7aee 100644 --- a/src/qmmpui/jumptotrackdialog_p.h +++ b/src/qmmpui/jumptotrackdialog_p.h @@ -41,7 +41,7 @@ class JumpToTrackDialog : public QDialog, private Ui::JumpToTrackDialog Q_OBJECT public: - JumpToTrackDialog(PlayListModel *model, QWidget* parent = 0); + JumpToTrackDialog(PlayListModel *model, QWidget* parent = nullptr); ~JumpToTrackDialog(); void refresh(); diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index 8dd0fbf61..f9a6f85ef 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -27,7 +27,7 @@ #include "qmmpuisettings.h" #include "mediaplayer.h" -MediaPlayer *MediaPlayer::m_instance = 0; +MediaPlayer *MediaPlayer::m_instance = nullptr; MediaPlayer::MediaPlayer(QObject *parent) : QObject(parent) @@ -35,8 +35,8 @@ MediaPlayer::MediaPlayer(QObject *parent) if(m_instance) qFatal("StateHandler: only one instance is allowed"); m_instance = this; - m_pl_manager = 0; - m_core = 0; + m_pl_manager = nullptr; + m_core = nullptr; m_skips = 0; m_finishTimer = new QTimer(this); m_finishTimer->setSingleShot(true); @@ -57,7 +57,7 @@ MediaPlayer::MediaPlayer(QObject *parent) MediaPlayer::~MediaPlayer() { - m_instance = 0; + m_instance = nullptr; } MediaPlayer* MediaPlayer::instance() @@ -142,7 +142,7 @@ void MediaPlayer::playNext() void MediaPlayer::updateNextUrl() { m_nextUrl.clear(); - PlayListTrack *track = 0; + PlayListTrack *track = nullptr; if(m_settings->isRepeatableTrack()) track = m_pl_manager->currentPlayList()->currentTrack(); else if(!m_settings->isNoPlayListAdvance()) diff --git a/src/qmmpui/mediaplayer.h b/src/qmmpui/mediaplayer.h index ad2dd7b6d..4a971cad8 100644 --- a/src/qmmpui/mediaplayer.h +++ b/src/qmmpui/mediaplayer.h @@ -40,7 +40,7 @@ public: * Object constructor, * @param parent Parent object. */ - MediaPlayer(QObject *parent = 0); + MediaPlayer(QObject *parent = nullptr); /*! * Destructor */ diff --git a/src/qmmpui/metadataformattermenu.h b/src/qmmpui/metadataformattermenu.h index fa9b7fcf1..3c26d4d0c 100644 --- a/src/qmmpui/metadataformattermenu.h +++ b/src/qmmpui/metadataformattermenu.h @@ -38,7 +38,7 @@ public: COLUMN_MENU }; - explicit MetaDataFormatterMenu(Type type, QWidget *parent = 0); + explicit MetaDataFormatterMenu(Type type, QWidget *parent = nullptr); signals: void patternSelected(const QString &pattern); diff --git a/src/qmmpui/metadatahelper.cpp b/src/qmmpui/metadatahelper.cpp index 3d1d63061..cd97791df 100644 --- a/src/qmmpui/metadatahelper.cpp +++ b/src/qmmpui/metadatahelper.cpp @@ -20,7 +20,7 @@ #include "metadatahelper_p.h" -MetaDataHelper *MetaDataHelper::m_instance = 0; +MetaDataHelper *MetaDataHelper::m_instance = nullptr; MetaDataHelper::MetaDataHelper() { @@ -31,7 +31,7 @@ MetaDataHelper::MetaDataHelper() MetaDataHelper::~MetaDataHelper() { - m_instance = 0; + m_instance = nullptr; delete m_group_formatter; qDeleteAll(m_title_formatters); m_title_formatters.clear(); diff --git a/src/qmmpui/normalcontainer.cpp b/src/qmmpui/normalcontainer.cpp index 306bc922c..f1ef088f7 100644 --- a/src/qmmpui/normalcontainer.cpp +++ b/src/qmmpui/normalcontainer.cpp @@ -129,7 +129,7 @@ PlayListItem *NormalContainer::item(int index) const if(index >= count() || index < 0) { qWarning("NormalContainer: index is out of range"); - return 0; + return nullptr; } return m_items.at(index); } @@ -143,7 +143,7 @@ PlayListTrack *NormalContainer::track(int index) const PlayListGroup *NormalContainer::group(int index) const { Q_UNUSED(index); - return 0; + return nullptr; } bool NormalContainer::contains(PlayListItem *item) const @@ -160,7 +160,7 @@ PlayListTrack *NormalContainer::findTrack(int number) const { if(number >= count() || number < 0) { - return 0; + return nullptr; } return dynamic_cast<PlayListTrack *> (m_items.at(number)); } diff --git a/src/qmmpui/playlistdownloader.cpp b/src/qmmpui/playlistdownloader.cpp index a7463c277..16365e43d 100644 --- a/src/qmmpui/playlistdownloader.cpp +++ b/src/qmmpui/playlistdownloader.cpp @@ -28,7 +28,7 @@ PlayListDownloader::PlayListDownloader(QObject *parent) : QObject(parent) { - m_getReply = 0; + m_getReply = nullptr; m_ua = QString("qmmp/%1").arg(Qmmp::strVersion()).toLatin1(); m_manager = new QNetworkAccessManager(this); connect(m_manager, SIGNAL(finished (QNetworkReply *)), SLOT(readResponse(QNetworkReply *))); @@ -94,7 +94,7 @@ void PlayListDownloader::readResponse(QNetworkReply *reply) if(reply == m_getReply) { - m_getReply = 0; + m_getReply = nullptr; if(m_model.isNull()) { diff --git a/src/qmmpui/playlistdownloader.h b/src/qmmpui/playlistdownloader.h index af6cb377d..3d5dd46dc 100644 --- a/src/qmmpui/playlistdownloader.h +++ b/src/qmmpui/playlistdownloader.h @@ -40,7 +40,7 @@ public: /*! * Object constructor. */ - explicit PlayListDownloader(QObject *parent = 0); + explicit PlayListDownloader(QObject *parent = nullptr); signals: /*! diff --git a/src/qmmpui/playlistheadermodel.h b/src/qmmpui/playlistheadermodel.h index 755ae019d..9d1303695 100644 --- a/src/qmmpui/playlistheadermodel.h +++ b/src/qmmpui/playlistheadermodel.h @@ -43,7 +43,7 @@ public: * Constructs a playlist model. * @param parent QObject parent. */ - explicit PlayListHeaderModel(QObject *parent = 0); + explicit PlayListHeaderModel(QObject *parent = nullptr); /*! * Object destructor. */ @@ -93,13 +93,13 @@ public: * @param index Index of the column. * @param parent Parent widget, */ - void execEdit(int index, QWidget *parent = 0); + void execEdit(int index, QWidget *parent = nullptr); /*! * Opens internal column editor and inserts new column if user press "ok". * @param index Required index of the column. * @param parent Parent widget. */ - void execInsert(int index, QWidget *parent = 0); + void execInsert(int index, QWidget *parent = nullptr); /*! * Returns number of the columns. */ diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp index a29c4338d..a468ce6ca 100644 --- a/src/qmmpui/playlistmanager.cpp +++ b/src/qmmpui/playlistmanager.cpp @@ -30,7 +30,7 @@ #include "qmmpuisettings.h" #include "playlistmanager.h" -PlayListManager *PlayListManager::m_instance = 0; +PlayListManager *PlayListManager::m_instance = nullptr; PlayListManager::PlayListManager(QObject *parent) : QObject(parent) { @@ -40,8 +40,8 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent) m_instance = this; m_ui_settings = QmmpUiSettings::instance(); m_header = new PlayListHeaderModel(this); - m_current = 0; - m_selected = 0; + m_current = nullptr; + m_selected = nullptr; m_timer = new QTimer(this); m_timer->setInterval(5000); m_timer->setSingleShot(true); @@ -69,7 +69,7 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent) PlayListManager::~PlayListManager() { writePlayLists(); - m_instance = 0; + m_instance = nullptr; } PlayListManager* PlayListManager::instance() @@ -247,7 +247,7 @@ PlayListModel *PlayListManager::playListAt(int i) const { if(i >= 0 && i < m_models.count()) return m_models.at(i); - return 0; + return nullptr; } PlayListHeaderModel *PlayListManager::headerModel() diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 2a99e40c6..3883f28ad 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -41,11 +41,11 @@ PlayListModel::PlayListModel(const QString &name, QObject *parent) : QObject(parent) , m_selection() { - qsrand(time(0)); + qsrand(time(nullptr)); m_ui_settings = QmmpUiSettings::instance(); m_total_duration = 0; m_current = 0; - m_stop_track = 0; + m_stop_track = nullptr; m_name = name; m_loader = new FileLoader(this); m_task = new PlayListTask(this); @@ -267,20 +267,20 @@ int PlayListModel::columnCount() const PlayListTrack* PlayListModel::currentTrack() const { - return m_container->isEmpty() ? 0 : m_current_track; + return m_container->isEmpty() ? nullptr : m_current_track; } PlayListTrack *PlayListModel::nextTrack() const { if(m_container->isEmpty() || !m_play_state) - return 0; + return nullptr; if(m_stop_track && m_stop_track == currentTrack()) - return 0; + return nullptr; if(!isEmptyQueue()) return m_queued_songs.at(0); int index = m_play_state->nextIndex(); if(index < 0 || (index + 1 > m_container->count())) - return 0; + return nullptr; return m_container->track(index); } @@ -350,7 +350,7 @@ bool PlayListModel::next() { if(m_stop_track == currentTrack()) { - m_stop_track = 0; + m_stop_track = nullptr; emit listChanged(STOP_AFTER); return false; } @@ -378,7 +378,7 @@ void PlayListModel::clear() { m_loader->finish(); m_current = 0; - m_stop_track = 0; + m_stop_track = nullptr; m_container->clear(); m_queued_songs.clear(); m_total_duration = 0; @@ -428,7 +428,7 @@ PlayListTrack *PlayListModel::findTrack(int track_index) const QList<PlayListItem *> PlayListModel::findTracks(const QString &str) const { QList<PlayListItem *> items; - PlayListItem *item = 0; + PlayListItem *item = nullptr; if(str.isEmpty()) return items; @@ -562,7 +562,7 @@ int PlayListModel::removeTrackInternal(int i) if(m_stop_track == track) { flags |= STOP_AFTER; - m_stop_track = 0; + m_stop_track = nullptr; } if(track->isSelected()) flags |= SELECTION; @@ -574,7 +574,7 @@ int PlayListModel::removeTrackInternal(int i) { flags |= CURRENT; if(m_container->isEmpty()) - m_current_track = 0; + m_current_track = nullptr; else { m_current = i > 0 ? qMin(i - 1, m_container->count() - 1) : 0; @@ -870,7 +870,7 @@ void PlayListModel::prepareForShufflePlaying(bool val) void PlayListModel::prepareGroups(bool enabled) { - PlayListContainer *container = 0; + PlayListContainer *container = nullptr; if(enabled) container = new GroupedContainer; else @@ -927,7 +927,7 @@ void PlayListModel::onTaskFinished() if(m_stop_track && !m_container->contains(m_stop_track)) { - m_stop_track = 0; + m_stop_track = nullptr; flags |= STOP_AFTER; } @@ -1006,7 +1006,7 @@ void PlayListModel::refresh() void PlayListModel::clearQueue() { m_queued_songs.clear(); - m_stop_track = 0; + m_stop_track = nullptr; emit listChanged(QUEUE); } @@ -1016,11 +1016,11 @@ void PlayListModel::stopAfterSelected() int flags = STOP_AFTER; if(!m_queued_songs.isEmpty()) { - m_stop_track = m_stop_track != m_queued_songs.last() ? m_queued_songs.last() : 0; + m_stop_track = m_stop_track != m_queued_songs.last() ? m_queued_songs.last() : nullptr; } else if(selected_tracks.count() == 1) { - m_stop_track = m_stop_track != selected_tracks.at(0) ? selected_tracks.at(0) : 0; + m_stop_track = m_stop_track != selected_tracks.at(0) ? selected_tracks.at(0) : nullptr; } else if(selected_tracks.count() > 1) { diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h index 6ca9471bf..0662aa4a0 100644 --- a/src/qmmpui/playlistmodel.h +++ b/src/qmmpui/playlistmodel.h @@ -109,7 +109,7 @@ public: * @param name Playlist name. * @param parent QObject parent */ - PlayListModel(const QString &name, QObject *parent = 0); + PlayListModel(const QString &name, QObject *parent = nullptr); /*! * Object destructor. */ @@ -480,12 +480,12 @@ public slots: * Shows details for the first selected item. * @param parent parent Widget. */ - void showDetails(QWidget *parent = 0); + void showDetails(QWidget *parent = nullptr); /*! * Shows the details for the current song (if any). * @param parent parent widget. */ - void showDetailsForCurrent(QWidget *parent = 0); + void showDetailsForCurrent(QWidget *parent = nullptr); /*! * Ensures that the current track is visible. */ diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index 2d8f67f06..c30c02ab5 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.cpp @@ -27,7 +27,7 @@ #include "playlistformat.h" #include "playlistparser.h" -QList<PlayListFormat*> *PlayListParser::m_formats = 0; +QList<PlayListFormat*> *PlayListParser::m_formats = nullptr; QList<PlayListFormat *> PlayListParser::formats() { @@ -65,7 +65,7 @@ PlayListFormat *PlayListParser::findByMime(const QString &mime) if(format->properties().contentTypes.contains(mime)) return format; } - return 0; + return nullptr; } PlayListFormat *PlayListParser::findByPath(const QString &filePath) @@ -80,7 +80,7 @@ PlayListFormat *PlayListParser::findByPath(const QString &filePath) return format; } } - return 0; + return nullptr; } PlayListFormat *PlayListParser::findByUrl(const QUrl &url) @@ -172,7 +172,7 @@ void PlayListParser::loadFormats() else qWarning("PlayListParser: %s", qPrintable(loader.errorString ())); - PlayListFormat *fmt = 0; + PlayListFormat *fmt = nullptr; if (plugin) fmt = qobject_cast<PlayListFormat *>(plugin); diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index 027719a8e..8326af7ac 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -114,7 +114,7 @@ PlayListTask::PlayListTask(QObject *parent) : QThread(parent) { m_reverted = true; m_align_groups = false; - m_current_track = 0; + m_current_track = nullptr; m_column = 0; m_task = EMPTY; m_sort_mode = PlayListModel::TITLE; @@ -294,8 +294,8 @@ void PlayListTask::run() if(m_task == SORT || m_task == SORT_SELECTION || m_task == SORT_BY_COLUMN) { - bool(*compareLessFunc)(TrackField*, TrackField*) = 0; - bool(*compareGreaterFunc)(TrackField*, TrackField*) = 0; + bool(*compareLessFunc)(TrackField*, TrackField*) = nullptr; + bool(*compareGreaterFunc)(TrackField*, TrackField*) = nullptr; QList<TrackField*>::iterator begin = m_fields.begin(); QList<TrackField*>::iterator end = m_fields.end(); @@ -368,7 +368,7 @@ void PlayListTask::run() } else if(m_task == REMOVE_INVALID) { - TrackField *f = 0; + TrackField *f = nullptr; bool ok = false; for(int i = 0; i < m_fields.count(); ++i) { @@ -386,7 +386,7 @@ void PlayListTask::run() else if(m_task == REMOVE_DUPLICATES) { QStringList urls; - TrackField *f = 0; + TrackField *f = nullptr; for(int i = 0; i < m_fields.count(); ++i) { f = m_fields.at(i); @@ -403,7 +403,7 @@ void PlayListTask::run() } else if(m_task == REFRESH) { - TrackField *f = 0; + TrackField *f = nullptr; MetaDataManager *mm = MetaDataManager::instance(); bool ok = false; //find invalid files @@ -516,7 +516,7 @@ QList<PlayListTrack *> PlayListTask::takeResults(PlayListTrack **current_track) else if(m_task == REMOVE_INVALID || m_task == REMOVE_DUPLICATES || m_task == REFRESH) { int index = 0; - PlayListTrack *t = 0; + PlayListTrack *t = nullptr; for (int i = m_indexes.count() - 1; i >= 0; i--) { index = m_indexes.at(i); @@ -524,7 +524,7 @@ QList<PlayListTrack *> PlayListTask::takeResults(PlayListTrack **current_track) if(t == m_current_track) { if(m_tracks.isEmpty()) - m_current_track = 0; + m_current_track = nullptr; else if(index > 0 && index <= m_tracks.count()) m_current_track = m_tracks[index - 1]; else @@ -566,5 +566,5 @@ void PlayListTask::clear() m_indexes.clear(); m_input_tracks.clear(); m_tracks.clear(); - m_current_track = 0; + m_current_track = nullptr; } diff --git a/src/qmmpui/qmmpuiplugincache.cpp b/src/qmmpui/qmmpuiplugincache.cpp index ed739168d..126dcb650 100644 --- a/src/qmmpui/qmmpuiplugincache.cpp +++ b/src/qmmpui/qmmpuiplugincache.cpp @@ -33,10 +33,10 @@ QmmpUiPluginCache::QmmpUiPluginCache(const QString &file, QSettings *settings) { m_error = false; - m_instance = 0; - m_generalFactory = 0; - m_uiFactory = 0; - m_fileDialogFactory = 0; + m_instance = nullptr; + m_generalFactory = nullptr; + m_uiFactory = nullptr; + m_fileDialogFactory = nullptr; m_priority = 0; bool update = false; QFileInfo info(file); @@ -105,9 +105,9 @@ QmmpUiPluginCache::QmmpUiPluginCache(QObject *instance) { m_error = false; m_instance = instance; - m_generalFactory = 0; - m_uiFactory = 0; - m_fileDialogFactory = 0; + m_generalFactory = nullptr; + m_uiFactory = nullptr; + m_fileDialogFactory = nullptr; m_priority = 0; if(GeneralFactory *factory = generalFactory()) @@ -190,7 +190,7 @@ FileDialogFactory *QmmpUiPluginCache::fileDialogFactory() QObject *QmmpUiPluginCache::instance() { if(m_error) - return 0; + return nullptr; if(m_instance) return m_instance; QPluginLoader loader(m_path); diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp index 561e6c496..dfb0d9c0d 100644 --- a/src/qmmpui/qmmpuisettings.cpp +++ b/src/qmmpui/qmmpuisettings.cpp @@ -26,7 +26,7 @@ #include "playlistmanager.h" #include "qmmpuisettings.h" -QmmpUiSettings *QmmpUiSettings::m_instance = 0; +QmmpUiSettings *QmmpUiSettings::m_instance = nullptr; QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent) { @@ -67,7 +67,7 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent) QmmpUiSettings::~QmmpUiSettings() { - m_instance = 0; + m_instance = nullptr; sync(); delete m_helper; } diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h index 36e0f930a..fb137358c 100644 --- a/src/qmmpui/qmmpuisettings.h +++ b/src/qmmpui/qmmpuisettings.h @@ -42,7 +42,7 @@ public: * @param parent Parent object. * This functions is for internal usage only, use QmmpSettings::instance() instead. */ - explicit QmmpUiSettings(QObject *parent = 0); + explicit QmmpUiSettings(QObject *parent = nullptr); /*! * Destructor. */ diff --git a/src/qmmpui/radioitemdelegate_p.h b/src/qmmpui/radioitemdelegate_p.h index 1b0887554..b99e13472 100644 --- a/src/qmmpui/radioitemdelegate_p.h +++ b/src/qmmpui/radioitemdelegate_p.h @@ -33,7 +33,7 @@ class RadioItemDelegate : public QStyledItemDelegate { Q_OBJECT public: - explicit RadioItemDelegate(QObject *parent = 0); + explicit RadioItemDelegate(QObject *parent = nullptr); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; diff --git a/src/qmmpui/tageditor_p.h b/src/qmmpui/tageditor_p.h index c4ffd0f94..1e332086c 100644 --- a/src/qmmpui/tageditor_p.h +++ b/src/qmmpui/tageditor_p.h @@ -36,7 +36,7 @@ class TagEditor : public QWidget { Q_OBJECT public: - TagEditor(TagModel *tagModel, QWidget *parent = 0); + TagEditor(TagModel *tagModel, QWidget *parent = nullptr); ~TagEditor(); void save(); diff --git a/src/qmmpui/tagupdater.cpp b/src/qmmpui/tagupdater.cpp index 50f0f926c..bb0ca4bfa 100644 --- a/src/qmmpui/tagupdater.cpp +++ b/src/qmmpui/tagupdater.cpp @@ -37,7 +37,7 @@ void TagUpdater::updateTags() if (!t->isUsed() && t->isSheduledForDeletion()) { delete t; - t = 0; + t = nullptr; } else { diff --git a/src/qmmpui/templateeditor.h b/src/qmmpui/templateeditor.h index 5e769f0e4..51dc453a0 100644 --- a/src/qmmpui/templateeditor.h +++ b/src/qmmpui/templateeditor.h @@ -39,7 +39,7 @@ public: * Constructor. * @param parent Parent widget. */ - explicit TemplateEditor(QWidget *parent = 0); + explicit TemplateEditor(QWidget *parent = nullptr); /*! * Returns current template from editor. */ @@ -62,7 +62,7 @@ public: * @param ok This varible will be set to \b true (\b false) if the user pressed OK (Cancel). */ static QString getTemplate (QWidget *parent, const QString &title, const QString &text = QString(), - const QString &default_template = QString(), bool *ok = 0); + const QString &default_template = QString(), bool *ok = nullptr); private slots: void on_resetButton_clicked(); diff --git a/src/qmmpui/uihelper.cpp b/src/qmmpui/uihelper.cpp index 1d965a9b6..6f3a37415 100644 --- a/src/qmmpui/uihelper.cpp +++ b/src/qmmpui/uihelper.cpp @@ -38,14 +38,14 @@ #include "mediaplayer.h" #include "uihelper.h" -UiHelper *UiHelper::m_instance = 0; +UiHelper *UiHelper::m_instance = nullptr; UiHelper::UiHelper(QObject *parent) : QObject(parent) { m_instance = this; - m_jumpDialog = 0; - m_model = 0; + m_jumpDialog = nullptr; + m_model = nullptr; General::create(parent); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_lastDir = settings.value("General/last_dir", QDir::homePath()).toString(); //last directory diff --git a/src/qmmpui/uihelper.h b/src/qmmpui/uihelper.h index 2ba17cc27..6594e1adb 100644 --- a/src/qmmpui/uihelper.h +++ b/src/qmmpui/uihelper.h @@ -49,7 +49,7 @@ public: * Object constructor, * @param parent Parent object */ - UiHelper(QObject *parent = 0); + UiHelper(QObject *parent = nullptr); /*! * Destructor */ @@ -88,14 +88,14 @@ public: * @param title Menu title. * @param parent Parent widget */ - QMenu *createMenu(MenuType type, const QString &title = QString(), QWidget *parent = 0); + QMenu *createMenu(MenuType type, const QString &title = QString(), QWidget *parent = nullptr); /*! * Registers existing menu for access from general plugins. * @param type Menu type. * @param menu Menu pointer. * @param before An action, after which the rest are added. */ - void registerMenu(MenuType type, QMenu *menu, QAction *before = 0); + void registerMenu(MenuType type, QMenu *menu, QAction *before = nullptr); /*! * Opens 'Add Files' dialog * @param parent Parent widget @@ -149,7 +149,7 @@ public: * Shows about dialog * @param parent Parent widget */ - void about(QWidget *parent = 0); + void about(QWidget *parent = nullptr); /*! * Returns a pointer to the object's instance. */ diff --git a/src/qmmpui/uiloader.cpp b/src/qmmpui/uiloader.cpp index 1c742d587..b144e6c40 100644 --- a/src/qmmpui/uiloader.cpp +++ b/src/qmmpui/uiloader.cpp @@ -23,7 +23,7 @@ #include "qmmpuiplugincache_p.h" #include "uiloader.h" -QList<QmmpUiPluginCache*> *UiLoader::m_cache = 0; +QList<QmmpUiPluginCache*> *UiLoader::m_cache = nullptr; void UiLoader::loadPlugins() { @@ -113,5 +113,5 @@ UiFactory *UiLoader::selected() } if (!m_cache->isEmpty()) return m_cache->at(0)->uiFactory(); - return 0; + return nullptr; } diff --git a/src/qmmpui/winfileassocpage_p.h b/src/qmmpui/winfileassocpage_p.h index 3eecc5489..9ba234084 100644 --- a/src/qmmpui/winfileassocpage_p.h +++ b/src/qmmpui/winfileassocpage_p.h @@ -37,7 +37,7 @@ class QMMPUI_EXPORT WinFileAssocPage : public QWidget { Q_OBJECT public: - WinFileAssocPage(QWidget *parent = 0); + WinFileAssocPage(QWidget *parent = nullptr); virtual ~WinFileAssocPage(); |