summaryrefslogtreecommitdiffstats
path: root/tdecore/kcmdlineargs.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/kcmdlineargs.h
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kcmdlineargs.h')
-rw-r--r--tdecore/kcmdlineargs.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index 142544aeb..09a6a6558 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -72,7 +72,7 @@ class TDEApplication;
class KUniqueApplication;
class KCmdLineParsedOptions;
class KCmdLineParsedArgs;
-class KAboutData;
+class TDEAboutData;
class TDECmdLineArgsPrivate;
/**
@@ -263,17 +263,17 @@ public:
* Initialize class.
*
* This function should be called as the very first thing in
- * your application. It uses KAboutData to replace some of the
+ * your application. It uses TDEAboutData to replace some of the
* arguments that would otherwise be required.
*
* @param _argc As passed to @p main(...).
* @param _argv As passed to @p main(...).
- * @param about A KAboutData object describing your program.
+ * @param about A TDEAboutData object describing your program.
* @param noKApp Set this true to not add commandline options for
* TQApplication / TDEApplication
*/
static void init(int _argc, char **_argv,
- const KAboutData *about, bool noKApp = false);
+ const TDEAboutData *about, bool noKApp = false);
/**
* Initialize Class
@@ -281,14 +281,14 @@ public:
* This function should be called as the very first thing in your
* application. This method will rarely be used, since it doesn't
* provide any argument parsing. It does provide access to the
- * KAboutData information.
+ * TDEAboutData information.
* This method is exactly the same as calling
- * init(0,0, const KAboutData *about, true).
+ * init(0,0, const TDEAboutData *about, true).
*
* @param about the about data.
- * \see KAboutData
+ * \see TDEAboutData
*/
- static void init(const KAboutData *about);
+ static void init(const TDEAboutData *about);
/**
* Add options to your application.
@@ -674,7 +674,7 @@ private:
bool isQt;
static TDECmdLineArgsList *argsList; // All options.
- static const KAboutData *about;
+ static const TDEAboutData *about;
static int argc; // The original argc
static char **argv; // The original argv