kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Start: modernize C++: use range-based for loop

Browse Source
This commit is contained in:
wmayer
2023-08-15 12:57:12 +02:00
committed by wwmayer
parent aeeeaa3783
commit 9b5314bd87
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Start/Gui/DlgStartPreferencesImp.cpp
View File

@@ -50,19 +50,21 @@ DlgStartPreferencesImp::DlgStartPreferencesImp( QWidget* parent )
// sorted by their menu text
QStringList work = Gui::Application::Instance->workbenches();
QMap<QString, QString> menuText;
for (QStringList::Iterator it = work.begin(); it != work.end(); ++it) {
QString text = Gui::Application::Instance->workbenchMenuText(*it);
menuText[text] = *it;
for (const auto& it : work) {
QString text = Gui::Application::Instance->workbenchMenuText(it);
menuText[text] = it;
}
{ // add special workbench to selection
QPixmap px = Gui::Application::Instance->workbenchIcon(QString::fromLatin1("NoneWorkbench"));
QString key = QString::fromLatin1("<last>");
QString value = QString::fromLatin1("$LastModule");
if (px.isNull())
if (px.isNull()) {
ui->AutoloadModuleCombo->addItem(key, QVariant(value));
else
}
else {
ui->AutoloadModuleCombo->addItem(px, key, QVariant(value));
}
}
for (QMap<QString, QString>::Iterator it = menuText.begin(); it != menuText.end(); ++it) {
@@ -150,13 +152,13 @@ void DlgStartPreferencesImp::loadSettings()
/**
* Sets the strings of the subwidgets using the current language.
*/
void DlgStartPreferencesImp::changeEvent(QEvent *e)
void DlgStartPreferencesImp::changeEvent(QEvent *ev)
{
if (e->type() == QEvent::LanguageChange) {
if (ev->type() == QEvent::LanguageChange) {
ui->retranslateUi(this);
}
else {
QWidget::changeEvent(e);
Gui::Dialog::PreferencePage::changeEvent(ev);
}
}

9
src/Mod/Start/Gui/Workbench.cpp
View File

@@ -65,11 +65,12 @@ void StartGui::Workbench::loadStartPage()
// Ensure that we don't open the Start page multiple times
QString title = QCoreApplication::translate("Workbench", "Start page");
QList<QWidget*> ch = Gui::getMainWindow()->windows();
for (QList<QWidget*>::const_iterator c = ch.cbegin(); c != ch.cend(); ++c) {
if ((*c)->windowTitle() == title) {
Gui::MDIView* mdi = qobject_cast<Gui::MDIView*>((*c));
if (mdi)
for (auto c : ch) {
if (c->windowTitle() == title) {
Gui::MDIView* mdi = qobject_cast<Gui::MDIView*>(c);
if (mdi) {
Gui::getMainWindow()->setActiveWindow(mdi);
}
return;
}
}