* Style fixes.

src/accounts/xmpp/sip/XmppSip.cpp

@@ -75,16 +75,16 @@ JreenMessageHandler( QtMsgType type, const char *msg )
     switch ( type )
     {
         case QtDebugMsg:
-            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Debug: " <<  msg;
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Debug:" << msg;
             break;
         case QtWarningMsg:
-            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Warning: " <<  msg;
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Warning:" << msg;
             break;
         case QtCriticalMsg:
-            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Critical: " <<  msg;
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Critical:" << msg;
             break;
         case QtFatalMsg:
-            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Fatal: " <<  msg;
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ":" << "Fatal:" << msg;
             abort();
     }
 }

src/infoplugins/linux/mpris/MprisPlugin.cpp

@@ -568,7 +568,6 @@ MprisPlugin::onTrackCountChanged( unsigned int tracks )
     Q_UNUSED( tracks );
     notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoNext" );
     notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoPrevious" );
-
 }
 
 

src/libtomahawk/Album.h

@@ -69,6 +69,7 @@ public:
     void setWeakRef( QWeakPointer< Tomahawk::Album > weakRef ) { m_ownRef = weakRef; }
 
     void loadId( bool autoCreate );
+
 signals:
     void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
     void updated();

src/libtomahawk/LatchManager.cpp

@@ -42,6 +42,7 @@ LatchManager::~LatchManager()
 
 }
 
+
 bool
 LatchManager::isLatched( const source_ptr& src )
 {
@@ -58,9 +59,10 @@ LatchManager::latchRequest( const source_ptr& source )
 
     m_state = Latching;
     m_waitingForLatch = source;
-    AudioEngine::instance()->playItem( source->playlistInterface(), source->playlistInterface()->nextItem() );
+    AudioEngine::instance()->playItem( source->playlistInterface(), source->playlistInterface()->nextResult() );
 }
 
+
 void
 LatchManager::playlistChanged( Tomahawk::playlistinterface_ptr )
 {

src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp

@@ -116,7 +116,7 @@ DatabaseCommand_SetDynamicPlaylistRevision::postCommitHook()
         Q_ASSERT( false );
         return;
     }
-    
+
     // workaround a bug in pre-0.1.0 tomahawks. they created dynamic playlists in OnDemand mode *always*, and then set the mode to the real one.
     // now that we separate them, if we get them as one and then get a changed mode, the playlist ends up in the wrong bucket in Collection.
     // so here we fix it if we have to.

src/libtomahawk/infosystem/InfoSystem.h

@@ -119,14 +119,14 @@ signals:
     void updateCache( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output );
 
 protected slots:
-    
+
     /**
      * @brief Called after the plugin has been moved to the appropriate thread. Do network-based setup tasks here.
      *
      * @return void
      **/
     virtual void init() = 0;
-    
+
     virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ) = 0;
     virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData ) = 0;
     virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData ) = 0;

src/libtomahawk/network/DbSyncConnection.cpp

@@ -213,7 +213,7 @@ DBSyncConnection::handleMsg( msg_ptr msg )
     if ( m.value( "method" ).toString() == "fetchops" )
     {
         ++m_fetchCount;
-        tDebug() << "Fetching new dbops:" << m["lastop"].toString() << m_fetchCount;
+        tDebug( LOGVERBOSE ) << "Fetching new dbops:" << m["lastop"].toString() << m_fetchCount;
         m_uscache = m;
         sendOps();
         return;

src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp

@@ -107,6 +107,7 @@ DynamicWidget::~DynamicWidget()
 {
 }
 
+
 dynplaylist_ptr
 DynamicWidget::playlist()
 {
@@ -154,7 +155,6 @@ DynamicWidget::loadDynamicPlaylist( const Tomahawk::dynplaylist_ptr& playlist )
         disconnect( m_playlist.data(), SIGNAL( changed() ), this, SLOT( onChanged() ) );
     }
 
-
     m_playlist = playlist;
     m_view->setOnDemand( m_playlist->mode() == OnDemand );
     m_view->setReadOnly( !m_playlist->author()->isLocal() );
@@ -414,6 +414,7 @@ DynamicWidget::controlChanged( const Tomahawk::dyncontrol_ptr& control )
     emit descriptionChanged( m_playlist->generator()->sentenceSummary() );
 }
 
+
 void
 DynamicWidget::steeringChanged()
 {
@@ -497,18 +498,21 @@ DynamicWidget::paintRoundedFilledRect( QPainter& p, QPalette& /* pal */, QRect&
     p.drawRoundedRect( r, 10, 10 );
 }
 
+
 QString
 DynamicWidget::description() const
 {
     return m_model->description();
 }
 
+
 QString
 DynamicWidget::title() const
 {
     return m_model->title();
 }
 
+
 QPixmap
 DynamicWidget::pixmap() const
 {

src/libtomahawk/resolvers/QtScriptResolver.cpp

@@ -19,6 +19,14 @@
 
 #include "QtScriptResolver.h"
 
+#include <QtGui/QMessageBox>
+
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+
+#include <QtCore/QMetaProperty>
+#include <QtCore/QCryptographicHash>
+
 #include "Artist.h"
 #include "Album.h"
 #include "config.h"
@@ -30,15 +38,6 @@
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
-
-#include <QtGui/QMessageBox>
-
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-
-#include <QtCore/QMetaProperty>
-#include <QtCore/QCryptographicHash>
-
 // FIXME: bloody hack, remove this for 0.3
 // this one adds new functionality to old resolvers
 #define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;"

src/libtomahawk/utils/PixmapDelegateFader.cpp

@@ -244,7 +244,7 @@ PixmapDelegateFader::onAnimationStep( int step )
     }
 
     Q_ASSERT( !m_currentReference.isNull() );
-    if ( !m_currentReference.isNull() ) // Should never be null..
+    if ( !m_currentReference.isNull() ) // Should never be null...
     {
         p.setOpacity( opacity );
         p.drawPixmap( 0, 0, m_currentReference );

src/libtomahawk/widgets/OverlayWidget.cpp

@@ -194,7 +194,7 @@ OverlayWidget::paintEvent( QPaintEvent* event )
         int width = qMin( maxiSize.width(), prefSize.width() );
         int height = qMin( maxiSize.height(), prefSize.height() );
         QSize newSize = QSize( width, height );
-        
+
         if ( newSize != size() )
             resize( newSize );
     }

src/libtomahawk/widgets/WhatsHotWidget.cpp

@@ -361,7 +361,7 @@ void
 WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index )
 {
 
-    tDebug( LOGVERBOSE ) << "WhatsHot:: left crumb changed" << index.data();
+    tDebug( LOGVERBOSE ) << "WhatsHot: left crumb changed" << index.data();
 
     QStandardItem* item = m_crumbModelLeft->itemFromIndex( m_sortedProxy->mapToSource( index ) );
     if ( !item )
@@ -454,7 +454,7 @@ QStandardItem*
 WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data )
 {
     Q_UNUSED( parentItem );
-//     tDebug( LOGVERBOSE ) << "WhatsHot:: parsing " << label;
+//     tDebug( LOGVERBOSE ) << "WhatsHot: parsing " << label;
 
     QStandardItem *sourceItem = new QStandardItem( label );