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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/mediadevice/njb
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2007-06-26 19:53:04
Message-ID: 1182887584.344350.20867.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 680644 by mitchell:

Port forward Unicode fixes


 M  +1 -1      njbmediadevice.cpp  
 M  +6 -7      track.cpp  


--- trunk/extragear/multimedia/amarok/src/mediadevice/njb/njbmediadevice.cpp \
#680643:680644 @@ -202,6 +202,7 @@
         return true;
 
     QString genericError = i18n( "Could not connect to Nomad device" );
+    NJB_Set_Unicode( NJB_UC_UTF8 ); // I assume that UTF-8 is fine with everyone...
 
     int n;
     if( NJB_Discover( njbs, 0, &n) == -1 || n == 0 )
@@ -883,7 +884,6 @@
 
     if( m_connected )
     {
-        NJB_Set_Unicode( NJB_UC_UTF8 ); // I assume that UTF-8 is fine with \
everyone...  tracksFound = i18np( "1 track found on device",
                             "%n tracks found on device ", trackList.size() );
         powerStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary \
                power") : i18n("On main power") );
--- trunk/extragear/multimedia/amarok/src/mediadevice/njb/track.cpp #680643:680644
@@ -34,7 +34,6 @@
 /* ------------------------------------------------------------------------ */
 NjbTrack::NjbTrack( njb_songid_t* song)
 {
-
     njb_songid_frame_t* frame;
 
     m_id = song->trid;
@@ -67,7 +66,7 @@
     frame = NJB_Songid_Findframe( song, FR_ARTIST );
     if( frame )
     {
-        QString artist = frame->data.strval;
+        QString artist = QString::fromUtf8( frame->data.strval );
         artist.replace( QRegExp( "/" ), "-" );
         bundle->setArtist( artist );
     }
@@ -77,7 +76,7 @@
     frame = NJB_Songid_Findframe( song, FR_ALBUM );
     if( frame)
     {
-        QString album = frame->data.strval;
+        QString album = QString::fromUtf8( frame->data.strval );
         album.replace( QRegExp( "/" ), "-" );
         bundle->setAlbum( album );
     }
@@ -87,7 +86,7 @@
     frame = NJB_Songid_Findframe( song, FR_TITLE);
     if( frame )
     {
-        QString title = frame->data.strval;
+        QString title = QString::fromUtf8( frame->data.strval );
         title.replace( QRegExp( "/"), "-");
         bundle->setTitle( title );
     }
@@ -106,7 +105,7 @@
             bundle->setTrack( frame->data.u_int32_val );
             break;
         case NJB_TYPE_STRING:
-            bundle->setTrack( QString(frame->data.strval).toUInt() );
+            bundle->setTrack( QString::fromUtf8(frame->data.strval).toUInt() );
             break;
         default:
             bundle->setTrack( 0 );
@@ -136,7 +135,7 @@
     if( frame )
     {
         //bundle->setUrl( KUrl( frame->data.strval ) );
-        filename = frame->data.strval;
+        filename = QString::fromUtf8( frame->data.strval );
 
     }
     if( filename.isEmpty() )
@@ -159,7 +158,7 @@
             bundle->setYear( frame->data.u_int32_val );
             break;
         case NJB_TYPE_STRING:
-            bundle->setYear( QString( frame->data.strval ).toInt() );
+            bundle->setYear( QString::fromUtf8( frame->data.strval ).toInt() );
             break;
         default:
             bundle->setYear( 0 );


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