diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cppparser/driver.cpp | 2 | ||||
| -rw-r--r-- | lib/cppparser/errors.cpp | 6 | ||||
| -rw-r--r-- | lib/cppparser/errors.h | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 3dc8569c..dc3689db 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -614,8 +614,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 ); diff --git a/lib/cppparser/errors.cpp b/lib/cppparser/errors.cpp index 5ce5058d..2622e7de 100644 --- a/lib/cppparser/errors.cpp +++ b/lib/cppparser/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'") ); diff --git a/lib/cppparser/errors.h b/lib/cppparser/errors.h index 26b63f2c..d4e65e0b 100644 --- a/lib/cppparser/errors.h +++ b/lib/cppparser/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; }; |