mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

incomingConnection has another signature on Qt5

Browse Source
This commit is contained in:
Uwe L. Korn
2013-09-03 13:07:36 +02:00
parent 086662edd3
commit 3e21b99904
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libtomahawk/network/Servent.cpp
View File

@@ -576,6 +576,17 @@ Servent::handleSipInfo( const Tomahawk::peerinfo_ptr& peerInfo )
void void
Servent::incomingConnection( int sd ) Servent::incomingConnection( int sd )
{
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
Q_UNUSED( sd );
Q_ASSERT( false );
#else
incomingConnection( (qintptr) sd );
#endif
}
void
Servent::incomingConnection( qintptr sd )
{ {
Q_ASSERT( this->thread() == QThread::currentThread() ); Q_ASSERT( this->thread() == QThread::currentThread() );

7
src/libtomahawk/network/Servent.h
View File

@@ -150,7 +150,12 @@ signals:
void ready(); void ready();
protected: protected:
void incomingConnection( int sd ); // Would be nice to ifdef this, but we would need CMake 2.8.11 for that as a requirement
// #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
virtual void incomingConnection( qintptr sd );
// #else
virtual void incomingConnection( int sd );
// #endif
public slots: public slots:
void setExternalAddress( QHostAddress ha, unsigned int port ); void setExternalAddress( QHostAddress ha, unsigned int port );