From b8e9fcc4a3d38b55f87dc46bbedc716d9d113a1d Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 10 May 2013 19:46:59 +0000 Subject: [PATCH] cleanup (removed unnecessary variable) --- src/client.cpp | 2 +- src/socket.h | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 52a7760b..30774e61 100755 --- a/src/client.cpp +++ b/src/client.cpp @@ -37,7 +37,7 @@ CClient::CClient ( const quint16 iPortNumber ) : bCeltDoHighQuality ( false ), bUseStereo ( false ), bIsInitializationPhase ( true ), - Socket ( &Channel, &ConnLessProtocol, iPortNumber ), + Socket ( &Channel, iPortNumber ), Sound ( AudioCallback, this ), iAudioInFader ( AUD_FADER_IN_MIDDLE ), bReverbOnLeftChan ( false ), diff --git a/src/socket.h b/src/socket.h index 95d505ff..d3c3d521 100755 --- a/src/socket.h +++ b/src/socket.h @@ -56,10 +56,8 @@ class CSocket : public QObject public: CSocket ( CChannel* pNewChannel, - CProtocol* pNewCLProtocol, const quint16 iPortNumber ) - : pChannel( pNewChannel ), pConnLessProtocol ( pNewCLProtocol ), - bIsClient ( true ) { Init ( iPortNumber ); } + : pChannel( pNewChannel ), bIsClient ( true ) { Init ( iPortNumber ); } CSocket ( CServer* pNServP, const quint16 iPortNumber ) @@ -77,9 +75,8 @@ protected: CVector vecbyRecBuf; CHostAddress RecHostAddr; - CChannel* pChannel; // for client - CProtocol* pConnLessProtocol; // for client - CServer* pServer; // for server + CChannel* pChannel; // for client + CServer* pServer; // for server bool bIsClient; @@ -106,12 +103,11 @@ class CHighPrioSocket { public: CHighPrioSocket ( CChannel* pNewChannel, - CProtocol* pNewCLProtocol, const quint16 iPortNumber ) { // TEST - worker = new CSocket ( pNewChannel, pNewCLProtocol, iPortNumber ); + worker = new CSocket ( pNewChannel, iPortNumber ); worker->moveToThread(&workerThread); workerThread.start(QThread::TimeCriticalPriority);