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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       Hamish Rodda <rodda () kde ! org>
Date:       2005-06-11 17:06:42
Message-ID: 1118509602.481216.3816.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 424373 by rodda:

Fix testcase crash

it seems that the const version of end() is not the same as the
non-const version, thus the problem here.

The testcase still fails though...


 M  +4 -2      kmacroexpander.cpp  


--- branches/work/kde4/kdelibs/kdecore/kmacroexpander.cpp #424372:424373
@@ -25,6 +25,8 @@
 #include <q3valuestack.h>
 #include <qregexp.h>
 
+#include <kdebug.h>
+
 KMacroExpanderBase::KMacroExpanderBase( QChar c )
 {
     escapechar = c;
@@ -360,8 +362,8 @@
     }
     const KMacroMapExpander<QChar,VT> *const_this = this;
     typename QMap<QChar,VT>::const_iterator it = const_this->macromap.find(str[pos]);
-    if (it != macromap.end()) {
-       ret += it.data();
+    if (it != const_this->macromap.end()) {
+       ret += it.value();
        return 2;
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]