summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/widgets/mainwindows/mainwindow/mainwindow.cpp15
-rw-r--r--examples/widgets/mainwindows/mdi/mainwindow.cpp14
2 files changed, 4 insertions, 25 deletions
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
index a21a64bdd4..10e3dd045a 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
@@ -282,23 +282,10 @@ void MainWindow::loadLayout()
}
}
-class DockWidgetAreaCornerFunctor {
-public:
- explicit DockWidgetAreaCornerFunctor(QMainWindow *mw, Qt::Corner c, Qt::DockWidgetArea a)
- : m_mainWindow(mw), m_area(a), m_corner(c) {}
-
- void operator()() const { m_mainWindow->setCorner(m_corner, m_area); }
-
-private:
- QMainWindow *m_mainWindow;
- Qt::DockWidgetArea m_area;
- Qt::Corner m_corner;
-};
-
static QAction *addCornerAction(const QString &text, QMainWindow *mw, QMenu *menu, QActionGroup *group,
Qt::Corner c, Qt::DockWidgetArea a)
{
- QAction *result = menu->addAction(text, mw, DockWidgetAreaCornerFunctor(mw, c, a));
+ QAction *result = menu->addAction(text, mw, [=]() { mw->setCorner(c, a); });
result->setCheckable(true);
group->addAction(result);
return result;
diff --git a/examples/widgets/mainwindows/mdi/mainwindow.cpp b/examples/widgets/mainwindows/mdi/mainwindow.cpp
index 76b1c308cb..188de1893e 100644
--- a/examples/widgets/mainwindows/mdi/mainwindow.cpp
+++ b/examples/widgets/mainwindows/mdi/mainwindow.cpp
@@ -264,16 +264,6 @@ void MainWindow::updateMenus()
#endif
}
-class ActiveMdiSubWindowFunctor {
-public:
- explicit ActiveMdiSubWindowFunctor(QMdiArea *mdiArea, QMdiSubWindow *activeWindow) : m_mdiArea(mdiArea), m_activeWindow(activeWindow) {}
- void operator()() const { m_mdiArea->setActiveSubWindow(m_activeWindow); }
-
-private:
- QMdiArea *m_mdiArea;
- QMdiSubWindow *m_activeWindow;
-};
-
void MainWindow::updateWindowMenu()
{
windowMenu->clear();
@@ -302,7 +292,9 @@ void MainWindow::updateWindowMenu()
text = tr("%1 %2").arg(i + 1)
.arg(child->userFriendlyCurrentFile());
}
- QAction *action = windowMenu->addAction(text, mdiSubWindow, ActiveMdiSubWindowFunctor(mdiArea, mdiSubWindow));
+ QAction *action = windowMenu->addAction(text, mdiSubWindow, [this, mdiSubWindow]() {
+ mdiArea->setActiveSubWindow(mdiSubWindow);
+ });
action->setCheckable(true);
action ->setChecked(child == activeMdiChild());
}