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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdelibs/kio/kssl
From:       George Staikos <staikos () kde ! org>
Date:       2003-05-29 17:01:38
[Download RAW message or body]

CVS commit by staikos: 

beautify this code a bit


  M +48 -43    ksslx509map.cc   1.3.4.1


--- kdelibs/kio/kssl/ksslx509map.cc  #1.3:1.3.4.1
@@ -20,5 +20,5 @@
 
 #include "ksslx509map.h"
-#include <qvaluelist.h>
+#include <qstringlist.h>
 #include <qregexp.h>
 
@@ -39,15 +39,20 @@ void KSSLX509Map::setValue(const QString
 
 QString KSSLX509Map::getValue(const QString& key) const {
-  if (!m_pairs.contains(key)) return QString::null;
+        if (!m_pairs.contains(key)) {
+                return QString::null;
+        }
+
   return m_pairs[key];
 }
 
-static QValueList<QString> tokenizeBy(const QString& str, const QRegExp& tok, bool \
                keepEmpties = false) {
-QValueList<QString> tokens;
+static QStringList tokenizeBy(const QString& str, const QRegExp& tok, bool \
keepEmpties = false) { +QStringList tokens;
 unsigned int head, tail;
 const char *chstr = str.ascii();
 unsigned int length = str.length();
  
-  if (length < 1) return tokens;
+        if (length < 1) {
+                return tokens;
+        }
  
   if (length == 1) {
@@ -70,17 +75,15 @@ unsigned int length = str.length();
     }
   }
-return tokens;
+        return tokens;
 }
 
 
 void KSSLX509Map::parse(const QString& name) {
-QValueList<QString> vl = tokenizeBy(name, QRegExp("/[A-Za-z]+="), false);
+QStringList vl = tokenizeBy(name, QRegExp("/[A-Za-z]+="), false);
 
   m_pairs.clear();
 
-  for (QValueListIterator<QString> j = vl.begin();
-                                   j != vl.end();
-                                   ++j) {
-    QValueList<QString> apair = tokenizeBy(*j, QRegExp("="), false);
+        for (QStringList::Iterator j = vl.begin(); j != vl.end(); ++j) {
+                QStringList apair = tokenizeBy(*j, QRegExp("="), false);
     if (m_pairs.contains(apair[0])) {
       QString oldValue = m_pairs[apair[0]];
@@ -88,7 +91,8 @@ QValueList<QString> vl = tokenizeBy(name
       oldValue += apair[1];
       m_pairs.replace(apair[0], oldValue);
-    } else m_pairs.insert(apair[0], apair[1]);
+                } else {
+                        m_pairs.insert(apair[0], apair[1]);
+                }
   }
-  
 }
 


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