mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 02:54:33 +02:00
Code Issues Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Dominik Schmidt
2013-09-03 14:57:19 +02:00
parent 3e21b99904
commit ac9c135521
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -575,18 +575,11 @@ Servent::handleSipInfo( const Tomahawk::peerinfo_ptr& peerInfo )
void void
Servent::incomingConnection( int sd )
{
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #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 ) Servent::incomingConnection( qintptr sd )
#else
Servent::incomingConnection( int sd )
#endif
{ {
Q_ASSERT( this->thread() == QThread::currentThread() ); Q_ASSERT( this->thread() == QThread::currentThread() );

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

@@ -150,12 +150,11 @@ signals:
void ready(); void ready();
protected: protected:
// 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 )
// #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
virtual void incomingConnection( qintptr sd ); virtual void incomingConnection( qintptr sd );
// #else #else
virtual void incomingConnection( int sd ); virtual void incomingConnection( int sd );
// #endif #endif
public slots: public slots:
void setExternalAddress( QHostAddress ha, unsigned int port ); void setExternalAddress( QHostAddress ha, unsigned int port );