[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/amarok/amarok
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2003-09-30 20:11:36
[Download RAW message or body]

CVS commit by wheeler: 

Use the new TStringToQString macros for cleaner and more correct string
conversion.  (This went into TagLib on Sunday.)


  M +7 -7      playlistitem.cpp   1.8


--- kdenonbeta/amarok/amarok/playlistitem.cpp  #1.7:1.8
@@ -103,5 +103,5 @@ void PlaylistItem::readMetaInfo()
         m_hasMetaInfo = true;
 
-        TagLib::String str( m_url.path().utf8().data(), TagLib::String::UTF8 );
+        TagLib::String str( QStringToTString( m_url.path() ) );
         TagLib::FileRef f( str );
 
@@ -110,10 +110,10 @@ void PlaylistItem::readMetaInfo()
             TagLib::Tag * tag = f.tag();
 
-            m_tagTitle = QString( tag->title().toCString() );
-            m_tagArtist = QString( tag->artist().toCString() );
-            m_tagAlbum = QString( tag->album().toCString() );
-            m_tagYear = QString().setNum( tag->year() );
-            m_tagComment = QString( tag->comment().toCString() );
-            m_tagGenre = QString( tag->genre().toCString() );
+            m_tagTitle = TStringToQString( tag->title() );
+            m_tagArtist = TStringToQString( tag->artist() );
+            m_tagAlbum = TStringToQString( tag->album() );
+            m_tagYear = QString::number( tag->year() );
+            m_tagComment = TStringToQString( tag->comment() );
+            m_tagGenre = TStringToQString( tag->genre() );
             m_tagDirectory = QString( url().directory().section( '/', -1 ) );
         }


[prev in list] [next in list] [prev in thread] [next in thread]