diff options
Diffstat (limited to 'src/plugins/Ui/qsui')
| -rw-r--r-- | src/plugins/Ui/qsui/actionmanager.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/mainwindow.cpp | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index 8e8e0ca7c..795014bc6 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -272,9 +272,10 @@ void ActionManager::updateToolBar(QToolBar *toolBar, ActionManager::ToolBarInfo ActionManager::ToolBarInfo ActionManager::defaultToolBar() const { - QList <Type> idList; - 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; + const QList<Type> idList = { + PL_ADD_FILE, PL_ADD_DIRECTORY, PREVIOUS, PLAY, PAUSE, STOP, NEXT, EJECT, + UI_SEPARATOR, UI_POS_SLIDER, UI_SEPARATOR, UI_VOL_SLIDER, VOL_MUTE + }; QStringList names; for(const Type &id : qAsConst(idList)) { diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index 73891daf3..83563325b 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -688,7 +688,7 @@ void MainWindow::readSettings() m_titleFormatter.setPattern(settings.value("window_title_format","%if(%p,%p - %t,%t)").toString()); //update toolbars - QList<ActionManager::ToolBarInfo> toolBarInfoList = ActionManager::instance()->readToolBarSettings(); + const QList<ActionManager::ToolBarInfo> toolBarInfoList = ActionManager::instance()->readToolBarSettings(); QList<QToolBar *> toolBars = findChildren<QToolBar*>(); //clear toolbars to avoid conflicts @@ -698,15 +698,17 @@ void MainWindow::readSettings() for(const ActionManager::ToolBarInfo &info : qAsConst(toolBarInfoList)) { bool found = false; - for(QToolBar *toolBar : qAsConst(toolBars)) + QList<QToolBar *>::iterator it = toolBars.begin(); + while(it != toolBars.end()) { - if(toolBar->property("uid").toString() == info.uid) + if((*it)->property("uid").toString() == info.uid) { found = true; - toolBars.removeAll(toolBar); - ActionManager::instance()->updateToolBar(toolBar, info); + ActionManager::instance()->updateToolBar(*it, info); + toolBars.erase(it); break; } + it++; } if(!found) |