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

* Style fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-09-06 19:22:27 +02:00
parent c31f0ad9c7
commit b9133e57ba
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,6 +361,7 @@ Servent::deleteLazyOffer( const QString& key )
} }
} }
void void
Servent::registerControlConnection( ControlConnection* conn ) Servent::registerControlConnection( ControlConnection* conn )
{ {
@@ -967,6 +968,7 @@ Servent::checkACLResult( const QString& nodeid, const QString& username, Tomahaw
d_func()->queuedForACLResult[username].remove( nodeid ); d_func()->queuedForACLResult[username].remove( nodeid );
} }
void void
Servent::ipDetected() Servent::ipDetected()
{ {
@@ -1075,6 +1077,7 @@ Servent::additionalPort() const
return d_func()->externalPort; return d_func()->externalPort;
} }
bool bool
equalByIPv6Address( QHostAddress a1, QHostAddress a2 ) equalByIPv6Address( QHostAddress a1, QHostAddress a2 )
{ {
@@ -1089,6 +1092,7 @@ equalByIPv6Address( QHostAddress a1, QHostAddress a2 )
return true; return true;
} }
// return the appropriate connection for a given offer key, or NULL if invalid // return the appropriate connection for a given offer key, or NULL if invalid
Connection* Connection*
Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString &key, const QHostAddress peer ) Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString &key, const QHostAddress peer )
@@ -1417,6 +1421,7 @@ Servent::httpIODeviceFactory( const Tomahawk::result_ptr& result,
reply, callback )->setAutoDelete( true ); reply, callback )->setAutoDelete( true );
} }
void void
Servent::httpIODeviceReady( NetworkReply* reply, IODeviceCallback callback ) Servent::httpIODeviceReady( NetworkReply* reply, IODeviceCallback callback )
{ {

2
src/libtomahawk/utils/NetworkReply.cpp
View File

@@ -103,7 +103,6 @@ NetworkReply::metaDataChanged()
emit finalUrlReached( m_url ); emit finalUrlReached( m_url );
} }
} }
} }
@@ -116,6 +115,7 @@ NetworkReply::connectReplySignals()
connect( m_reply, SIGNAL( metaDataChanged() ), SLOT( metaDataChanged() ) ); connect( m_reply, SIGNAL( metaDataChanged() ), SLOT( metaDataChanged() ) );
} }
void void
NetworkReply::disconnectReplySignals() NetworkReply::disconnectReplySignals()
{ {

1
src/tomahawk/sourcetree/SourceTreeView.cpp
View File

@@ -215,7 +215,6 @@ SourceTreeView::setupMenus()
{ {
loadPlaylistAction = ActionCollection::instance()->getAction( "loadStation" ); loadPlaylistAction = ActionCollection::instance()->getAction( "loadStation" );
renamePlaylistAction = ActionCollection::instance()->getAction( "renameStation" ); renamePlaylistAction = ActionCollection::instance()->getAction( "renameStation" );
} }
else else
{ {