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

List:       kde-commits
Subject:    KDE/kdebase/runtime/plasma/tools/plasmapkg
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-09-05 7:44:38
Message-ID: 20100905074438.BCAA8AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1171796 by aseigo:

missing comparisons


 M  +8 -7      main.cpp  


--- trunk/KDE/kdebase/runtime/plasma/tools/plasmapkg/main.cpp #1171795:1171796
@@ -206,35 +206,35 @@
         }
     }
 
-    if (type.compare(i18nc("package type", "plasmoid"), Qt::CaseInsensitive) ||
+    if (type.compare(i18nc("package type", "plasmoid"), Qt::CaseInsensitive) == 0 ||
         type.compare("plasmoid", Qt::CaseInsensitive) == 0) {
         packageRoot = "plasma/plasmoids/";
         servicePrefix = "plasma-applet-";
         pluginTypes << "Plasma/Applet";
         pluginTypes << "Plasma/PopupApplet";
         pluginTypes << "Plasma/Containment";
-    } else if (type.compare(i18nc("package type", "theme"), Qt::CaseInsensitive) ||
+    } else if (type.compare(i18nc("package type", "theme"), Qt::CaseInsensitive) == 0 ||
                type.compare("theme", Qt::CaseInsensitive) == 0) {
         packageRoot = "desktoptheme/";
-    } else if (type.compare(i18nc("package type", "wallpaper"), Qt::CaseInsensitive) ||
+    } else if (type.compare(i18nc("package type", "wallpaper"), Qt::CaseInsensitive) == 0 ||
                type.compare("wallpaper", Qt::CaseInsensitive) == 0) {
         packageRoot = "wallpapers/";
-    } else if (type.compare(i18nc("package type", "dataengine"), Qt::CaseInsensitive) ||
+    } else if (type.compare(i18nc("package type", "dataengine"), Qt::CaseInsensitive) == 0 ||
                type.compare("dataengine", Qt::CaseInsensitive) == 0) {
         packageRoot = "plasma/dataengines/";
         servicePrefix = "plasma-dataengine-";
         pluginTypes << "Plasma/DataEngine";
-    } else if (type.compare(i18nc("package type", "runner"), Qt::CaseInsensitive) ||
+    } else if (type.compare(i18nc("package type", "runner"), Qt::CaseInsensitive) == 0 ||
                type.compare("runner", Qt::CaseInsensitive) == 0) {
         packageRoot = "plasma/runners/";
         servicePrefix = "plasma-runner-";
         pluginTypes << "Plasma/Runner";
-    } else if (type.compare(i18nc("package type", "wallpaperplugin"), Qt::CaseInsensitive) ||
+    } else if (type.compare(i18nc("package type", "wallpaperplugin"), Qt::CaseInsensitive) == 0 ||
                type.compare("wallpaperplugin", Qt::CaseInsensitive) == 0) {
         packageRoot = "plasma/wallpapers/";
         servicePrefix = "plasma-wallpaper-";
         pluginTypes << "Plasma/Wallpaper";
-    } else if (type.compare(i18nc("package type", "layout-template"), Qt::CaseInsensitive) ||
+    } else if (type.compare(i18nc("package type", "layout-template"), Qt::CaseInsensitive) == 0 ||
                type.compare("layout-template", Qt::CaseInsensitive) == 0) {
         packageRoot = "plasma/layout-templates/";
         servicePrefix = "plasma-layout-";
@@ -259,6 +259,7 @@
 
         packageRoot = installer->defaultPackageRoot();
         pluginTypes << installer->type();
+        kDebug() << "we have: " << packageRoot << pluginTypes;
     }
 
     if (args->isSet("list")) {
[prev in list] [next in list] [prev in thread] [next in thread]