diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:24:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:24:14 -0600 |
| commit | 33294802d33c754914aa4c16de5efe26408e05ef (patch) | |
| tree | 800d86dd5d8dc31f54f192ed2a7c1c055af6579a | |
| parent | 4985b33f0d5b53ea16529b4a4c71793a25b25f47 (diff) | |
| download | piklab-33294802d33c754914aa4c16de5efe26408e05ef.tar.gz piklab-33294802d33c754914aa4c16de5efe26408e05ef.zip | |
Rename qt_argc and qt_argv methods to avoid conflicts with KDE4 symbols
| -rw-r--r-- | src/common/nokde/nokde_kcmdlineargs.cpp | 30 | ||||
| -rw-r--r-- | src/common/nokde/nokde_kcmdlineargs.h | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp index 3e87263..72c67b0 100644 --- a/src/common/nokde/nokde_kcmdlineargs.cpp +++ b/src/common/nokde/nokde_kcmdlineargs.cpp @@ -690,14 +690,14 @@ KCmdLineArgs::parseAllArgs() * Return argc */ int * -KCmdLineArgs::qt_argc() +KCmdLineArgs::tqt_argc() { // if (!argsList) // KApplication::addCmdLineOptions(); // Lazy bastards! - static int qt_argc = -1; - if( qt_argc != -1 ) - return &qt_argc; + static int tqt_argc = -1; + if( tqt_argc != -1 ) + return &tqt_argc; KCmdLineArgs *args = parsedArgs("qt"); assert(args); // No qt options have been added! @@ -711,8 +711,8 @@ KCmdLineArgs::qt_argc() } assert(argc >= (args->count()+1)); - qt_argc = args->count() +1; - return &qt_argc; + tqt_argc = args->count() +1; + return &tqt_argc; } /** @@ -721,14 +721,14 @@ KCmdLineArgs::qt_argc() * Return argv */ char *** -KCmdLineArgs::qt_argv() +KCmdLineArgs::tqt_argv() { // if (!argsList) // KApplication::addCmdLineOptions(); // Lazy bastards! - static char** qt_argv; - if( qt_argv != NULL ) - return &qt_argv; + static char** tqt_argv; + if( tqt_argv != NULL ) + return &tqt_argv; KCmdLineArgs *args = parsedArgs("qt"); assert(args); // No qt options have been added! @@ -741,16 +741,16 @@ KCmdLineArgs::qt_argv() exit(255); } - qt_argv = new char*[ args->count() + 2 ]; - qt_argv[ 0 ] = tqstrdup( appName()); + tqt_argv = new char*[ args->count() + 2 ]; + tqt_argv[ 0 ] = tqstrdup( appName()); int i = 0; for(; i < args->count(); i++) { - qt_argv[i+1] = tqstrdup((char *) args->arg(i)); + tqt_argv[i+1] = tqstrdup((char *) args->arg(i)); } - qt_argv[i+1] = 0; + tqt_argv[i+1] = 0; - return &qt_argv; + return &tqt_argv; } void diff --git a/src/common/nokde/nokde_kcmdlineargs.h b/src/common/nokde/nokde_kcmdlineargs.h index 28d7d40..3acc565 100644 --- a/src/common/nokde/nokde_kcmdlineargs.h +++ b/src/common/nokde/nokde_kcmdlineargs.h @@ -597,7 +597,7 @@ private: * * Return argc */ - static int *qt_argc(); + static int *tqt_argc(); /** * @internal for KApplication only: @@ -605,7 +605,7 @@ private: * Return argv */ - static char ***qt_argv(); + static char ***tqt_argv(); /** * @internal |