Replace QT_STATIC_CONST_* with actual definitions

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

umbrello/umbrello/codeimport/kdevcppparser/driver.cpp

@@ -340,8 +340,6 @@ void Driver::setupLexer( Lexer * lexer )
     lexer->addSkipWord( "TQ_REFCOUNT" );
     lexer->addSkipWord( "TQ_EXPLICIT" );
     lexer->addSkipWord( "QMAC_PASCAL" );
-    lexer->addSkipWord( "QT_STATIC_CONST" );
-    lexer->addSkipWord( "QT_STATIC_CONST_IMPL" );
     lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" );
     lexer->addSkipWord( "TQT_NC_MSGBOX" );
     lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments );

umbrello/umbrello/codeimport/kdevcppparser/errors.cpp

@@ -20,6 +20,6 @@
 #include "errors.h"
 #include <tdelocale.h>
 
-QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") );
-QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") );
-QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") );
+const Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") );
+const Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") );
+const Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") );

umbrello/umbrello/codeimport/kdevcppparser/errors.h

@@ -35,9 +35,9 @@ struct Error{
 
 class Errors{
 public:
-    QT_STATIC_CONST Error& InternalError;
-    QT_STATIC_CONST Error& SyntaxError;
-    QT_STATIC_CONST Error& ParseError;
+    static const Error& InternalError;
+    static const Error& SyntaxError;
+    static const Error& ParseError;
 };