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

resolve outstanding: using Qt5 connections instead of the old Qt4 ones

Browse source
This commit is contained in:
Volker Fischer 2020-06-07 09:01:52 +02:00
parent 6f45cc5a00
commit af0f9510f8
7 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/analyzerconsole.cpp
View file

@ -71,8 +71,8 @@ CAnalyzerConsole::CAnalyzerConsole ( CClient* pNCliP,
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
// timers // timers
QObject::connect ( &TimerErrRateUpdate, SIGNAL ( timeout() ), QObject::connect ( &TimerErrRateUpdate, &QTimer::timeout,
this, SLOT ( OnTimerErrRateUpdate() ) ); this, &CAnalyzerConsole::OnTimerErrRateUpdate );
} }
void CAnalyzerConsole::showEvent ( QShowEvent* ) void CAnalyzerConsole::showEvent ( QShowEvent* )

28
src/clientsettingsdlg.cpp
View file

@ -400,26 +400,26 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
this, &CClientSettingsDlg::OnNewClientLevelEditingFinished ); this, &CClientSettingsDlg::OnNewClientLevelEditingFinished );
// combo boxes // combo boxes
QObject::connect ( cbxSoundcard, SIGNAL ( activated ( int ) ), QObject::connect ( cbxSoundcard, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnSoundcardActivated ( int ) ) ); this, &CClientSettingsDlg::OnSoundcardActivated );
QObject::connect ( cbxLInChan, SIGNAL ( activated ( int ) ), QObject::connect ( cbxLInChan, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnLInChanActivated ( int ) ) ); this, &CClientSettingsDlg::OnLInChanActivated );
QObject::connect ( cbxRInChan, SIGNAL ( activated ( int ) ), QObject::connect ( cbxRInChan, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnRInChanActivated ( int ) ) ); this, &CClientSettingsDlg::OnRInChanActivated );
QObject::connect ( cbxLOutChan, SIGNAL ( activated ( int ) ), QObject::connect ( cbxLOutChan, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnLOutChanActivated ( int ) ) ); this, &CClientSettingsDlg::OnLOutChanActivated );
QObject::connect ( cbxROutChan, SIGNAL ( activated ( int ) ), QObject::connect ( cbxROutChan, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnROutChanActivated ( int ) ) ); this, &CClientSettingsDlg::OnROutChanActivated );
QObject::connect ( cbxAudioChannels, SIGNAL ( activated ( int ) ), QObject::connect ( cbxAudioChannels, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnAudioChannelsActivated ( int ) ) ); this, &CClientSettingsDlg::OnAudioChannelsActivated );
QObject::connect ( cbxAudioQuality, SIGNAL ( activated ( int ) ), QObject::connect ( cbxAudioQuality, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnAudioQualityActivated ( int ) ) ); this, &CClientSettingsDlg::OnAudioQualityActivated );
// buttons // buttons
QObject::connect ( butDriverSetup, &QPushButton::clicked, QObject::connect ( butDriverSetup, &QPushButton::clicked,

4
src/connectdlg.cpp
View file

@ -169,8 +169,8 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP,
QObject::connect ( cbxServerAddr, &QComboBox::editTextChanged, QObject::connect ( cbxServerAddr, &QComboBox::editTextChanged,
this, &CConnectDlg::OnServerAddrEditTextChanged ); this, &CConnectDlg::OnServerAddrEditTextChanged );
QObject::connect ( cbxCentServAddrType, SIGNAL ( activated ( int ) ), QObject::connect ( cbxCentServAddrType, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnCentServAddrTypeChanged ( int ) ) ); this, &CConnectDlg::OnCentServAddrTypeChanged );
// check boxes // check boxes
QObject::connect ( chbExpandAll, &QCheckBox::stateChanged, QObject::connect ( chbExpandAll, &QCheckBox::stateChanged,

4
src/server.cpp
View file

@ -59,8 +59,8 @@ CHighPrecisionTimer::CHighPrecisionTimer ( const bool bNewUseDoubleSystemFrameSi
veciTimeOutIntervals[2] = 0; veciTimeOutIntervals[2] = 0;
// connect timer timeout signal // connect timer timeout signal
QObject::connect ( &Timer, SIGNAL ( timeout() ), QObject::connect ( &Timer, &QTimer::timeout,
this, SLOT ( OnTimer() ) ); this, &CHighPrecisionTimer::OnTimer );
} }
void CHighPrecisionTimer::Start() void CHighPrecisionTimer::Start()

8
src/serverdlg.cpp
View file

@ -357,11 +357,11 @@ lvwClients->setMinimumHeight ( 140 );
this, &CServerDlg::OnLocationCityTextChanged ); this, &CServerDlg::OnLocationCityTextChanged );
// combo boxes // combo boxes
QObject::connect ( cbxLocationCountry, SIGNAL ( activated ( int ) ), QObject::connect ( cbxLocationCountry, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnLocationCountryActivated ( int ) ) ); this, &CServerDlg::OnLocationCountryActivated );
QObject::connect ( cbxCentServAddrType, SIGNAL ( activated ( int ) ), QObject::connect ( cbxCentServAddrType, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnCentServAddrTypeActivated ( int ) ) ); this, &CServerDlg::OnCentServAddrTypeActivated );
// push buttons // push buttons
QObject::connect ( pbtNewRecording, &QPushButton::released, QObject::connect ( pbtNewRecording, &QPushButton::released,

8
src/socket.cpp
View file

@ -117,8 +117,8 @@ void CSocket::Init ( const quint16 iPortNumber )
QObject::connect ( this, &CSocket::ProtcolCLMessageReceived, QObject::connect ( this, &CSocket::ProtcolCLMessageReceived,
pChannel, &CChannel::OnProtcolCLMessageReceived ); pChannel, &CChannel::OnProtcolCLMessageReceived );
QObject::connect ( this, SIGNAL ( NewConnection() ), QObject::connect ( this, static_cast<void (CSocket::*)()> ( &CSocket::NewConnection ),
pChannel, SLOT ( OnNewConnection() ) ); pChannel, &CChannel::OnNewConnection );
} }
else else
{ {
@ -130,8 +130,8 @@ void CSocket::Init ( const quint16 iPortNumber )
QObject::connect ( this, &CSocket::ProtcolCLMessageReceived, QObject::connect ( this, &CSocket::ProtcolCLMessageReceived,
pServer, &CServer::OnProtcolCLMessageReceived ); pServer, &CServer::OnProtcolCLMessageReceived );
QObject::connect ( this, SIGNAL ( NewConnection ( int, CHostAddress ) ), QObject::connect ( this, static_cast<void (CSocket::*) ( int, CHostAddress )> ( &CSocket::NewConnection ),
pServer, SLOT ( OnNewConnection ( int, CHostAddress ) ) ); pServer, &CServer::OnNewConnection );
QObject::connect ( this, &CSocket::ServerFull, QObject::connect ( this, &CSocket::ServerFull,
pServer, &CServer::OnServerFull ); pServer, &CServer::OnServerFull );

12
src/util.cpp
View file

@ -731,17 +731,17 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
QObject::connect ( pedtAlias, &QLineEdit::textChanged, QObject::connect ( pedtAlias, &QLineEdit::textChanged,
this, &CMusProfDlg::OnAliasTextChanged ); this, &CMusProfDlg::OnAliasTextChanged );
QObject::connect ( pcbxInstrument, SIGNAL ( activated ( int ) ), QObject::connect ( pcbxInstrument, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnInstrumentActivated ( int ) ) ); this, &CMusProfDlg::OnInstrumentActivated );
QObject::connect ( pcbxCountry, SIGNAL ( activated ( int ) ), QObject::connect ( pcbxCountry, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnCountryActivated ( int ) ) ); this, &CMusProfDlg::OnCountryActivated );
QObject::connect ( pedtCity, &QLineEdit::textChanged, QObject::connect ( pedtCity, &QLineEdit::textChanged,
this, &CMusProfDlg::OnCityTextChanged ); this, &CMusProfDlg::OnCityTextChanged );
QObject::connect ( pcbxSkill, SIGNAL ( activated ( int ) ), QObject::connect ( pcbxSkill, static_cast<void (QComboBox::*) ( int )> ( &QComboBox::activated ),
this, SLOT ( OnSkillActivated ( int ) ) ); this, &CMusProfDlg::OnSkillActivated );
QObject::connect ( butClose, &QPushButton::clicked, QObject::connect ( butClose, &QPushButton::clicked,
this, &CMusProfDlg::accept ); this, &CMusProfDlg::accept );