From eeeaafdcf59094f513782e8b0cba01d660462d11 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Thu, 11 Jun 2020 09:48:03 +0200 Subject: [PATCH] remove some more SLOT() --- src/clientdlg.cpp | 12 ++++++------ src/serverdlg.cpp | 6 +++--- src/serverlist.cpp | 2 +- src/util.cpp | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 4b0c5611..9b359488 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -255,22 +255,22 @@ CClientDlg::CClientDlg ( CClient* pNCliP, pViewMenu = new QMenu ( tr ( "&View" ), this ); pViewMenu->addAction ( tr ( "&Connection Setup..." ), this, - SLOT ( OnOpenConnectionSetupDialog() ) ); + &CClientDlg::OnOpenConnectionSetupDialog ); pViewMenu->addAction ( tr ( "My &Profile..." ), this, - SLOT ( OnOpenMusicianProfileDialog() ) ); + &CClientDlg::OnOpenMusicianProfileDialog ); pViewMenu->addAction ( tr ( "C&hat..." ), this, - SLOT ( OnOpenChatDialog() ) ); + &CClientDlg::OnOpenChatDialog ); pViewMenu->addAction ( tr ( "&Settings..." ), this, - SLOT ( OnOpenGeneralSettings() ) ); + &CClientDlg::OnOpenGeneralSettings ); // optionally show analyzer console entry if ( bShowAnalyzerConsole ) { pViewMenu->addAction ( tr ( "&Analyzer Console..." ), this, - SLOT ( OnOpenAnalyzerConsole() ) ); + &CClientDlg::OnOpenAnalyzerConsole ); } pViewMenu->addSeparator(); @@ -283,7 +283,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, pEditMenu = new QMenu ( tr ( "&Edit" ), this ); pEditMenu->addAction ( tr ( "&Sort Channel Users by Name" ), this, - SLOT ( OnSortChannelsByName() ), QKeySequence ( Qt::CTRL + Qt::Key_N ) ); + &CClientDlg::OnSortChannelsByName, QKeySequence ( Qt::CTRL + Qt::Key_N ) ); // Main menu bar ----------------------------------------------------------- diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index e8f8c417..94e205e9 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -153,17 +153,17 @@ CServerDlg::CServerDlg ( CServer* pNServP, pSystemTrayIconMenu = new QMenu ( this ); pSystemTrayIconMenu->addAction ( tr ( "E&xit" ), - this, SLOT ( OnSysTrayMenuExit() ) ); + this, &CServerDlg::OnSysTrayMenuExit ); pSystemTrayIconMenu->addSeparator(); pSystemTrayIconMenu->addAction ( tr ( "&Hide " ) + APP_NAME + tr ( " server" ), - this, SLOT ( OnSysTrayMenuHide() ) ); + this, &CServerDlg::OnSysTrayMenuHide ); pSystemTrayIconMenu->setDefaultAction ( pSystemTrayIconMenu->addAction ( tr ( "&Open " ) + APP_NAME + tr ( " server" ), - this, SLOT ( OnSysTrayMenuOpen() ) ) ); + this, &CServerDlg::OnSysTrayMenuOpen ) ); SystemTrayIcon.setContextMenu ( pSystemTrayIconMenu ); diff --git a/src/serverlist.cpp b/src/serverlist.cpp index b2a542b1..1f00b687 100755 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -164,7 +164,7 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum, { // 1 minute = 60 * 1000 ms QTimer::singleShot ( SERVLIST_TIME_PERMSERV_MINUTES * 60000, - this, SLOT ( OnTimerIsPermanent() ) ); + this, &CServerListManager::OnTimerIsPermanent ); } // prepare the register server response timer (single shot timer) diff --git a/src/util.cpp b/src/util.cpp index 98051287..48e606a8 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -845,17 +845,17 @@ CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "& // standard help menu consists of about and what's this help if ( bIsClient ) { - addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpClientGetStarted() ) ); - addAction ( tr ( "Software &Manual..." ), this, SLOT ( OnHelpSoftwareMan() ) ); + addAction ( tr ( "Getting &Started..." ), this, &CHelpMenu::OnHelpClientGetStarted ); + addAction ( tr ( "Software &Manual..." ), this, &CHelpMenu::OnHelpSoftwareMan ); } else { - addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpServerGetStarted() ) ); + addAction ( tr ( "Getting &Started..." ), this, &CHelpMenu::OnHelpServerGetStarted ); } addSeparator(); - addAction ( tr ( "What's &This" ), this, SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) ); + addAction ( tr ( "What's &This" ), this, &CHelpMenu::OnHelpWhatsThis, QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) ); addSeparator(); - addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) ); + addAction ( tr ( "&About..." ), this, &CHelpMenu::OnHelpAbout ); }