diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-26 16:05:39 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-01 19:03:42 +0200 |
commit | bd2c8353b44a1e63b84852ec9adeed78dbfab312 (patch) | |
tree | eab4138ce34c5bbddc47edc73a0e4a7e4db9e681 /tests/manual | |
parent | b6688a4d4939b15713ffd8702253433032879fcb (diff) |
Improve the keypadnavigation manual test
- No need to use QSignalMapper here, replace its uses with lambdas.
- Replace index 'for' loop with iterator loop, to simplify the code.
Change-Id: Ide3d2db99a074c0233eb5c2fd7a9b217d804973f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/keypadnavigation/main.cpp | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp index 67986a9cc9..dad4376514 100644 --- a/tests/manual/keypadnavigation/main.cpp +++ b/tests/manual/keypadnavigation/main.cpp @@ -33,7 +33,6 @@ #include <QFontDialog> #include <QInputDialog> #include <QMessageBox> -#include <QSignalMapper> #include "ui_keypadnavigation.h" class KeypadNavigation : public QMainWindow @@ -48,7 +47,7 @@ public: ui->setupUi(this); const struct { - QObject *action; + QAction *action; QWidget *page; } layoutMappings[] = { {ui->m_actionLayoutVerticalSimple, ui->m_pageVerticalSimple}, @@ -58,15 +57,16 @@ public: {ui->m_actionLayoutChaos, ui->m_pageChaos}, {ui->m_actionLayoutDialogs, ui->m_pageDialogs} }; - for (int i = 0; i < int(sizeof layoutMappings / sizeof layoutMappings[0]); ++i) { - connect(layoutMappings[i].action, SIGNAL(triggered()), &m_layoutSignalMapper, SLOT(map())); - m_layoutSignalMapper.setMapping(layoutMappings[i].action, layoutMappings[i].page); + for (auto layoutMapping : layoutMappings) { + const auto page = layoutMapping.page; + connect(layoutMapping.action, &QAction::triggered, ui->m_stackWidget, + [this, page]() + { ui->m_stackWidget->setCurrentWidget(page); }); } - connect(&m_layoutSignalMapper, SIGNAL(mapped(QWidget*)), ui->m_stackWidget, SLOT(setCurrentWidget(QWidget*))); #ifdef QT_KEYPAD_NAVIGATION const struct { - QObject *action; + QAction *action; Qt::NavigationMode mode; } modeMappings[] = { {ui->m_actionModeNone, Qt::NavigationModeNone}, @@ -75,17 +75,17 @@ public: {ui->m_actionModeCursorAuto, Qt::NavigationModeCursorAuto}, {ui->m_actionModeCursorForceVisible, Qt::NavigationModeCursorForceVisible} }; - for (int i = 0; i < int(sizeof modeMappings / sizeof modeMappings[0]); ++i) { - connect(modeMappings[i].action, SIGNAL(triggered()), &m_modeSignalMapper, SLOT(map())); - m_modeSignalMapper.setMapping(modeMappings[i].action, int(modeMappings[i].mode)); + for (auto modeMapping : modeMappings) { + const auto mode = modeMapping.mode; + connect(modeMapping.action, &QAction::triggered, this, + [this, mode]() { setNavigationMode(mode); }); } - connect(&m_modeSignalMapper, SIGNAL(mapped(int)), SLOT(setNavigationMode(int))); #else // QT_KEYPAD_NAVIGATION ui->m_menuNavigation_mode->deleteLater(); #endif // QT_KEYPAD_NAVIGATION const struct { - QObject *button; + QPushButton *button; Dialog dialog; } openDialogMappings[] = { {ui->m_buttonGetOpenFileName, DialogGetOpenFileName}, @@ -97,11 +97,11 @@ public: {ui->m_buttonAboutQt, DialogAboutQt}, {ui->m_buttonGetItem, DialogGetItem} }; - for (int i = 0; i < int(sizeof openDialogMappings / sizeof openDialogMappings[0]); ++i) { - connect(openDialogMappings[i].button, SIGNAL(clicked()), &m_dialogSignalMapper, SLOT(map())); - m_dialogSignalMapper.setMapping(openDialogMappings[i].button, int(openDialogMappings[i].dialog)); + for (auto openDialogMapping : openDialogMappings) { + const auto dialog = openDialogMapping.dialog; + connect(openDialogMapping.button, &QPushButton::clicked, this, + [this, dialog]() { openDialog(dialog); }); } - connect(&m_dialogSignalMapper, SIGNAL(mapped(int)), SLOT(openDialog(int))); } ~KeypadNavigation() @@ -162,11 +162,6 @@ private: }; Ui_KeypadNavigation *ui; - QSignalMapper m_layoutSignalMapper; -#ifdef QT_KEYPAD_NAVIGATION - QSignalMapper m_modeSignalMapper; -#endif // QT_KEYPAD_NAVIGATION - QSignalMapper m_dialogSignalMapper; }; int main(int argc, char *argv[]) |