Browse Source

refactor(nexus): replace deprecated QSignalMapper with lambda

reviewable/pr5745/r1
jenli669 6 years ago
parent
commit
8373e3abf3
No known key found for this signature in database
GPG Key ID: 8267F9F7C2BF7E5E
  1. 6
      src/nexus.cpp
  2. 1
      src/nexus.h

6
src/nexus.cpp

@ -138,9 +138,6 @@ void Nexus::start() @@ -138,9 +138,6 @@ void Nexus::start()
quitAction->setMenuRole(QAction::QuitRole);
connect(quitAction, &QAction::triggered, qApp, &QApplication::quit);
windowMapper = new QSignalMapper(this);
connect(windowMapper, SIGNAL(mapped(QObject*)), this, SLOT(onOpenWindow(QObject*)));
retranslateUi();
#endif
showMainGUI();
@ -392,8 +389,7 @@ void Nexus::updateWindowsArg(QWindow* closedWindow) @@ -392,8 +389,7 @@ void Nexus::updateWindowsArg(QWindow* closedWindow)
QAction* action = windowActions->addAction(windowList[i]->title());
action->setCheckable(true);
action->setChecked(windowList[i] == activeWindow);
connect(action, SIGNAL(triggered()), windowMapper, SLOT(map()));
windowMapper->setMapping(action, windowList[i]);
connect(action, &QAction::triggered, [=] { onOpenWindow(windowList[i]);});
windowMenu->addAction(action);
dockMenu->insertAction(dockLast, action);
}

1
src/nexus.h

@ -77,7 +77,6 @@ public slots: @@ -77,7 +77,6 @@ public slots:
private:
void updateWindowsArg(QWindow* closedWindow);
QSignalMapper* windowMapper;
QActionGroup* windowActions = nullptr;
#endif
signals:

Loading…
Cancel
Save