diff options
Diffstat (limited to 'examples/widgets/mainwindows/sdi')
-rw-r--r-- | examples/widgets/mainwindows/sdi/main.cpp | 3 | ||||
-rw-r--r-- | examples/widgets/mainwindows/sdi/mainwindow.cpp | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/widgets/mainwindows/sdi/main.cpp b/examples/widgets/mainwindows/sdi/main.cpp index 6e29fafd6f..7a18c0c39c 100644 --- a/examples/widgets/mainwindows/sdi/main.cpp +++ b/examples/widgets/mainwindows/sdi/main.cpp @@ -68,7 +68,8 @@ int main(int argc, char *argv[]) parser.process(app); MainWindow *mainWin = nullptr; - foreach (const QString &file, parser.positionalArguments()) { + const QStringList posArgs = parser.positionalArguments(); + for (const QString &file : posArgs) { MainWindow *newWin = new MainWindow(file); newWin->tile(mainWin); newWin->show(); diff --git a/examples/widgets/mainwindows/sdi/mainwindow.cpp b/examples/widgets/mainwindows/sdi/mainwindow.cpp index 301c85c144..62a74b26e6 100644 --- a/examples/widgets/mainwindows/sdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/sdi/mainwindow.cpp @@ -338,9 +338,9 @@ void MainWindow::loadFile(const QString &fileName) } QTextStream in(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); textEdit->setPlainText(in.readAll()); - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); setCurrentFile(fileName); statusBar()->showMessage(tr("File loaded"), 2000); @@ -434,9 +434,9 @@ bool MainWindow::saveFile(const QString &fileName) } QTextStream out(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); out << textEdit->toPlainText(); - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); setCurrentFile(fileName); statusBar()->showMessage(tr("File saved"), 2000); @@ -472,11 +472,12 @@ MainWindow *MainWindow::findMainWindow(const QString &fileName) const { QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath(); - foreach (QWidget *widget, QApplication::topLevelWidgets()) { + const QList<QWidget *> topLevelWidgets = QApplication::topLevelWidgets(); + for (QWidget *widget : topLevelWidgets) { MainWindow *mainWin = qobject_cast<MainWindow *>(widget); if (mainWin && mainWin->curFile == canonicalFilePath) return mainWin; } - return 0; + return nullptr; } |