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

List:       kde-commits
Subject:    kdeadmin/kpackage
From:       Antonio Larrosa Jimenez <larrosa () kde ! org>
Date:       2003-02-26 18:02:00
[Download RAW message or body]

CVS commit by antlarr: 

Removed some comparisons to "" and simplified the code a bit


  M +6 -12     debAptInterface.cpp   1.37
  M +3 -7      debInterface.cpp   1.64
  M +4 -11     kissInterface.cpp   1.41
  M +4 -4      packageInfo.cpp   1.33
  M +4 -4      pkgInterface.cpp   1.59


--- kdeadmin/kpackage/debAptInterface.cpp  #1.36:1.37
@@ -350,15 +350,9 @@ QString DEBAPT::install(int installFlags
     QString fname = i->fetchFilename();
 
-    if (!file.isEmpty()) {
-      files += "'";
-      files += file;
-      files += "'";
-      files += " ";
-    } else if (fname != "") {
-      packs += "'";
-      packs += fname;
-      packs += "'";
-      packs += " ";
-    }
+    if (!file.isEmpty()) 
+      files += "'" + file + "' ";
+     else if (!fname.isEmpty()) 
+      packs += "'" + fname + "' ";
+    
   }
 

--- kdeadmin/kpackage/debInterface.cpp  #1.63:1.64
@@ -545,10 +545,6 @@ QString DEB::install(int installFlags, Q
   for (i = p->first(); i!= 0; i = p->next())  {
     QString fname = i->fetchFilename();
-    if (fname != "") {
-      packs += "'";
-      packs += fname;
-      packs += "'";
-      packs += " ";
-    }
+    if (!fname.isEmpty())
+      packs += "'" + fname + "' ";
   }
   return doInstall(installFlags, packs, test);

--- kdeadmin/kpackage/kissInterface.cpp  #1.40:1.41
@@ -335,9 +335,5 @@ QString KISS::uninstall(int uninstallFla
 QString KISS::doUninstall(int, QString packs, bool &)
 {
-  QString s = "kiss ";
-  s += "-d ";
-  s += packs;
-
-  return s;
+  return "kiss -d " + packs;
 }
 
@@ -352,5 +348,5 @@ QString KISS::install(int installFlags, 
   for (pk = plist->first(); pk != 0; pk = plist->next()) {
     QString fname = pk->fetchFilename();
-    if (fname != "") {
+    if (!fname.isEmpty()) {
       doInstall(installFlags, fname, test);
       i++;
@@ -362,8 +358,5 @@ QString KISS::install(int installFlags, 
 QString KISS::doInstall(int, QString packs, bool &)
 {
-  QString s = "perl ";
-  s += packs;
-
-  return s;
+  return "perl " + packs;
 }
 

--- kdeadmin/kpackage/packageInfo.cpp  #1.32:1.33
@@ -262,9 +262,9 @@ int packageInfo::pnewer(QString s, QStri
     QString svsp = getNdigElement(sp,&nsp);
     //    kdDebug() << "vs=" << ns << " " << svs << " sp=" << nsp << " " << svsp << "\n";
-    if (svs == "" && svsp == "")
+    if (svs.isEmpty() && svsp.isEmpty())
       return 0;
-    if (svs == "" && svsp != "")
+    if (svs.isEmpty() && !svsp.isEmpty())
       return 1;
-    if (svs != "" && svsp == "")
+    if (!svs.isEmpty() && svsp.isEmpty())
       return -1;
 

--- kdeadmin/kpackage/pkgInterface.cpp  #1.58:1.59
@@ -328,5 +328,5 @@ QString pkgInterface::uninstall(int unin
 QString pkgInterface::uninstall(int uninstallFlags, QPtrList<packageInfo> *p, bool &test)
 {
-  QString packs = "";
+  QString packs;
   packageInfo *i;
 
@@ -354,5 +354,5 @@ QString pkgInterface::install(int instal
   for (i = p->first(); i!= 0; i = p->next())  {
     QString fname = i->fetchFilename();
-    if (fname != "") {
+    if (!fname.isEmpty()) {
       packs += fname;
       packs += " ";
@@ -379,5 +379,5 @@ QString pkgInterface::setOptions(int fla
   for ( p=params.first(); p != 0; p=params.next(), i++ ) {
     if ((flags>>i & 1) ^ p->invert) {
-      s += p->flag + " ";;
+      s += p->flag + " ";
     } else {
       if (!p->flagA.isEmpty())


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