[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-39-g3a1238e

Modestas Vainius modax-guest at alioth.debian.org
Sat Apr 4 17:17:58 UTC 2009


The following commit has been merged in the master branch:
commit 3a1238ee7c919707a1056c07d52f154b0a4abbe1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Apr 4 20:16:50 2009 +0300

    Use QFile::decodeName() instead of QString::fromLocal8Bit() for decoding file paths.
    
    When parsing command line arguments.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/kaboomsettings.cpp b/kaboomsettings.cpp
index ba2c1c4..8ceedcd 100644
--- a/kaboomsettings.cpp
+++ b/kaboomsettings.cpp
@@ -56,13 +56,13 @@ KaboomSettings::KaboomSettings(int argc, char** argv)
 
     for (int i = 1; i < argc; i++) {
         if (strcmp(argv[i], "--kdehome") == 0 && i+1 < argc) {
-            setKdehomePath(KdeHome, QString::fromLocal8Bit(argv[++i]));
+            setKdehomePath(KdeHome, QFile::decodeName(argv[++i]));
         } else if (strcmp(argv[i], "--kde4home") == 0 && i+1 < argc) {
-            setKdehomePath(Kde4Home, QString::fromLocal8Bit(argv[++i]));
+            setKdehomePath(Kde4Home, QFile::decodeName(argv[++i]));
         } else if (strcmp(argv[i], "--kde3backup") == 0 && i+1 < argc) {
-            setKdehomePath(Kde3Backup, QString::fromLocal8Bit(argv[++i]));
+            setKdehomePath(Kde3Backup, QFile::decodeName(argv[++i]));
         } else if (strcmp(argv[i], "--stamp") == 0 && i+1 < argc) {
-            m_stampFile.setFileName(QString::fromLocal8Bit(argv[++i]));
+            m_stampFile.setFileName(QFile::decodeName(argv[++i]));
         } else if (strcmp(argv[i], "--help") == 0) {
             // TODO: show help
         }

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list