summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-02-15 18:48:29 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-02-16 10:45:12 +0900
commitb703ee9830f7563754ef6c16a0f983964837a44e (patch)
tree00845a8b567d127fe52a84370e1a378b19443099
parentb3490347a5b3ffe68787d8ec30b2da6b3064ad75 (diff)
downloadtdesdk-b703ee9830f7563754ef6c16a0f983964837a44e.tar.gz
tdesdk-b703ee9830f7563754ef6c16a0f983964837a44e.zip
Replace QT_STATIC_CONST_* with actual definitions
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 2b89bcb01191a04c0a2e73e76d2a6cc9252d870a)
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/driver.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/errors.cpp6
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/errors.h6
3 files changed, 6 insertions, 8 deletions
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
index daef65da..2208c791 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
+++ b/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 );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
index 133d6726..21334479 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
+++ b/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'") );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.h b/umbrello/umbrello/codeimport/kdevcppparser/errors.h
index 6751475e..5ccd0b5a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.h
+++ b/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;
};