eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

revert "remove some more SLOT()" commit since Travis is not happy about the change (older Qt5 version)

Browse source
This commit is contained in:
Volker Fischer 2020-06-11 10:48:44 +02:00
parent a375fcf768
commit cd9a939697
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/clientdlg.cpp
View file

@ -255,22 +255,22 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
pViewMenu = new QMenu ( tr ( "&View" ), this ); pViewMenu = new QMenu ( tr ( "&View" ), this );
pViewMenu->addAction ( tr ( "&Connection Setup..." ), this, pViewMenu->addAction ( tr ( "&Connection Setup..." ), this,
&CClientDlg::OnOpenConnectionSetupDialog ); SLOT ( OnOpenConnectionSetupDialog() ) );
pViewMenu->addAction ( tr ( "My &Profile..." ), this, pViewMenu->addAction ( tr ( "My &Profile..." ), this,
&CClientDlg::OnOpenMusicianProfileDialog ); SLOT ( OnOpenMusicianProfileDialog() ) );
pViewMenu->addAction ( tr ( "C&hat..." ), this, pViewMenu->addAction ( tr ( "C&hat..." ), this,
&CClientDlg::OnOpenChatDialog ); SLOT ( OnOpenChatDialog() ) );
pViewMenu->addAction ( tr ( "&Settings..." ), this, pViewMenu->addAction ( tr ( "&Settings..." ), this,
&CClientDlg::OnOpenGeneralSettings ); SLOT ( OnOpenGeneralSettings() ) );
// optionally show analyzer console entry // optionally show analyzer console entry
if ( bShowAnalyzerConsole ) if ( bShowAnalyzerConsole )
{ {
pViewMenu->addAction ( tr ( "&Analyzer Console..." ), this, pViewMenu->addAction ( tr ( "&Analyzer Console..." ), this,
&CClientDlg::OnOpenAnalyzerConsole ); SLOT ( OnOpenAnalyzerConsole() ) );
} }
pViewMenu->addSeparator(); pViewMenu->addSeparator();
@ -283,7 +283,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
pEditMenu = new QMenu ( tr ( "&Edit" ), this ); pEditMenu = new QMenu ( tr ( "&Edit" ), this );
pEditMenu->addAction ( tr ( "&Sort Channel Users by Name" ), this, pEditMenu->addAction ( tr ( "&Sort Channel Users by Name" ), this,
&CClientDlg::OnSortChannelsByName, QKeySequence ( Qt::CTRL + Qt::Key_N ) ); SLOT ( OnSortChannelsByName() ), QKeySequence ( Qt::CTRL + Qt::Key_N ) );
// Main menu bar ----------------------------------------------------------- // Main menu bar -----------------------------------------------------------

6
src/serverdlg.cpp
View file

@ -153,17 +153,17 @@ CServerDlg::CServerDlg ( CServer* pNServP,
pSystemTrayIconMenu = new QMenu ( this ); pSystemTrayIconMenu = new QMenu ( this );
pSystemTrayIconMenu->addAction ( tr ( "E&xit" ), pSystemTrayIconMenu->addAction ( tr ( "E&xit" ),
this, &CServerDlg::OnSysTrayMenuExit ); this, SLOT ( OnSysTrayMenuExit() ) );
pSystemTrayIconMenu->addSeparator(); pSystemTrayIconMenu->addSeparator();
pSystemTrayIconMenu->addAction ( pSystemTrayIconMenu->addAction (
tr ( "&Hide " ) + APP_NAME + tr ( " server" ), tr ( "&Hide " ) + APP_NAME + tr ( " server" ),
this, &CServerDlg::OnSysTrayMenuHide ); this, SLOT ( OnSysTrayMenuHide() ) );
pSystemTrayIconMenu->setDefaultAction ( pSystemTrayIconMenu->addAction ( pSystemTrayIconMenu->setDefaultAction ( pSystemTrayIconMenu->addAction (
tr ( "&Open " ) + APP_NAME + tr ( " server" ), tr ( "&Open " ) + APP_NAME + tr ( " server" ),
this, &CServerDlg::OnSysTrayMenuOpen ) ); this, SLOT ( OnSysTrayMenuOpen() ) ) );
SystemTrayIcon.setContextMenu ( pSystemTrayIconMenu ); SystemTrayIcon.setContextMenu ( pSystemTrayIconMenu );

2
src/serverlist.cpp
View file

@ -164,7 +164,7 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
{ {
// 1 minute = 60 * 1000 ms // 1 minute = 60 * 1000 ms
QTimer::singleShot ( SERVLIST_TIME_PERMSERV_MINUTES * 60000, QTimer::singleShot ( SERVLIST_TIME_PERMSERV_MINUTES * 60000,
this, &CServerListManager::OnTimerIsPermanent ); this, SLOT ( OnTimerIsPermanent() ) );
} }
// prepare the register server response timer (single shot timer) // prepare the register server response timer (single shot timer)

10
src/util.cpp
View file

@ -845,17 +845,17 @@ CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&
// standard help menu consists of about and what's this help // standard help menu consists of about and what's this help
if ( bIsClient ) if ( bIsClient )
{ {
addAction ( tr ( "Getting &Started..." ), this, &CHelpMenu::OnHelpClientGetStarted ); addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpClientGetStarted() ) );
addAction ( tr ( "Software &Manual..." ), this, &CHelpMenu::OnHelpSoftwareMan ); addAction ( tr ( "Software &Manual..." ), this, SLOT ( OnHelpSoftwareMan() ) );
} }
else else
{ {
addAction ( tr ( "Getting &Started..." ), this, &CHelpMenu::OnHelpServerGetStarted ); addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpServerGetStarted() ) );
} }
addSeparator(); addSeparator();
addAction ( tr ( "What's &This" ), this, &CHelpMenu::OnHelpWhatsThis, QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) ); addAction ( tr ( "What's &This" ), this, SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) );
addSeparator(); addSeparator();
addAction ( tr ( "&About..." ), this, &CHelpMenu::OnHelpAbout ); addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) );
} }