diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp index c1268b6e8..0ae776283 100644 --- a/src/blackgui/components/logcomponent.cpp +++ b/src/blackgui/components/logcomponent.cpp @@ -42,7 +42,7 @@ namespace BlackGui void CConsoleTextEdit::customMenuRequested(const QPoint &pos) { QMenu *menu = QPlainTextEdit::createStandardContextMenu(); - menu->addAction(CIcons::delete16(), "Clear console", this, SLOT(clear())); + menu->addAction(CIcons::delete16(), "Clear console", this, &QPlainTextEdit::clear); menu->exec(this->mapToGlobal(pos)); } diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp index cc849dbc1..81fb286ab 100644 --- a/src/blackgui/components/navigatordialog.cpp +++ b/src/blackgui/components/navigatordialog.cpp @@ -349,7 +349,7 @@ namespace BlackGui a = contextMenu->addAction(CIcons::resize16(), "2 columns", this, &CNavigatorDialog::changeLayout); a->setData("2c"); const QString frameLessActionText = this->isFrameless() ? "Normal window" : "Frameless"; - contextMenu->addAction(CIcons::tableSheet16(), frameLessActionText, this, SLOT(toggleFrameless())); + contextMenu->addAction(CIcons::tableSheet16(), frameLessActionText, this, &CNavigatorDialog::toggleFrameless); contextMenu->addAction("Adjust margins", this, &CNavigatorDialog::dummyFunction); contextMenu->addAction(m_marginMenuAction); contextMenu->addSeparator(); diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index ef9796cc8..ebd617a71 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -124,7 +124,7 @@ namespace BlackGui toggleFloatingMenuAction->setCheckable(true); toggleFloatingMenuAction->setChecked(!dw->isFloating()); subMenuToggleFloat->addAction(toggleFloatingMenuAction); - c = connect(toggleFloatingMenuAction, SIGNAL(toggled(bool)), signalMapperToggleFloating, SLOT(map())); + c = connect(toggleFloatingMenuAction, &QAction::toggled, signalMapperToggleFloating, qOverload<>(&QSignalMapper::map)); BLACK_VERIFY_X(c, Q_FUNC_INFO, "Cannot map floating action"); // do not make that shutdown reason in a release build signalMapperToggleFloating->setMapping(toggleFloatingMenuAction, i); } @@ -160,7 +160,7 @@ namespace BlackGui connect(showTabbar, &QAction::toggled, this, &CInfoArea::showTabBar); // tab bar position - menu->addAction(CIcons::dockBottom16(), "Toogle tabbar position", this, SLOT(toggleTabBarPosition())); + menu->addAction(CIcons::dockBottom16(), "Toogle tabbar position", this, &CInfoArea::toggleTabBarPosition); Q_UNUSED(c); } } diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp index e6234bbd2..5f5fe1c21 100644 --- a/src/swiftdata/swiftdatamenus.cpp +++ b/src/swiftdata/swiftdatamenus.cpp @@ -60,11 +60,11 @@ void CSwiftData::initDynamicMenus() { Q_ASSERT_X(ui->comp_MainInfoArea, Q_FUNC_INFO, "Missing main info area"); Q_ASSERT_X(ui->comp_MainInfoArea->getDataInfoAreaComponent(), Q_FUNC_INFO, "Missing DB info area"); - ui->menu_Mapping->addAction(CIcons::database16(), "Load all DB data", ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(requestUpdateOfAllDbData())); - ui->menu_Mapping->addAction(CIcons::load16(), "Load DB test data from disk", ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(readDbDataFromResourceDir())); + ui->menu_Mapping->addAction(CIcons::database16(), "Load all DB data", ui->comp_MainInfoArea->getDataInfoAreaComponent(), &CDataInfoAreaComponent::requestUpdateOfAllDbData); + ui->menu_Mapping->addAction(CIcons::load16(), "Load DB test data from disk", ui->comp_MainInfoArea->getDataInfoAreaComponent(), &CDataInfoAreaComponent::readDbDataFromResourceDir); if (sGui->isDeveloperFlagSet()) { - ui->menu_Mapping->addAction(CIcons::save16(), "Save DB test data to disk", ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(writeDbDataToResourceDir())); + ui->menu_Mapping->addAction(CIcons::save16(), "Save DB test data to disk", ui->comp_MainInfoArea->getDataInfoAreaComponent(), &CDataInfoAreaComponent::writeDbDataToResourceDir); } } }