diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/mainwindows/mdi | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/mainwindows/mdi')
-rw-r--r-- | examples/widgets/mainwindows/mdi/images/save.png | bin | 1187 -> 2699 bytes | |||
-rw-r--r-- | examples/widgets/mainwindows/mdi/main.cpp | 3 | ||||
-rw-r--r-- | examples/widgets/mainwindows/mdi/mainwindow.cpp | 9 | ||||
-rw-r--r-- | examples/widgets/mainwindows/mdi/mdichild.cpp | 8 |
4 files changed, 11 insertions, 9 deletions
diff --git a/examples/widgets/mainwindows/mdi/images/save.png b/examples/widgets/mainwindows/mdi/images/save.png Binary files differindex daba865faf..e65a29d5f1 100644 --- a/examples/widgets/mainwindows/mdi/images/save.png +++ b/examples/widgets/mainwindows/mdi/images/save.png diff --git a/examples/widgets/mainwindows/mdi/main.cpp b/examples/widgets/mainwindows/mdi/main.cpp index e23f5f6e60..950244ad53 100644 --- a/examples/widgets/mainwindows/mdi/main.cpp +++ b/examples/widgets/mainwindows/mdi/main.cpp @@ -70,7 +70,8 @@ int main(int argc, char *argv[]) parser.process(app); MainWindow mainWin; - foreach (const QString &fileName, parser.positionalArguments()) + const QStringList posArgs = parser.positionalArguments(); + for (const QString &fileName : posArgs) mainWin.openFile(fileName); mainWin.show(); return app.exec(); diff --git a/examples/widgets/mainwindows/mdi/mainwindow.cpp b/examples/widgets/mainwindows/mdi/mainwindow.cpp index 188de1893e..b952d19e2e 100644 --- a/examples/widgets/mainwindows/mdi/mainwindow.cpp +++ b/examples/widgets/mainwindows/mdi/mainwindow.cpp @@ -242,7 +242,7 @@ void MainWindow::about() void MainWindow::updateMenus() { - bool hasMdiChild = (activeMdiChild() != 0); + bool hasMdiChild = (activeMdiChild() != nullptr); saveAct->setEnabled(hasMdiChild); saveAsAct->setEnabled(hasMdiChild); #ifndef QT_NO_CLIPBOARD @@ -483,19 +483,20 @@ MdiChild *MainWindow::activeMdiChild() const { if (QMdiSubWindow *activeSubWindow = mdiArea->activeSubWindow()) return qobject_cast<MdiChild *>(activeSubWindow->widget()); - return 0; + return nullptr; } QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName) const { QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath(); - foreach (QMdiSubWindow *window, mdiArea->subWindowList()) { + const QList<QMdiSubWindow *> subWindows = mdiArea->subWindowList(); + for (QMdiSubWindow *window : subWindows) { MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget()); if (mdiChild->currentFile() == canonicalFilePath) return window; } - return 0; + return nullptr; } void MainWindow::switchLayoutDirection() diff --git a/examples/widgets/mainwindows/mdi/mdichild.cpp b/examples/widgets/mainwindows/mdi/mdichild.cpp index 006c84574a..16f2040de0 100644 --- a/examples/widgets/mainwindows/mdi/mdichild.cpp +++ b/examples/widgets/mainwindows/mdi/mdichild.cpp @@ -82,9 +82,9 @@ bool MdiChild::loadFile(const QString &fileName) } QTextStream in(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); setPlainText(in.readAll()); - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); setCurrentFile(fileName); @@ -124,9 +124,9 @@ bool MdiChild::saveFile(const QString &fileName) } QTextStream out(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); out << toPlainText(); - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); setCurrentFile(fileName); return true; |