SVN commit 1153555 by jmthomas:

Use KComboBox rather than QComboBox, and fix some string efficiency issues reported by krazy


 M  +5 -5      helper/polkitkde1helper.cpp  
 M  +5 -5      polkitactions/ActionWidget.cpp  
 M  +2 -2      polkitactions/ActionWidget.h  
 M  +2 -2      polkitactions/explicitauthorizationdialog.cpp  


--- trunk/extragear/base/polkit-kde-1/kcmodules/helper/polkitkde1helper.cpp #1153554:1153555
@@ -151,15 +151,15 @@
             // Now parse over all the rest
             while (!in.atEnd()) {
                 QString line = in.readLine();
-                if (line.startsWith("Identity=")) {
+                if (line.startsWith(QLatin1String("Identity="))) {
                     entry.identity = line.split("Identity=").last();
-                } else if (line.startsWith("Action=")) {
+                } else if (line.startsWith(QLatin1String("Action="))) {
                     entry.action = line.split("Action=").last();
-                } else if (line.startsWith("ResultAny=")) {
+                } else if (line.startsWith(QLatin1String("ResultAny="))) {
                     entry.resultAny = line.split("ResultAny=").last();
-                } else if (line.startsWith("ResultInactive=")) {
+                } else if (line.startsWith(QLatin1String("ResultInactive="))) {
                     entry.resultInactive = line.split("ResultInactive=").last();
-                } else if (line.startsWith("ResultActive=")) {
+                } else if (line.startsWith(QLatin1String("ResultActive="))) {
                     entry.resultActive = line.split("ResultActive=").last();
                 } else if (line.startsWith('[')) {
                     // Ouch!!
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/ActionWidget.cpp #1153554:1153555
@@ -150,7 +150,7 @@
         authorizationText.append(", ");
     }
 
-    if (authorizationText.endsWith(", ")) {
+    if (authorizationText.endsWith(QLatin1String(", "))) {
         authorizationText.remove(-1, 2);
     }
 
@@ -164,24 +164,24 @@
     QStringList realIdentities = identities.split(';');
 
     foreach (const QString &identity, realIdentities) {
-        if (identity.startsWith("unix-user:")) {
+        if (identity.startsWith(QLatin1String("unix-user:"))) {
             rettext.append(identity.split("unix-user:").last());
             rettext.append(", ");
         }
-        if (identity.startsWith("unix-group:")) {
+        if (identity.startsWith(QLatin1String("unix-group:"))) {
             rettext.append(i18n("%1 group", identity.split("unix-group:").last()));
             rettext.append(", ");
         }
     }
 
-    if (rettext.endsWith(", ")) {
+    if (rettext.endsWith(QLatin1String(", "))) {
         rettext = rettext.remove(rettext.length() - 2, 2);
     }
 
     return rettext;
 }
 
-void ActionWidget::setImplicitAuthorization(PolkitQt1::ActionDescription::ImplicitAuthorization auth, QComboBox* box)
+void ActionWidget::setImplicitAuthorization(PolkitQt1::ActionDescription::ImplicitAuthorization auth, KComboBox* box)
 {
     box->setCurrentIndex(comboBoxIndexFor(auth));
 }
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/ActionWidget.h #1153554:1153555
@@ -15,7 +15,7 @@
 #include "../PKLAEntry.h"
 #include <PolkitQt1/ActionDescription>
 
-class QComboBox;
+class KComboBox;
 class QListWidgetItem;
 namespace Ui {
 class ActionWidget;
@@ -52,7 +52,7 @@
         void changed();
 
     private:
-        void setImplicitAuthorization(PolkitQt1::ActionDescription::ImplicitAuthorization auth, QComboBox *box);
+        void setImplicitAuthorization(PolkitQt1::ActionDescription::ImplicitAuthorization auth, KComboBox *box);
         void addNewPKLAEntry(const PKLAEntry &entry);
         QString formatPKLAEntry(const PKLAEntry &entry);
         QString formatIdentities(const QString &identities);
--- trunk/extragear/base/polkit-kde-1/kcmodules/polkitactions/explicitauthorizationdialog.cpp #1153554:1153555
@@ -68,9 +68,9 @@
 
     foreach (const QString &identity, m_entry.identity.split(';')) {
         IdentityWidget *idWidget = 0;
-        if (identity.startsWith("unix-user:")) {
+        if (identity.startsWith(QLatin1String("unix-user:"))) {
             idWidget = new IdentityWidget(IdentityWidget::UserIdentity, identity.split("unix-user:").last());
-        } else if (identity.startsWith("unix-group:")) {
+        } else if (identity.startsWith(QLatin1String("unix-group:"))) {
             idWidget = new IdentityWidget(IdentityWidget::GroupIdentity, identity.split("unix-group:").last());
         }