* Track can use TrackData's cached sort-names.

src/libtomahawk/Track.cpp

@@ -165,10 +165,8 @@ Track::trackId() const
 void
 Track::updateSortNames()
 {
-    m_artistSortname = DatabaseImpl::sortname( artist(), true );
     m_composerSortname = DatabaseImpl::sortname( m_composer, true );
     m_albumSortname = DatabaseImpl::sortname( m_album );
-    m_trackSortname = DatabaseImpl::sortname( track() );
 }
 
 
@@ -495,3 +493,17 @@ Track::share( const Tomahawk::source_ptr& source )
 {
     m_trackData->share( source );
 }
+
+
+QString
+Track::artistSortname() const
+{
+    return m_trackData->artistSortname();
+}
+
+
+QString
+Track::trackSortname() const
+{
+    return m_trackData->trackSortname();
+}

src/libtomahawk/Track.h

@@ -60,10 +60,10 @@ public:
     QString toString() const;
     Tomahawk::query_ptr toQuery();
 
-    QString artistSortname() const { return m_artistSortname; }
     QString composerSortname() const { return m_composerSortname; }
     QString albumSortname() const { return m_albumSortname; }
-    QString trackSortname() const { return m_trackSortname; }
+    QString artistSortname() const;
+    QString trackSortname() const;
 
     QString artist() const;
     QString track() const;
@@ -128,13 +128,10 @@ private:
 
     void updateSortNames();
 
-    QString m_artistSortname;
-    QString m_composerSortname;
-    QString m_albumSortname;
-    QString m_trackSortname;
-
     QString m_composer;
     QString m_album;
+    QString m_composerSortname;
+    QString m_albumSortname;
 
     int m_duration;
     unsigned int m_albumpos;