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

List:       kde-commits
Subject:    [networkmanagement] /: Use proper names for some variables and class method.
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2012-02-11 14:41:25
Message-ID: 20120211144125.04E6CA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 6f449662d7c5c0622df59434a51c74ef2ce19c77 by Lamarque V. Souza.
Committed on 11/02/2012 at 15:38.
Pushed by lvsouza into branch 'master'.

Use proper names for some variables and class method.
Thanks to Swami Dhyan Nataraj (Nikolay Shaplov) for the patch.

REVIEW: 103921

M  +1    -1    plasma_nm_version.h
M  +10   -10   settings/config/mobileproviders.cpp
M  +1    -1    settings/config/mobileproviders.h

http://commits.kde.org/networkmanagement/6f449662d7c5c0622df59434a51c74ef2ce19c77

diff --git a/plasma_nm_version.h b/plasma_nm_version.h
index 8d7407d..939db03 100644
--- a/plasma_nm_version.h
+++ b/plasma_nm_version.h
@@ -1,4 +1,4 @@
 #ifndef PLASMA_NM_VERSION_H
 #define PLASMA_NM_VERSION_H
-static const char * plasmaNmVersion = "0.9.1_rc1 (master 20120209)";
+static const char * plasmaNmVersion = "0.9.1_rc1 (master 20120211)";
 #endif
diff --git a/settings/config/mobileproviders.cpp \
b/settings/config/mobileproviders.cpp index 5d838f6..41b2c7c 100644
--- a/settings/config/mobileproviders.cpp
+++ b/settings/config/mobileproviders.cpp
@@ -153,7 +153,7 @@ QStringList MobileProviders::getProvidersList(QString country, \
const Knm::Connec  }
                         n3 = n3.nextSibling();
                     }
-                    QString name = getProviderNameByLocale(localizedProviderNames);
+                    QString name = getNameByLocale(localizedProviderNames);
                     if (hasGsm) {
                         mProvidersGsm.insert(name, e2.firstChild());
                     }
@@ -243,7 +243,7 @@ QVariantMap MobileProviders::getApnInfo(const QString & apn)
     QVariantMap temp;
     QDomNode n = mApns[apn];
     QStringList dnsList;
-    QMap<QString, QString> localizedProviderNames;
+    QMap<QString, QString> localizedPlanNames;
 
     while (!n.isNull()) {
         QDomElement e = n.toElement(); // <name|username|password|dns(*)>
@@ -257,7 +257,7 @@ QVariantMap MobileProviders::getApnInfo(const QString & apn)
                     lang = lang.toLower();
                     lang.remove(QRegExp("\\-.*$"));  // Remove everything after '-' \
in xml:lang attribute.  }
-                localizedProviderNames.insert(lang, e.text());
+                localizedPlanNames.insert(lang, e.text());
             } else if (e.tagName().toLower() == "username") {
                 temp.insert("username", e.text());
             } else if (e.tagName().toLower() == "password") {
@@ -270,7 +270,7 @@ QVariantMap MobileProviders::getApnInfo(const QString & apn)
         n = n.nextSibling();
     }
 
-    QString name = getProviderNameByLocale(localizedProviderNames);
+    QString name = getNameByLocale(localizedPlanNames);
     if (!name.isEmpty()) {
         temp.insert("name", QVariant::fromValue(name));
     }
@@ -322,7 +322,7 @@ QVariantMap MobileProviders::getCdmaInfo(const QString & \
provider)  return temp;
 }
 
-QString MobileProviders::getProviderNameByLocale(const QMap<QString, QString> & \
localizedProviderNames) const +QString MobileProviders::getNameByLocale(const \
QMap<QString, QString> & localizedNames) const  {
     QString name;
     QStringList locales = KGlobal::locale()->languageList();
@@ -330,16 +330,16 @@ QString MobileProviders::getProviderNameByLocale(const \
QMap<QString, QString> &  QString language, country, modifier, charset;
         KLocale::splitLocale(locale, language, country, modifier, charset);
 
-        if (localizedProviderNames.contains(language)) {
-            return localizedProviderNames[language];
+        if (localizedNames.contains(language)) {
+            return localizedNames[language];
         }
     }
 
-    name = localizedProviderNames["en"];
+    name = localizedNames["en"];
 
     // Use any language if no proper localized name were found.
-    if (name.isEmpty() && !localizedProviderNames.isEmpty()) {
-        name = localizedProviderNames.constBegin().value();
+    if (name.isEmpty() && !localizedNames.isEmpty()) {
+        name = localizedNames.constBegin().value();
     }
     return name;
 }
diff --git a/settings/config/mobileproviders.h b/settings/config/mobileproviders.h
index 6e7e119..8df2269 100644
--- a/settings/config/mobileproviders.h
+++ b/settings/config/mobileproviders.h
@@ -60,7 +60,7 @@ private:
     QDomDocument mDocProviders;
     QDomElement docElement;
     ErrorCodes mError;
-    QString getProviderNameByLocale(const QMap<QString, QString> & names) const;
+    QString getNameByLocale(const QMap<QString, QString> & names) const;
 };
 
 #endif


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