diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2011-05-09 10:53:32 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2011-05-09 10:53:32 +0200 |
| commit | fdf05ba369b62b0c87217f2c2565e7054d4123b6 (patch) | |
| tree | 7edffba2a96dbfb188e62f8c24daffbd8cb7d5a7 /src/mainwindow.cpp | |
| parent | Number the favorites pages to "suggest" numeric shortcut for (diff) | |
| download | rekonq-fdf05ba369b62b0c87217f2c2565e7054d4123b6.tar.xz | |
Use of QSignalMapper for switchToTab() method in terms of code unification
Patch by Thomas Murach, thanks ;)
RB:101246
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1ded9836..f226c9ee 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -481,28 +481,29 @@ void MainWindow::setupActions() closedTabsMenu->setDelayed(false); actionCollection()->addAction(QL1S("closed_tab_menu"), closedTabsMenu); + QSignalMapper *tabSignalMapper = new QSignalMapper(this); // shortcuts for quickly switching to a tab for (int i = 1; i <= 9; i++) { a = new KAction(i18n("Switch to Tab %1", i), this); a->setShortcut(KShortcut(QString("Alt+%1").arg(i))); - a->setData(QVariant(i)); actionCollection()->addAction(QL1S(("switch_tab_" + QString::number(i)).toAscii()), a); - connect(a, SIGNAL(triggered(bool)), m_view, SLOT(switchToTab())); + connect(a, SIGNAL(triggered(bool)), tabSignalMapper, SLOT(map())); + tabSignalMapper->setMapping(a, i); } + connect(tabSignalMapper, SIGNAL(mapped(const int)), m_view, SLOT(switchToTab(const int))); // shortcuts for loading favorite pages - QSignalMapper *signalMapper = new QSignalMapper(this); + QSignalMapper *favoritesSignalMapper = new QSignalMapper(this); for (int i = 1; i <= 9; ++i) { a = new KAction(i18n("Switch to Favorite Page %1", i), this); a->setShortcut(KShortcut(QString("Ctrl+%1").arg(i))); - a->setData(QVariant(i)); actionCollection()->addAction(QL1S(("switch_favorite_" + QString::number(i)).toAscii()), a); - connect(a, SIGNAL(triggered(bool)), signalMapper, SLOT(map())); - signalMapper->setMapping(a, i); + connect(a, SIGNAL(triggered(bool)), favoritesSignalMapper, SLOT(map())); + favoritesSignalMapper->setMapping(a, i); } - connect(signalMapper, SIGNAL(mapped(const int)), m_view, SLOT(loadFavorite(const int))); + connect(favoritesSignalMapper, SIGNAL(mapped(const int)), m_view, SLOT(loadFavorite(const int))); // ============================== Indexed Tab Actions ==================================== a = new KAction(KIcon("tab-close"), i18n("&Close Tab"), this); |