diff options
Diffstat (limited to 'src/plugins/Ui')
27 files changed, 92 insertions, 95 deletions
diff --git a/src/plugins/Ui/qsui/aboutqsuidialog.cpp b/src/plugins/Ui/qsui/aboutqsuidialog.cpp index e2a06be2e..595023d53 100644 --- a/src/plugins/Ui/qsui/aboutqsuidialog.cpp +++ b/src/plugins/Ui/qsui/aboutqsuidialog.cpp @@ -66,7 +66,7 @@ QString AboutQSUIDialog::getStringFromResource(const QString& res_file) paths << res_file + ".txt"; paths << res_file; - foreach(QString path, paths) + for(const QString &path : qAsConst(paths)) { QFile file(path); if (file.open(QIODevice::ReadOnly)) diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index 52597aad8..8e8e0ca7c 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -198,7 +198,7 @@ void ActionManager::saveStates() void ActionManager::saveActions() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - foreach(QAction *action, m_actions.values()) + for(const QAction *action : m_actions.values()) { settings.setValue(QString("SimpleUiShortcuts/")+action->objectName(), action->shortcut()); } @@ -206,7 +206,7 @@ void ActionManager::saveActions() void ActionManager::resetShortcuts() { - foreach (QAction *action, m_actions.values()) + for(QAction *action : m_actions.values()) { action->setShortcut(action->property("defaultShortcut").toString()); } @@ -254,7 +254,7 @@ void ActionManager::updateToolBar(QToolBar *toolBar, ActionManager::ToolBarInfo { toolBar->clear(); toolBar->setIconSize(info.iconSize); - foreach (QString name, info.actionNames) + for(const QString &name : qAsConst(info.actionNames)) { if(name == "separator") { @@ -276,7 +276,7 @@ ActionManager::ToolBarInfo ActionManager::defaultToolBar() const idList << PL_ADD_FILE << PL_ADD_DIRECTORY << PREVIOUS << PLAY << PAUSE << STOP << NEXT << EJECT; idList << UI_SEPARATOR << UI_POS_SLIDER << UI_SEPARATOR << UI_VOL_SLIDER << VOL_MUTE; QStringList names; - foreach (Type id, idList) + for(const Type &id : qAsConst(idList)) { if(id == UI_SEPARATOR) { diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp index cb32a202c..fe1e093d4 100644 --- a/src/plugins/Ui/qsui/equalizer.cpp +++ b/src/plugins/Ui/qsui/equalizer.cpp @@ -113,7 +113,7 @@ Equalizer::Equalizer(QWidget *parent) : QDialog(parent) m_layout->addItem(slidersLayout); m_layout->addItem(buttonsLayout); setMinimumHeight(300); - foreach(QSlider *slider, m_sliders) + for(const QSlider *slider : qAsConst(m_sliders)) { connect(slider, SIGNAL(valueChanged(int)), SLOT(applySettings())); } @@ -181,7 +181,7 @@ void Equalizer::applySettings() void Equalizer::resetSettings() { - foreach(QSlider *slider, m_sliders) + for(QSlider *slider : qAsConst(m_sliders)) { slider->setValue(0); } diff --git a/src/plugins/Ui/qsui/filesystembrowser.cpp b/src/plugins/Ui/qsui/filesystembrowser.cpp index 099b85e62..ae7a07da6 100644 --- a/src/plugins/Ui/qsui/filesystembrowser.cpp +++ b/src/plugins/Ui/qsui/filesystembrowser.cpp @@ -150,7 +150,7 @@ void FileSystemBrowser::onListViewActivated(const QModelIndex &index) void FileSystemBrowser::addToPlayList() { - foreach (QModelIndex index, m_listView->selectionModel()->selectedIndexes()) + for(const QModelIndex &index : m_listView->selectionModel()->selectedIndexes()) { if(!index.isValid()) continue; diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp index 08b98d657..b78caa4c4 100644 --- a/src/plugins/Ui/qsui/logo.cpp +++ b/src/plugins/Ui/qsui/logo.cpp @@ -158,7 +158,7 @@ void Logo::processPreset2() QString str = QString("..0000..");//.arg(Qmmp::strVersion().left(5)); int at = m_value % str.size(); - foreach(QString line, m_source_lines) + for(QString line : qAsConst(m_source_lines)) { while(line.contains("X")) { @@ -178,7 +178,7 @@ void Logo::processPreset3() QString str = QString("...%1...").arg(Qmmp::strVersion().left(5)); int at = m_value % str.size(); - foreach(QString line, m_source_lines) + for(QString line : qAsConst(m_source_lines)) { while(line.contains("X")) { @@ -211,7 +211,7 @@ void Logo::processPreset4() int at = 0; - foreach(QString line, m_source_lines) + for(QString line : qAsConst(m_source_lines)) { int count = line.count("X"); int k = 0; diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index f7aa07a0a..73891daf3 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -91,7 +91,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) //keyboard manager m_key_manager = new KeyboardManager(this); //create tabs - foreach(PlayListModel *model, m_pl_manager->playLists()) + for(PlayListModel *model : m_pl_manager->playLists()) { if(m_pl_manager->currentPlayList() != model) m_tabWidget->addTab(model->name()); @@ -692,13 +692,13 @@ void MainWindow::readSettings() QList<QToolBar *> toolBars = findChildren<QToolBar*>(); //clear toolbars to avoid conflicts - foreach (QToolBar *toolBar, toolBars) + for(QToolBar *toolBar : qAsConst(toolBars)) toolBar->clear(); - foreach (ActionManager::ToolBarInfo info, toolBarInfoList) + for(const ActionManager::ToolBarInfo &info : qAsConst(toolBarInfoList)) { bool found = false; - foreach (QToolBar *toolBar, toolBars) + for(QToolBar *toolBar : qAsConst(toolBars)) { if(toolBar->property("uid").toString() == info.uid) { @@ -715,7 +715,7 @@ void MainWindow::readSettings() } } - foreach (QToolBar *toolBar, toolBars) + for(QToolBar *toolBar : qAsConst(toolBars)) toolBar->deleteLater(); toolBars.clear(); setToolBarsBlocked(ACTION(ActionManager::UI_BLOCK_TOOLBARS)->isChecked()); @@ -925,7 +925,7 @@ void MainWindow::setTitleBarsVisible(bool visible) void MainWindow::setToolBarsBlocked(bool blocked) { - foreach (QToolBar *t, findChildren<QToolBar *>()) + for(QToolBar *t : findChildren<QToolBar *>()) { t->setMovable(!blocked); } diff --git a/src/plugins/Ui/qsui/playlistbrowser.cpp b/src/plugins/Ui/qsui/playlistbrowser.cpp index fbe370130..9d831e400 100644 --- a/src/plugins/Ui/qsui/playlistbrowser.cpp +++ b/src/plugins/Ui/qsui/playlistbrowser.cpp @@ -74,7 +74,7 @@ void PlayListBrowser::updateList() { m_listView->selectionModel()->blockSignals(true); m_listModel->clear(); - foreach(PlayListModel *model, m_pl_manager->playLists()) + for(PlayListModel *model : m_pl_manager->playLists()) { QStandardItem *item = new QStandardItem(model->name()); if(m_pl_manager->currentPlayList() == model) diff --git a/src/plugins/Ui/qsui/playlistheader.cpp b/src/plugins/Ui/qsui/playlistheader.cpp index d2b52caa7..2c4bdb9a9 100644 --- a/src/plugins/Ui/qsui/playlistheader.cpp +++ b/src/plugins/Ui/qsui/playlistheader.cpp @@ -79,7 +79,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) : m_alignmentMenu->addAction(tr("Center", "alignment"))->setData(ListWidgetRow::ALIGN_CENTER); connect(m_alignmentMenu, SIGNAL(triggered(QAction*)), SLOT(setAlignment(QAction*))); QActionGroup *alignmentGroup = new QActionGroup(this); - foreach (QAction *a, m_alignmentMenu->actions()) + for(QAction *a : m_alignmentMenu->actions()) { a->setCheckable(true); alignmentGroup->addAction(a); @@ -275,7 +275,7 @@ int PlayListHeader::maxScrollValue() const return 0; int row_width = 0; - foreach (int size, sizes()) + for(int size : sizes()) { row_width += size; } @@ -633,7 +633,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e) m_autoResizeAction->setChecked(m_model->data(m_pressed_column, AUTO_RESIZE).toBool()); int alignment = m_model->data(m_pressed_column, ALIGNMENT).toInt(); - foreach (QAction *action, m_alignmentMenu->actions()) + for(QAction *action : m_alignmentMenu->actions()) { if(action->data().toInt() == alignment) { @@ -643,7 +643,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e) } //hide unused actions - foreach (QAction *action, m_menu->actions()) + for(QAction *action : m_menu->actions()) { if(m_menu->actions().at(0) == action) action->setVisible(m_model->count() < MAX_COLUMNS); @@ -656,7 +656,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e) } else { - foreach (QAction *action, m_menu->actions()) + for(QAction *action : m_menu->actions()) { if(action == m_menu->actions().first()) action->setVisible(m_model->count() < MAX_COLUMNS); diff --git a/src/plugins/Ui/qsui/qsuianalyzer.cpp b/src/plugins/Ui/qsui/qsuianalyzer.cpp index e86174d16..868a042c7 100644 --- a/src/plugins/Ui/qsui/qsuianalyzer.cpp +++ b/src/plugins/Ui/qsui/qsuianalyzer.cpp @@ -238,7 +238,7 @@ void QSUiAnalyzer::createMenu() m_fpsGroup->addAction(tr("25 fps"))->setData(25); m_fpsGroup->addAction(tr("10 fps"))->setData(10); m_fpsGroup->addAction(tr("5 fps"))->setData(5); - foreach(QAction *act, m_fpsGroup->actions ()) + for(QAction *act : m_fpsGroup->actions ()) { act->setCheckable(true); refreshRate->addAction(act); @@ -252,7 +252,7 @@ void QSUiAnalyzer::createMenu() m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(2.2); m_analyzerFalloffGroup->addAction(tr("Fast"))->setData(2.4); m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(2.8); - foreach(QAction *act, m_analyzerFalloffGroup->actions ()) + for(QAction *act : m_analyzerFalloffGroup->actions ()) { act->setCheckable(true); analyzerFalloff->addAction(act); @@ -266,7 +266,7 @@ void QSUiAnalyzer::createMenu() m_peaksFalloffGroup->addAction(tr("Medium"))->setData(0.2); m_peaksFalloffGroup->addAction(tr("Fast"))->setData(0.4); m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(0.8); - foreach(QAction *act, m_peaksFalloffGroup->actions ()) + for(QAction *act : m_peaksFalloffGroup->actions ()) { act->setCheckable(true); peaksFalloff->addAction(act); @@ -317,17 +317,17 @@ void QSUiAnalyzer::readSettings() m_coverAction->setChecked(m_show_cover); m_peaksAction->setChecked(m_show_peaks); - foreach(QAction *act, m_fpsGroup->actions ()) + for(QAction *act : m_fpsGroup->actions ()) { if (m_timer->interval() == 1000 / act->data().toInt()) act->setChecked(true); } - foreach(QAction *act, m_peaksFalloffGroup->actions ()) + for(QAction *act : m_peaksFalloffGroup->actions ()) { if (m_peaks_falloff == act->data().toDouble()) act->setChecked(true); } - foreach(QAction *act, m_analyzerFalloffGroup->actions ()) + for(QAction *act : m_analyzerFalloffGroup->actions ()) { if (m_analyzer_falloff == act->data().toDouble()) act->setChecked(true); diff --git a/src/plugins/Ui/qsui/shortcutdialog.cpp b/src/plugins/Ui/qsui/shortcutdialog.cpp index 51b357e0f..5d67feaa8 100644 --- a/src/plugins/Ui/qsui/shortcutdialog.cpp +++ b/src/plugins/Ui/qsui/shortcutdialog.cpp @@ -28,7 +28,7 @@ ShortcutDialog::ShortcutDialog(const QString &key, QWidget *parent) m_ui.keyLineEdit->setText(key); //buttons should not catch keys - foreach(QAbstractButton *button, m_ui.buttonBox->buttons()) + for(QAbstractButton *button : m_ui.buttonBox->buttons()) button->setFocusPolicy(Qt::NoFocus); } diff --git a/src/plugins/Ui/qsui/toolbareditor.cpp b/src/plugins/Ui/qsui/toolbareditor.cpp index 4d54e7206..a0024e864 100644 --- a/src/plugins/Ui/qsui/toolbareditor.cpp +++ b/src/plugins/Ui/qsui/toolbareditor.cpp @@ -76,7 +76,7 @@ void ToolBarEditor::populateActionList(bool reset) } QStringList actionNames; - foreach (ActionManager::ToolBarInfo info, m_toolBarInfoList) + for(const ActionManager::ToolBarInfo &info : qAsConst(m_toolBarInfoList)) { actionNames << info.actionNames; m_ui->toolbarNameComboBox->addItem(info.title); @@ -191,7 +191,7 @@ void ToolBarEditor::on_toolbarNameComboBox_activated(int index) return; ActionManager::ToolBarInfo info = m_toolBarInfoList.at(index); - foreach (QString name, info.actionNames) + for(const QString &name : qAsConst(info.actionNames)) { if(name == "separator") { diff --git a/src/plugins/Ui/qsui/visualmenu.cpp b/src/plugins/Ui/qsui/visualmenu.cpp index 0defc96fe..b8f56dc39 100644 --- a/src/plugins/Ui/qsui/visualmenu.cpp +++ b/src/plugins/Ui/qsui/visualmenu.cpp @@ -26,8 +26,7 @@ VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent) { - VisualFactory *factory = nullptr; - foreach(factory, Visual::factories()) + for(VisualFactory *factory : Visual::factories()) { VisualAction *act = new VisualAction(factory, this); addAction(act); diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp index 8ee1fb667..7048ca58f 100644 --- a/src/plugins/Ui/skinned/actionmanager.cpp +++ b/src/plugins/Ui/skinned/actionmanager.cpp @@ -179,7 +179,7 @@ void ActionManager::saveStates() void ActionManager::saveActions() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - foreach(QAction *action, m_actions.values()) + for(const QAction *action : m_actions.values()) { settings.setValue(QString("SkinnedShortcuts/")+action->objectName(), action->shortcut()); } @@ -187,7 +187,7 @@ void ActionManager::saveActions() void ActionManager::resetShortcuts() { - foreach (QAction *action, m_actions.values()) + for(QAction *action : m_actions.values()) { action->setShortcut(action->property("defaultShortcut").toString()); } diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp index 7f8c291f1..4da50d4c2 100644 --- a/src/plugins/Ui/skinned/dock.cpp +++ b/src/plugins/Ui/skinned/dock.cpp @@ -199,7 +199,7 @@ void Dock::move (QWidget* mv, QPoint npos) void Dock::calculateDistances() { m_delta_list.clear(); - foreach (QWidget *w, m_widgetList) + for(const QWidget *w : qAsConst(m_widgetList)) { if (w == m_mainWidget) m_delta_list.append(QPoint(0,0)); diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp index 55ff6d797..2cd1efc7e 100644 --- a/src/plugins/Ui/skinned/eqwidget.cpp +++ b/src/plugins/Ui/skinned/eqwidget.cpp @@ -151,7 +151,7 @@ void EqWidget::readSettings() QPoint pos = settings.value("Skinned/eq_pos", QPoint(100, 216)).toPoint(); int r = m_skin->ratio(); //TODO QGuiApplication::screenAt - foreach(QScreen *screen, QGuiApplication::screens()) + for(const QScreen *screen : QGuiApplication::screens()) { if(screen->availableGeometry().contains(pos)) { @@ -321,7 +321,7 @@ void EqWidget::savePreset() preset->setPreamp(m_preamp->value()); for (int i = 0; i<10; ++i) preset->setGain(i, m_sliders.at (i)->value()); - foreach(EQPreset *p, m_presets) //remove preset with same name + for(EQPreset *p : qAsConst(m_presets)) //remove preset with same name { if (p->text() == text) { @@ -391,7 +391,7 @@ void EqWidget::loadPreset(const QString &name) EQPreset *EqWidget::findPreset(const QString &name) { - foreach(EQPreset *preset, m_autoPresets) + for(EQPreset *preset : qAsConst(m_autoPresets)) { if (preset->text() == name) return preset; diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp index 6f24a432f..e726866d9 100644 --- a/src/plugins/Ui/skinned/mainvisual.cpp +++ b/src/plugins/Ui/skinned/mainvisual.cpp @@ -132,7 +132,7 @@ void MainVisual::mousePressEvent (QMouseEvent *e) setVisual(nullptr); QString str = m_vis ? m_vis->name() : "Off"; - foreach(QAction *act, m_visModeGroup->actions ()) + for(QAction *act : m_visModeGroup->actions()) { if (str == act->data().toString()) { @@ -216,7 +216,7 @@ void MainVisual::createMenu() m_visModeGroup->addAction(tr("Analyzer"))->setData("Analyzer"); m_visModeGroup->addAction(tr("Scope"))->setData("Scope"); m_visModeGroup->addAction(tr("Off"))->setData("Off"); - foreach(QAction *act, m_visModeGroup->actions ()) + for(QAction *act : m_visModeGroup->actions()) { act->setCheckable(true); visMode->addAction(act); @@ -230,13 +230,13 @@ void MainVisual::createMenu() m_analyzerModeGroup->addAction(tr("Vertical Lines"))->setData(2); m_analyzerTypeGroup->addAction(tr("Lines"))->setData(0); m_analyzerTypeGroup->addAction(tr("Bars"))->setData(1); - foreach(QAction *act, m_analyzerModeGroup->actions ()) + for(QAction *act : m_analyzerModeGroup->actions()) { act->setCheckable(true); analyzerMode->addAction(act); } analyzerMode->addSeparator (); - foreach(QAction *act, m_analyzerTypeGroup->actions ()) + for(QAction *act : m_analyzerTypeGroup->actions()) { act->setCheckable(true); analyzerMode->addAction(act); @@ -253,7 +253,7 @@ void MainVisual::createMenu() m_fpsGroup->addAction(tr("25 fps"))->setData(25); m_fpsGroup->addAction(tr("10 fps"))->setData(10); m_fpsGroup->addAction(tr("5 fps"))->setData(5); - foreach(QAction *act, m_fpsGroup->actions ()) + for(QAction *act : m_fpsGroup->actions()) { act->setCheckable(true); refreshRate->addAction(act); @@ -267,7 +267,7 @@ void MainVisual::createMenu() m_analyzerFalloffGroup->addAction(tr("Medium"))->setData(2.2); m_analyzerFalloffGroup->addAction(tr("Fast"))->setData(2.4); m_analyzerFalloffGroup->addAction(tr("Fastest"))->setData(2.8); - foreach(QAction *act, m_analyzerFalloffGroup->actions ()) + for(QAction *act : m_analyzerFalloffGroup->actions()) { act->setCheckable(true); analyzerFalloff->addAction(act); @@ -281,7 +281,7 @@ void MainVisual::createMenu() m_peaksFalloffGroup->addAction(tr("Medium"))->setData(0.2); m_peaksFalloffGroup->addAction(tr("Fast"))->setData(0.4); m_peaksFalloffGroup->addAction(tr("Fastest"))->setData(0.8); - foreach(QAction *act, m_peaksFalloffGroup->actions ()) + for(QAction *act : m_peaksFalloffGroup->actions()) { act->setCheckable(true); peaksFalloff->addAction(act); @@ -302,38 +302,38 @@ void MainVisual::readSettings() { m_update = true; - foreach(QAction *act, m_visModeGroup->actions ()) + for(QAction *act : m_visModeGroup->actions()) { if (vis_name == act->data().toString()) act->setChecked(true); } m_peaksAction->setChecked(settings.value("vis_show_peaks", true).toBool()); int fps = settings.value("vis_rate", 25).toInt(); - foreach(QAction *act, m_fpsGroup->actions ()) + for(QAction *act : m_fpsGroup->actions()) { if (fps == act->data().toInt()) act->setChecked(true); } int mode = settings.value("vis_analyzer_mode", 0).toInt(); - foreach(QAction *act, m_analyzerModeGroup->actions ()) + for(QAction *act : m_analyzerModeGroup->actions ()) { if (mode == act->data().toInt()) act->setChecked(true); } int type = settings.value("vis_analyzer_type", 1).toInt(); - foreach(QAction *act, m_analyzerTypeGroup->actions ()) + for(QAction *act : m_analyzerTypeGroup->actions ()) { if (type == act->data().toInt()) act->setChecked(true); } double speed = settings.value("vis_peaks_falloff", 0.2).toDouble(); - foreach(QAction *act, m_peaksFalloffGroup->actions ()) + for(QAction *act : m_peaksFalloffGroup->actions ()) { if (speed == act->data().toDouble()) act->setChecked(true); } speed = settings.value("vis_analyzer_falloff", 2.2).toDouble(); - foreach(QAction *act, m_analyzerFalloffGroup->actions ()) + for(QAction *act : m_analyzerFalloffGroup->actions ()) { if (speed == act->data().toDouble()) act->setChecked(true); diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index 14e57f385..e2ca6b9c0 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -279,7 +279,7 @@ void MainWindow::readSettings() QRect availableGeometry = screen->availableGeometry(); QPoint pos = settings.value("mw_pos", QPoint(100, 100)).toPoint(); int r = m_skin->ratio(); - foreach(QScreen *screen, QGuiApplication::screens()) + for(const QScreen *screen : QGuiApplication::screens()) { if(screen->availableGeometry().contains(pos)) { diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index 43f4fc7bf..334fa4bfb 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -473,7 +473,7 @@ void PlayList::readSettings() QPoint pos = settings.value ("Skinned/pl_pos", QPoint (100, 332)).toPoint(); m_ratio = m_skin->ratio(); //TODO QGuiApplication::screenAt - foreach(QScreen *screen, QGuiApplication::screens()) + for(const QScreen *screen : QGuiApplication::screens()) { if(screen->availableGeometry().contains(pos)) { @@ -611,7 +611,7 @@ void PlayList::generateCopySelectedMenu() action->setIcon(QIcon::fromTheme("document-new")); m_copySelectedMenu->addSeparator(); - foreach(QString name, m_pl_manager->playListNames()) + for(QString name : m_pl_manager->playListNames()) { m_copySelectedMenu->addAction("&"+name.replace("&", "&&")); } @@ -628,7 +628,7 @@ void PlayList::copySelectedMenuActionTriggered(QAction *action) else { actionText.remove(0,1).replace("&&", "&"); - foreach(PlayListModel *model, m_pl_manager->playLists()) + for(PlayListModel *model : m_pl_manager->playLists()) { //if("&" + model->name().replace("&", "&&") == actionText) if(model->name() == actionText) @@ -644,7 +644,7 @@ void PlayList::copySelectedMenuActionTriggered(QAction *action) return; } QList <PlayListTrack *> theCopy; - foreach(PlayListTrack *track, m_pl_manager->selectedPlayList()->selectedTracks()) + for(PlayListTrack *track : m_pl_manager->selectedPlayList()->selectedTracks()) { PlayListTrack *newItem = new PlayListTrack(*track); theCopy << newItem; diff --git a/src/plugins/Ui/skinned/playlistbrowser.cpp b/src/plugins/Ui/skinned/playlistbrowser.cpp index 56299ffd7..a4db5699f 100644 --- a/src/plugins/Ui/skinned/playlistbrowser.cpp +++ b/src/plugins/Ui/skinned/playlistbrowser.cpp @@ -69,7 +69,7 @@ void PlayListBrowser::updateList() { m_ui.listView->selectionModel()->blockSignals(true); m_listModel->clear(); - foreach(PlayListModel *model, m_pl_manager->playLists()) + for(PlayListModel *model : m_pl_manager->playLists()) { QStandardItem *item = new QStandardItem(model->name()); if(m_pl_manager->currentPlayList() == model) @@ -129,11 +129,11 @@ void PlayListBrowser::rename() void PlayListBrowser::on_deleteButton_clicked() { QModelIndexList selectedIndexes; - foreach(QModelIndex index, m_ui.listView->selectionModel()->selectedIndexes()) + for(const QModelIndex &index : m_ui.listView->selectionModel()->selectedIndexes()) { selectedIndexes << m_proxyModel->mapToSource(index); } - foreach (QModelIndex index, selectedIndexes) + for(const QModelIndex &index : qAsConst(selectedIndexes)) { m_pl_manager->removePlayList(index.row()); } diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp index 0507f2f98..22ee0e023 100644 --- a/src/plugins/Ui/skinned/playlistheader.cpp +++ b/src/plugins/Ui/skinned/playlistheader.cpp @@ -100,7 +100,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) : m_alignmentMenu->addAction(tr("Center", "alignment"))->setData(ListWidgetRow::ALIGN_CENTER); connect(m_alignmentMenu, SIGNAL(triggered(QAction*)), SLOT(setAlignment(QAction*))); QActionGroup *alignmentGroup = new QActionGroup(this); - foreach (QAction *a, m_alignmentMenu->actions()) + for(QAction *a : m_alignmentMenu->actions()) { a->setCheckable(true); alignmentGroup->addAction(a); @@ -276,7 +276,7 @@ int PlayListHeader::maxScrollValue() const return 0; int row_width = 0; - foreach (int size, sizes()) + for(int size : sizes()) { row_width += size; } @@ -637,7 +637,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e) m_autoResizeAction->setChecked(m_model->data(m_pressed_column, AUTO_RESIZE).toBool()); int alignment = m_model->data(m_pressed_column, ALIGNMENT).toInt(); - foreach (QAction *action, m_alignmentMenu->actions()) + for(QAction *action : m_alignmentMenu->actions()) { if(action->data().toInt() == alignment) { @@ -647,7 +647,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e) } //hide unused actions - foreach (QAction *action, m_menu->actions()) + for(QAction *action : m_menu->actions()) { if(m_menu->actions().at(0) == action) action->setVisible(m_model->count() < MAX_COLUMNS); @@ -660,7 +660,7 @@ void PlayListHeader::contextMenuEvent(QContextMenuEvent *e) } else { - foreach (QAction *action, m_menu->actions()) + for(QAction *action : m_menu->actions()) { if(action == m_menu->actions().first()) action->setVisible(m_model->count() < MAX_COLUMNS); diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp index d3f3006c9..562d95d7f 100644 --- a/src/plugins/Ui/skinned/playlistselector.cpp +++ b/src/plugins/Ui/skinned/playlistselector.cpp @@ -92,7 +92,7 @@ void PlayListSelector::updateTabs() m_rects.clear(); m_extra_rects.clear(); QRect rect; - foreach(QString text, m_pl_manager->playListNames()) + for(const QString &text : m_pl_manager->playListNames()) { if(m_rects.isEmpty()) rect.setX(9); diff --git a/src/plugins/Ui/skinned/preseteditor.cpp b/src/plugins/Ui/skinned/preseteditor.cpp index 87e29f869..7d483601a 100644 --- a/src/plugins/Ui/skinned/preseteditor.cpp +++ b/src/plugins/Ui/skinned/preseteditor.cpp @@ -45,7 +45,7 @@ PresetEditor::~PresetEditor() void PresetEditor::addPresets(const QList<EQPreset*> &presets) { - foreach(QListWidgetItem *item, presets) + for(QListWidgetItem *item : qAsConst(presets)) { ui.presetListWidget->addItem(item); } @@ -53,7 +53,7 @@ void PresetEditor::addPresets(const QList<EQPreset*> &presets) void PresetEditor::addAutoPresets(const QList<EQPreset*> &presets) { - foreach(QListWidgetItem *item, presets) + for(QListWidgetItem *item : qAsConst(presets)) { ui.autoPresetListWidget->addItem(item); } diff --git a/src/plugins/Ui/skinned/shortcutdialog.cpp b/src/plugins/Ui/skinned/shortcutdialog.cpp index 311e53c14..83243c220 100644 --- a/src/plugins/Ui/skinned/shortcutdialog.cpp +++ b/src/plugins/Ui/skinned/shortcutdialog.cpp @@ -28,7 +28,7 @@ ShortcutDialog::ShortcutDialog(const QString &key, QWidget *parent) m_ui.keyLineEdit->setText(key); //buttons should not catch keys - foreach(QAbstractButton *button, m_ui.buttonBox->buttons()) + for(QAbstractButton *button : m_ui.buttonBox->buttons()) button->setFocusPolicy(Qt::NoFocus); } diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp index f379955fb..4b96899c8 100644 --- a/src/plugins/Ui/skinned/skin.cpp +++ b/src/plugins/Ui/skinned/skin.cpp @@ -132,20 +132,19 @@ void Skin::setSkin (const QString& path) loadColors(); if(m_double_size) { - uint key; - foreach(key, m_buttons.keys()) + for(uint key : m_buttons.keys()) m_buttons[key] = scalePixmap(m_buttons[key]); - foreach(key, m_titlebar.keys()) + for(uint key : m_titlebar.keys()) m_titlebar[key] = scalePixmap(m_titlebar[key]); - foreach(key, m_pl_parts.keys()) + for(uint key : m_pl_parts.keys()) m_pl_parts[key] = scalePixmap(m_pl_parts[key]); - foreach(key, m_eq_parts.keys()) + for(uint key : m_eq_parts.keys()) m_eq_parts[key] = scalePixmap(m_eq_parts[key]); - foreach(key, m_ms_parts.keys()) + for(uint key : m_ms_parts.keys()) m_ms_parts[key] = scalePixmap(m_ms_parts[key]); - foreach(key, m_parts.keys()) + for(uint key : m_parts.keys()) m_parts[key] = scalePixmap(m_parts[key]); - foreach(QChar c, m_letters.keys()) + for(const QChar &c : m_letters.keys()) m_letters[c] = scalePixmap(m_letters[c]); m_main = scalePixmap(m_main); posbar = scalePixmap(posbar); @@ -400,7 +399,7 @@ void Skin::loadPlayList() QPixmap *Skin::getPixmap (const QString& name, const QString &fallback) { m_skin_dir.setFilter (QDir::Files | QDir::Hidden | QDir::NoSymLinks); - foreach(QFileInfo info, m_skin_dir.entryInfoList(QStringList() << name + ".*")) + for(const QFileInfo &info : m_skin_dir.entryInfoList(QStringList() << name + ".*")) { if(info.suffix().toLower() != "cur" && info.suffix().toLower() != "txt") return new QPixmap (info.filePath()); @@ -408,7 +407,7 @@ QPixmap *Skin::getPixmap (const QString& name, const QString &fallback) if(!fallback.isEmpty()) { - foreach(QFileInfo info, m_skin_dir.entryInfoList(QStringList() << fallback + ".*")) + for(const QFileInfo &info : m_skin_dir.entryInfoList(QStringList() << fallback + ".*")) { if(info.suffix().toLower() != "cur" && info.suffix().toLower() != "txt") return new QPixmap (info.filePath()); @@ -795,7 +794,7 @@ QRegion Skin::createRegion(const QString &path, const QString &key) QStringList numPoints = settings.value(key+"/NumPoints").toStringList(); QStringList value = settings.value(key+"/PointList").toStringList(); QStringList numbers; - foreach(QString str, value) + for(const QString &str : qAsConst(value)) numbers << str.split(" ", QString::SkipEmptyParts); QList <QRegion> regions; diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 6bc10c20e..141498aa0 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -119,7 +119,7 @@ void SkinnedSettings::on_skinInstallButton_clicked() { QStringList files = FileDialog::getOpenFileNames(this,tr("Select Skin Files"), QDir::homePath(), tr("Skin files") + " (*.tar.gz *.tgz *.tar.bz2 *.zip *.wsz)"); - foreach(QString path, files) + for(const QString &path : qAsConst(files)) { QFile file(path); file.copy(Qmmp::configDir() + "/skins/" + QFileInfo(path).fileName()); @@ -163,7 +163,7 @@ void SkinnedSettings::findSkins(const QString &path) QList <QFileInfo> fileList = dir.entryInfoList(); if (fileList.count() == 0) return; - foreach (QFileInfo fileInfo, fileList) + for(const QFileInfo &fileInfo : qAsConst(fileList)) { QPixmap preview = Skin::getPixmap ("main", QDir(fileInfo.filePath ())); if (!preview.isNull()) @@ -203,7 +203,7 @@ void SkinnedSettings::loadSkins() #else findSkins(Qmmp::dataPath()); #endif - foreach(QString path, m_reader->skins()) + for(const QString &path : m_reader->skins()) { QListWidgetItem *item = new QListWidgetItem (path.section('/', -1)); item->setIcon (m_reader->getPreview(path)); diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp index 0494af7ea..ae3faa305 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -60,10 +60,10 @@ void SkinReader::generateThumbs() cache_dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); QFileInfoList d = cache_dir.entryInfoList(); //clear removed skins from cache - foreach(QFileInfo thumbFile, d) + for(const QFileInfo &thumbFile : qAsConst(d)) { bool del = true; - foreach(QFileInfo fileInfo, f) + for(const QFileInfo &fileInfo : qAsConst(f)) { if (fileInfo.baseName () == thumbFile.baseName ()) { @@ -80,10 +80,10 @@ void SkinReader::generateThumbs() } } //add new skins to cache - foreach(QFileInfo fileInfo, f) + for(const QFileInfo &fileInfo : qAsConst(f)) { bool create = true; - foreach(QFileInfo thumbInfo, d) + for(const QFileInfo &thumbInfo : qAsConst(d)) { if (fileInfo.baseName () == thumbInfo.baseName ()) { @@ -106,9 +106,9 @@ void SkinReader::generateThumbs() //add thumbs to map cache_dir.refresh(); d = cache_dir.entryInfoList(); - foreach(QFileInfo fileInfo, f) + for(const QFileInfo &fileInfo : qAsConst(f)) { - foreach(QFileInfo thumbInfo, d) + for(const QFileInfo &thumbInfo : qAsConst(d)) { if (fileInfo.baseName () == thumbInfo.baseName ()) { @@ -126,7 +126,7 @@ void SkinReader::unpackSkin(const QString &path) QDir dir(Qmmp::configDir() + "/cache/skin"); dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks); QFileInfoList f = dir.entryInfoList(); - foreach(QFileInfo file, f) + for(const QFileInfo &file : qAsConst(f)) dir.remove(file.fileName()); //unpack QString name = QFileInfo(path).fileName().toLower(); @@ -157,7 +157,7 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview) array = m_process->readAllStandardOutput (); QString str = QString(array); QStringList outputList = str.split("\n", QString::SkipEmptyParts); - foreach(QString str, outputList) + for(QString str : qAsConst(outputList)) { str = str.trimmed(); args.clear(); @@ -194,7 +194,7 @@ void SkinReader::unzip(const QString &from, const QString &to, bool preview) QDir dir(to); dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); QFileInfoList fileList = dir.entryInfoList(); - foreach(QFileInfo thumbInfo, fileList) + for(const QFileInfo &thumbInfo : qAsConst(fileList)) { if (thumbInfo.fileName().startsWith("main.", Qt::CaseInsensitive)) { diff --git a/src/plugins/Ui/skinned/visualmenu.cpp b/src/plugins/Ui/skinned/visualmenu.cpp index cf99d361a..6135eda10 100644 --- a/src/plugins/Ui/skinned/visualmenu.cpp +++ b/src/plugins/Ui/skinned/visualmenu.cpp @@ -25,8 +25,7 @@ VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent) { - VisualFactory *factory = nullptr; - foreach(factory, Visual::factories()) + for(VisualFactory *factory : Visual::factories()) { VisualAction *act = new VisualAction(factory, this); addAction(act); |