[Uml-devel] KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser

[Andi Fischer]

SVN commit 1102669 by fischer:

Q3ValueList replaced with QList.

 M  +5 -4      lexer.cpp  
 M  +2 -2      preprocesslexer.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp #1102668:1102669
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <qregexp.h>
-#include <qmap.h>
-#include <q3valuelist.h>
+#include <QtCore/QRegExp>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -267,7 +267,7 @@
 
 struct LexerData {
     typedef QMap<QString, QString> Scope;
-    typedef Q3ValueList<Scope> StaticChain;
+    typedef QList<Scope> StaticChain;
 
     StaticChain staticChain;
 
@@ -426,6 +426,7 @@
 
 void Lexer::handleDirective(const QString& directive)
 {
+    Q_UNUSED(directive);
     assert(directive != "define");
     assert(directive != "else");
     assert(directive != "elif");
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp #1102668:1102669
@@ -26,7 +26,7 @@
 
 #include <QtCore/QRegExp>
 #include <QtCore/QMap>
-#include <q3valuelist.h>
+#include <QtCore/QList>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -248,7 +248,7 @@
 
 struct LexerData {
     typedef QMap<QString, QString> Scope;
-    typedef Q3ValueList<Scope> StaticChain;
+    typedef QList<Scope> StaticChain;
 
     StaticChain staticChain;