diff options
Diffstat (limited to 'examples/widgets/mainwindows')
10 files changed, 41 insertions, 35 deletions
diff --git a/examples/widgets/mainwindows/application/mainwindow.cpp b/examples/widgets/mainwindows/application/mainwindow.cpp index dc93fe4eb2..4b639ead18 100644 --- a/examples/widgets/mainwindows/application/mainwindow.cpp +++ b/examples/widgets/mainwindows/application/mainwindow.cpp @@ -337,11 +337,11 @@ void MainWindow::loadFile(const QString &fileName) QTextStream in(&file); #ifndef QT_NO_CURSOR - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif textEdit->setPlainText(in.readAll()); #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif setCurrentFile(fileName); @@ -364,11 +364,11 @@ bool MainWindow::saveFile(const QString &fileName) QTextStream out(&file); #ifndef QT_NO_CURSOR - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif out << textEdit->toPlainText(); #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif setCurrentFile(fileName); diff --git a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp index 47a6e78265..a62765cdab 100644 --- a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp +++ b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp @@ -161,9 +161,9 @@ void MainWindow::save() } QTextStream out(&file); - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); out << textEdit->toHtml(); - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); statusBar()->showMessage(tr("Saved '%1'").arg(fileName), 2000); } diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp index 720f9a2085..5662518ddc 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp @@ -86,7 +86,7 @@ QColor bgColorForName(const QString &name) return QColor("#D8D8F1"); if (name == "Yellow") return QColor("#F1F0D8"); - return QColor(name).light(110); + return QColor(name).lighter(110); } QColor fgColorForName(const QString &name) @@ -454,8 +454,8 @@ void ColorSwatch::updateContextMenu() tabMenu->clear(); splitHMenu->clear(); splitVMenu->clear(); - QList<ColorSwatch*> dock_list = mainWindow->findChildren<ColorSwatch*>(); - foreach (ColorSwatch *dock, dock_list) { + const QList<ColorSwatch *> dockList = mainWindow->findChildren<ColorSwatch*>(); + for (const ColorSwatch *dock : dockList) { tabMenu->addAction(dock->objectName()); splitHMenu->addAction(dock->objectName()); splitVMenu->addAction(dock->objectName()); @@ -464,7 +464,8 @@ void ColorSwatch::updateContextMenu() static ColorSwatch *findByName(const QMainWindow *mainWindow, const QString &name) { - foreach (ColorSwatch *dock, mainWindow->findChildren<ColorSwatch*>()) { + const QList<ColorSwatch *> dockList = mainWindow->findChildren<ColorSwatch*>(); + for (ColorSwatch *dock : dockList) { if (name == dock->objectName()) return dock; } @@ -584,7 +585,7 @@ void ColorSwatch::changeVerticalTitleBar(bool on) QSize BlueTitleBar::minimumSizeHint() const { QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); QSize result(leftPm.width() + rightPm.width(), centerPm.height()); if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) result.transpose(); @@ -605,7 +606,7 @@ void BlueTitleBar::paintEvent(QPaintEvent*) QRect rect = this->rect(); QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) { QSize s = rect.size(); @@ -632,7 +633,7 @@ void BlueTitleBar::mouseReleaseEvent(QMouseEvent *event) QRect rect = this->rect(); QDockWidget *dw = qobject_cast<QDockWidget*>(parentWidget()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); if (dw->features() & QDockWidget::DockWidgetVerticalTitleBar) { QPoint p = pos; @@ -676,7 +677,7 @@ void BlueTitleBar::mouseReleaseEvent(QMouseEvent *event) void BlueTitleBar::updateMask() { QDockWidget *dw = qobject_cast<QDockWidget*>(parent()); - Q_ASSERT(dw != 0); + Q_ASSERT(dw); QRect rect = dw->rect(); QPixmap bitmap(dw->size()); diff --git a/examples/widgets/mainwindows/mainwindow/toolbar.cpp b/examples/widgets/mainwindows/mainwindow/toolbar.cpp index 7c96f5b1be..36d4108b1e 100644 --- a/examples/widgets/mainwindows/mainwindow/toolbar.cpp +++ b/examples/widgets/mainwindows/mainwindow/toolbar.cpp @@ -208,7 +208,7 @@ ToolBar::ToolBar(const QString &title, QWidget *parent) void ToolBar::updateMenu() { QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget()); - Q_ASSERT(mainWindow != 0); + Q_ASSERT(mainWindow); const Qt::ToolBarArea area = mainWindow->toolBarArea(this); const Qt::ToolBarAreas areas = allowedAreas(); @@ -244,7 +244,8 @@ void ToolBar::order() { QList<QAction *> ordered; QList<QAction *> actions1 = actions(); - foreach (QAction *action, findChildren<QAction *>()) { + const QList<QAction *> childActions = findChildren<QAction *>(); + for (QAction *action : childActions) { if (!actions1.contains(action)) continue; actions1.removeAll(action); @@ -313,7 +314,7 @@ void ToolBar::place(Qt::ToolBarArea area, bool p) return; QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget()); - Q_ASSERT(mainWindow != 0); + Q_ASSERT(mainWindow); mainWindow->addToolBar(area, this); @@ -355,7 +356,7 @@ void ToolBar::placeBottom(bool p) void ToolBar::insertToolBarBreak() { QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parentWidget()); - Q_ASSERT(mainWindow != 0); + Q_ASSERT(mainWindow); mainWindow->insertToolBarBreak(this); } 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; diff --git a/examples/widgets/mainwindows/menus/mainwindow.cpp b/examples/widgets/mainwindows/menus/mainwindow.cpp index 600b04fdb2..c6aba8be83 100644 --- a/examples/widgets/mainwindows/menus/mainwindow.cpp +++ b/examples/widgets/mainwindows/menus/mainwindow.cpp @@ -72,7 +72,7 @@ MainWindow::MainWindow() bottomFiller->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); QVBoxLayout *layout = new QVBoxLayout; - layout->setMargin(5); + layout->setContentsMargins(5, 5, 5, 5); layout->addWidget(topFiller); layout->addWidget(infoLabel); layout->addWidget(bottomFiller); 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; } |