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

List:       kde-commits
Subject:    KDE/kdepimlibs/kioslave/imap4
From:       Thomas McGuire <Thomas.McGuire () gmx ! net>
Date:       2008-03-15 21:54:35
Message-ID: 1205618075.252785.16248.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 786050 by tmcguire:

- Use references for the parameter again
- Protect against a null pointer


 M  +5 -5      mimeheader.cpp  
 M  +1 -1      mimeheader.h  


--- trunk/KDE/kdepimlibs/kioslave/imap4/mimeheader.cpp #786049:786050
@@ -82,7 +82,7 @@
     {
       int skip;
       const char *aCStr = addLine->getValue ().data ();
-      QHash < QString, QString > *aList;
+      QHash < QString, QString > *aList = 0;
 
       skip = mimeHdrLine::parseSeparator (';', aCStr);
       if (skip > 0)
@@ -143,8 +143,8 @@
         {
           if (skip > 0)
           {
-            addParameter (QByteArray (aCStr, skip).simplified(), aList);
-//            cout << "-- '" << aParm.data() << "'" << endl;
+            if (aList)
+              addParameter (QByteArray (aCStr, skip).simplified(), *aList);
             mimeValue = QByteArray (addLine->getValue ().data (), skip);
             aCStr += skip;
           }
@@ -157,7 +157,7 @@
 }
 
 void
-mimeHeader::addParameter (const QByteArray& aParameter, QHash < QString, QString > *aList)
+mimeHeader::addParameter (const QByteArray& aParameter, QHash < QString, QString > &aList)
 {
   QString aValue;
   QByteArray aLabel;
@@ -168,7 +168,7 @@
   if (aValue[0] == '"')
     aValue = aValue.mid (1, aValue.length () - 2);
 
-  aList->insert (aLabel.toLower(), aValue);
+  aList.insert (aLabel.toLower(), aValue);
 //  cout << "=" << aValue->data() << endl;
 }
 
--- trunk/KDE/kdepimlibs/kioslave/imap4/mimeheader.h #786049:786050
@@ -311,7 +311,7 @@
 #endif
 
 protected:
-  static void addParameter (const QByteArray&, QHash < QString, QString > *);
+  static void addParameter (const QByteArray&, QHash < QString, QString > &);
   static QString getParameter (const QByteArray&, QHash < QString, QString > &);
   static void setParameter (const QByteArray&, const QString&, QHash < QString, QString > &);
 
[prev in list] [next in list] [prev in thread] [next in thread]