Changeset 13919

Timestamp:

Feb 1, 2013, 6:52:55 PM (8 years ago)

Author:

jordan

Message:

(2.7x) backport r13799 for bug #5219

Location:

branches/2.7x/qt

Files:

• formatter.cc (modified) (6 diffs)
• session.cc (modified) (2 diffs)

branches/2.7x/qt/formatter.cc

@@ -42 +42 @@
     unitStrings[SPEED][TB] = tr( "TB/s" );
     tr_formatter_speed_init( speed_K,
-                             qPrintable( unitStrings[SPEED][KB] ),
-                             qPrintable( unitStrings[SPEED][MB] ),
-                             qPrintable( unitStrings[SPEED][GB] ),
-                             qPrintable( unitStrings[SPEED][TB] ) );
+                             unitStrings[SPEED][KB].toUtf8().constData(),
+                             unitStrings[SPEED][MB].toUtf8().constData(),
+                             unitStrings[SPEED][GB].toUtf8().constData(),
+                             unitStrings[SPEED][TB].toUtf8().constData() );
 
     size_K = 1000;
@@ -54 +54 @@
     unitStrings[SIZE][TB] = tr( "TB" );
     tr_formatter_size_init( size_K,
-                            qPrintable( unitStrings[SIZE][KB] ),
-                            qPrintable( unitStrings[SIZE][MB] ),
-                            qPrintable( unitStrings[SIZE][GB] ),
-                            qPrintable( unitStrings[SIZE][TB] ) );
+                            unitStrings[SIZE][KB].toUtf8().constData(),
+                            unitStrings[SIZE][MB].toUtf8().constData(),
+                            unitStrings[SIZE][GB].toUtf8().constData(),
+                            unitStrings[SIZE][TB].toUtf8().constData() );
 
     mem_K = 1024;
@@ -66 +66 @@
     unitStrings[MEM][TB] = tr( "TiB" );
     tr_formatter_mem_init( mem_K,
-                           qPrintable( unitStrings[MEM][KB] ),
-                           qPrintable( unitStrings[MEM][MB] ),
-                           qPrintable( unitStrings[MEM][GB] ),
-                           qPrintable( unitStrings[MEM][TB] ) );
+                           unitStrings[MEM][KB].toUtf8().constData(),
+                           unitStrings[MEM][MB].toUtf8().constData(),
+                           unitStrings[MEM][GB].toUtf8().constData(),
+                           unitStrings[MEM][TB].toUtf8().constData() );
 }
 
@@ -102 +102 @@
         char buf[128];
         tr_formatter_mem_B( buf, bytes, sizeof( buf ) );
-        return buf;
+        return QString::fromUtf8( buf );
     }
 }
@@ -116 +116 @@
         char buf[128];
         tr_formatter_size_B( buf, bytes, sizeof( buf ) );
-        return buf;
+        return QString::fromUtf8( buf );
     }
 }
@@ -128 +128 @@
         char buf[128];
         tr_formatter_speed_KBps( buf, speed.KBps( ), sizeof( buf ) );
-        return buf;
+        return QString::fromUtf8( buf );
     }
 }

branches/2.7x/qt/session.cc

@@ -968 +968 @@
 {
     const QByteArray b64 = AddData(filename).toBase64();
+    const QByteArray localPathUtf8 = localPath.toUtf8();
 
     tr_benc top, *args;
@@ -973 +974 @@
     tr_bencDictAddStr( &top, "method", "torrent-add" );
     args = tr_bencDictAddDict( &top, "arguments", 3 );
-    tr_bencDictAddStr( args, "download-dir", qPrintable(localPath) );
+    tr_bencDictAddStr( args, "download-dir", localPathUtf8.constData() );
     tr_bencDictAddBool( args, "paused", !myPrefs.getBool( Prefs::START ) );
     tr_bencDictAddRaw( args, "metainfo", b64.constData(), b64.size() );