diff --git a/src/analyzerconsole.cpp b/src/analyzerconsole.cpp index d1648646..5e84d1bf 100644 --- a/src/analyzerconsole.cpp +++ b/src/analyzerconsole.cpp @@ -71,8 +71,8 @@ CAnalyzerConsole::CAnalyzerConsole ( CClient* pNCliP, // Connections ------------------------------------------------------------- // timers - QObject::connect ( &TimerErrRateUpdate, SIGNAL ( timeout() ), - this, SLOT ( OnTimerErrRateUpdate() ) ); + QObject::connect ( &TimerErrRateUpdate, &QTimer::timeout, + this, &CAnalyzerConsole::OnTimerErrRateUpdate ); } void CAnalyzerConsole::showEvent ( QShowEvent* ) diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 50e24e33..eecd5d26 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -400,26 +400,26 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, this, &CClientSettingsDlg::OnNewClientLevelEditingFinished ); // combo boxes - QObject::connect ( cbxSoundcard, SIGNAL ( activated ( int ) ), - this, SLOT ( OnSoundcardActivated ( int ) ) ); + QObject::connect ( cbxSoundcard, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnSoundcardActivated ); - QObject::connect ( cbxLInChan, SIGNAL ( activated ( int ) ), - this, SLOT ( OnLInChanActivated ( int ) ) ); + QObject::connect ( cbxLInChan, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnLInChanActivated ); - QObject::connect ( cbxRInChan, SIGNAL ( activated ( int ) ), - this, SLOT ( OnRInChanActivated ( int ) ) ); + QObject::connect ( cbxRInChan, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnRInChanActivated ); - QObject::connect ( cbxLOutChan, SIGNAL ( activated ( int ) ), - this, SLOT ( OnLOutChanActivated ( int ) ) ); + QObject::connect ( cbxLOutChan, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnLOutChanActivated ); - QObject::connect ( cbxROutChan, SIGNAL ( activated ( int ) ), - this, SLOT ( OnROutChanActivated ( int ) ) ); + QObject::connect ( cbxROutChan, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnROutChanActivated ); - QObject::connect ( cbxAudioChannels, SIGNAL ( activated ( int ) ), - this, SLOT ( OnAudioChannelsActivated ( int ) ) ); + QObject::connect ( cbxAudioChannels, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnAudioChannelsActivated ); - QObject::connect ( cbxAudioQuality, SIGNAL ( activated ( int ) ), - this, SLOT ( OnAudioQualityActivated ( int ) ) ); + QObject::connect ( cbxAudioQuality, static_cast ( &QComboBox::activated ), + this, &CClientSettingsDlg::OnAudioQualityActivated ); // buttons QObject::connect ( butDriverSetup, &QPushButton::clicked, diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index 6e716a4b..6623cca5 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -169,8 +169,8 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP, QObject::connect ( cbxServerAddr, &QComboBox::editTextChanged, this, &CConnectDlg::OnServerAddrEditTextChanged ); - QObject::connect ( cbxCentServAddrType, SIGNAL ( activated ( int ) ), - this, SLOT ( OnCentServAddrTypeChanged ( int ) ) ); + QObject::connect ( cbxCentServAddrType, static_cast ( &QComboBox::activated ), + this, &CConnectDlg::OnCentServAddrTypeChanged ); // check boxes QObject::connect ( chbExpandAll, &QCheckBox::stateChanged, diff --git a/src/server.cpp b/src/server.cpp index 0945fe43..1d5bcfcb 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -59,8 +59,8 @@ CHighPrecisionTimer::CHighPrecisionTimer ( const bool bNewUseDoubleSystemFrameSi veciTimeOutIntervals[2] = 0; // connect timer timeout signal - QObject::connect ( &Timer, SIGNAL ( timeout() ), - this, SLOT ( OnTimer() ) ); + QObject::connect ( &Timer, &QTimer::timeout, + this, &CHighPrecisionTimer::OnTimer ); } void CHighPrecisionTimer::Start() diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 3b6c9c0b..a23d36fb 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -357,11 +357,11 @@ lvwClients->setMinimumHeight ( 140 ); this, &CServerDlg::OnLocationCityTextChanged ); // combo boxes - QObject::connect ( cbxLocationCountry, SIGNAL ( activated ( int ) ), - this, SLOT ( OnLocationCountryActivated ( int ) ) ); + QObject::connect ( cbxLocationCountry, static_cast ( &QComboBox::activated ), + this, &CServerDlg::OnLocationCountryActivated ); - QObject::connect ( cbxCentServAddrType, SIGNAL ( activated ( int ) ), - this, SLOT ( OnCentServAddrTypeActivated ( int ) ) ); + QObject::connect ( cbxCentServAddrType, static_cast ( &QComboBox::activated ), + this, &CServerDlg::OnCentServAddrTypeActivated ); // push buttons QObject::connect ( pbtNewRecording, &QPushButton::released, diff --git a/src/socket.cpp b/src/socket.cpp index b87f9d5f..36b63dd8 100755 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -117,8 +117,8 @@ void CSocket::Init ( const quint16 iPortNumber ) QObject::connect ( this, &CSocket::ProtcolCLMessageReceived, pChannel, &CChannel::OnProtcolCLMessageReceived ); - QObject::connect ( this, SIGNAL ( NewConnection() ), - pChannel, SLOT ( OnNewConnection() ) ); + QObject::connect ( this, static_cast ( &CSocket::NewConnection ), + pChannel, &CChannel::OnNewConnection ); } else { @@ -130,8 +130,8 @@ void CSocket::Init ( const quint16 iPortNumber ) QObject::connect ( this, &CSocket::ProtcolCLMessageReceived, pServer, &CServer::OnProtcolCLMessageReceived ); - QObject::connect ( this, SIGNAL ( NewConnection ( int, CHostAddress ) ), - pServer, SLOT ( OnNewConnection ( int, CHostAddress ) ) ); + QObject::connect ( this, static_cast ( &CSocket::NewConnection ), + pServer, &CServer::OnNewConnection ); QObject::connect ( this, &CSocket::ServerFull, pServer, &CServer::OnServerFull ); diff --git a/src/util.cpp b/src/util.cpp index 9ede9148..f475f812 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -731,17 +731,17 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP, QObject::connect ( pedtAlias, &QLineEdit::textChanged, this, &CMusProfDlg::OnAliasTextChanged ); - QObject::connect ( pcbxInstrument, SIGNAL ( activated ( int ) ), - this, SLOT ( OnInstrumentActivated ( int ) ) ); + QObject::connect ( pcbxInstrument, static_cast ( &QComboBox::activated ), + this, &CMusProfDlg::OnInstrumentActivated ); - QObject::connect ( pcbxCountry, SIGNAL ( activated ( int ) ), - this, SLOT ( OnCountryActivated ( int ) ) ); + QObject::connect ( pcbxCountry, static_cast ( &QComboBox::activated ), + this, &CMusProfDlg::OnCountryActivated ); QObject::connect ( pedtCity, &QLineEdit::textChanged, this, &CMusProfDlg::OnCityTextChanged ); - QObject::connect ( pcbxSkill, SIGNAL ( activated ( int ) ), - this, SLOT ( OnSkillActivated ( int ) ) ); + QObject::connect ( pcbxSkill, static_cast ( &QComboBox::activated ), + this, &CMusProfDlg::OnSkillActivated ); QObject::connect ( butClose, &QPushButton::clicked, this, &CMusProfDlg::accept );