From ef80237d3934491b5539e5bf916ff49dad3f649d Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 27 Jun 2012 02:17:28 +0200
Subject: [PATCH] * Expose composer's sortname in Query's API.

---
 src/libtomahawk/Query.cpp | 30 +++++++++++++++---------------
 src/libtomahawk/Query.h   |  9 +++++----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp
index 9139115ec..853788fe8 100644
--- a/src/libtomahawk/Query.cpp
+++ b/src/libtomahawk/Query.cpp
@@ -175,14 +175,14 @@ Query::updateSortNames()
     if ( isFullTextQuery() )
     {
         m_artistSortname = DatabaseImpl::sortname( m_fullTextQuery, true );
-        m_composerSortName = DatabaseImpl::sortname( m_composer, true );
+        m_composerSortname = DatabaseImpl::sortname( m_composer, true );
         m_albumSortname = DatabaseImpl::sortname( m_fullTextQuery );
         m_trackSortname = m_albumSortname;
     }
     else
     {
         m_artistSortname = DatabaseImpl::sortname( m_artist, true );
-        m_composerSortName = DatabaseImpl::sortname( m_composer, true );
+        m_composerSortname = DatabaseImpl::sortname( m_composer, true );
         m_albumSortname = DatabaseImpl::sortname( m_album );
         m_trackSortname = DatabaseImpl::sortname( m_track );
     }
@@ -194,7 +194,7 @@ Query::displayQuery() const
 {
     if ( !results().isEmpty() )
         return results().first()->toQuery();
-    
+
     return m_ownRef.toStrongRef();
 }
 
@@ -571,7 +571,7 @@ Query::playbackHistory( const Tomahawk::source_ptr& source ) const
             history << log;
         }
     }
-    
+
     return history;
 }
 
@@ -593,7 +593,7 @@ Query::playbackCount( const source_ptr& source )
         if ( source.isNull() || log.source == source )
             count++;
     }
-    
+
     return count;
 }
 
@@ -675,12 +675,12 @@ Query::setLoved( bool loved )
         trackInfo["album"] = album();
 
         loveInfo[ "trackinfo" ] = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
-        
+
         Tomahawk::InfoSystem::InfoPushData pushData ( id(),
                                                       ( loved ? Tomahawk::InfoSystem::InfoLove : Tomahawk::InfoSystem::InfoUnLove ),
                                                       loveInfo,
                                                       Tomahawk::InfoSystem::PushShortUrlFlag );
-        
+
         Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
 
         DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction( q, QString( "Love" ), loved ? QString( "true" ) : QString( "false" ) );
@@ -788,10 +788,10 @@ Query::coverLoaded() const
 {
     if ( m_albumPtr.isNull() )
         return false;
-    
+
     if ( m_albumPtr->coverLoaded() && !m_albumPtr->cover( QSize( 0, 0 ) ).isNull() )
         return true;
-    
+
     return m_artistPtr->coverLoaded();
 }
 
@@ -814,7 +814,7 @@ Query::similarTracks() const
         requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
         requestData.type = Tomahawk::InfoSystem::InfoTrackSimilars;
         requestData.requestId = TomahawkUtils::infosystemRequestId();
-        
+
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                  SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                  SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
@@ -826,7 +826,7 @@ Query::similarTracks() const
         m_infoJobs++;
         Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
     }
-    
+
     return m_similarTracks;
 }
 
@@ -847,7 +847,7 @@ Query::lyrics() const
         requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
         requestData.type = Tomahawk::InfoSystem::InfoTrackLyrics;
         requestData.requestId = TomahawkUtils::infosystemRequestId();
-        
+
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                  SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                  SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
@@ -859,7 +859,7 @@ Query::lyrics() const
         m_infoJobs++;
         Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
     }
-    
+
     return m_lyrics;
 }
 
@@ -876,7 +876,7 @@ Query::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVaria
         case InfoSystem::InfoTrackLyrics:
         {
             m_lyrics = output.value< QVariant >().toString().split( "\n" );
-            
+
             m_lyricsLoaded = true;
             emit lyricsLoaded();
             break;
@@ -892,7 +892,7 @@ Query::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVaria
                 m_similarTracks << Query::get( artists.at( i ), tracks.at( i ), QString(), uuid(), false );
             }
             Pipeline::instance()->resolve( m_similarTracks );
-            
+
             m_simTracksLoaded = true;
             emit similarTracksLoaded();
 
diff --git a/src/libtomahawk/Query.h b/src/libtomahawk/Query.h
index 6eb60088c..121d40a99 100644
--- a/src/libtomahawk/Query.h
+++ b/src/libtomahawk/Query.h
@@ -129,6 +129,7 @@ public:
 
     QString resultHint() const { return m_resultHint; }
     QString artistSortname() const { return m_artistSortname; }
+    QString composerSortname() const { return m_composerSortname; }
     QString albumSortname() const { return m_albumSortname; }
     QString trackSortname() const { return m_trackSortname; }
 
@@ -139,7 +140,7 @@ public:
     int duration() const { return m_duration; }
     unsigned int albumpos() const { return m_albumpos; }
     unsigned int discnumber() const { return m_discnumber; }
-    
+
     query_ptr displayQuery() const;
 
 #ifndef ENABLE_HEADLESS
@@ -233,7 +234,7 @@ private:
     mutable QID m_qid;
 
     QString m_artistSortname;
-    QString m_composerSortName;
+    QString m_composerSortname;
     QString m_albumSortname;
     QString m_trackSortname;
 
@@ -266,10 +267,10 @@ private:
 
     bool m_simTracksLoaded;
     QList<Tomahawk::query_ptr> m_similarTracks;
-    
+
     bool m_lyricsLoaded;
     QStringList m_lyrics;
-    
+
     mutable int m_infoJobs;
 };