diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | lib/antlr/antlr/CharScanner.h | 1 | ||||
| -rw-r--r-- | lib/cppparser/driver.cpp | 2 | ||||
| m--------- | parts/appwizard/common/admin | 0 | ||||
| -rw-r--r-- | vcs/subversion/kdevsvnd.cpp | 2 | ||||
| -rw-r--r-- | vcs/subversion/svn_tdeio.cpp | 2 |
6 files changed, 4 insertions, 3 deletions
diff --git a/admin b/admin -Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 +Subproject 7fc9aedfb802dbb23da9f54134dd1c381124bc5 diff --git a/lib/antlr/antlr/CharScanner.h b/lib/antlr/antlr/CharScanner.h index e553d64d..2e2ffc7c 100644 --- a/lib/antlr/antlr/CharScanner.h +++ b/lib/antlr/antlr/CharScanner.h @@ -10,6 +10,7 @@ #include <antlr/config.h> +#include <functional> #include <map> #ifdef HAS_NOT_CCTYPE_H diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index dc3689db..07491169 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -594,7 +594,7 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "EXPORT_DOCKCLASS" ); lexer->addSkipWord( "K_EXPORT_COMPONENT_FACTORY", SkipWordAndArguments ); lexer->addSkipWord( "K_SYCOCAFACTORY", SkipWordAndArguments ); - lexer->addSkipWord( "KDE_DEPRECATED" ); + lexer->addSkipWord( "TDE_DEPRECATED" ); // qt lexer->addSkipWord( "TQ_OBJECT" ); diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 +Subproject 7fc9aedfb802dbb23da9f54134dd1c381124bc5 diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 1fc4afc8..30e76f0e 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -36,7 +36,7 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { + TDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { return new KDevSvnd(name); } } diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index d1eb8337..24959c37 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -2186,7 +2186,7 @@ void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEInstance instance( "tdeio_kdevsvn" ); kdDebug(9036) << "*** Starting tdeio_kdevsvn " << endl; |