Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 14 insertions, 14 deletions

diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp
index a4a8827..5542178 100644
--- a/src/common/global/generic_config.cpp
+++ b/src/common/global/generic_config.cpp
@@ -25,9 +25,9 @@ class GenericConfigPrivate
 {
 public:
   GenericConfigPrivate(const TQString &group) : _group(group) {}
-  ~GenericConfigPrivate() { kapp->config()->sync(); }
+  ~GenericConfigPrivate() { tdeApp->config()->sync(); }
   TDEConfig &config() {
-    TDEConfig *conf = kapp->config();
+    TDEConfig *conf = tdeApp->config();
     conf->setGroup(_group);
     return *conf;
  }
@@ -216,7 +216,7 @@ void GenericConfig::deleteGroup(const TQString &group)
   Q_UNUSED(group);
   // #### cannot do that...
 #else
-  kapp->config()->deleteGroup(group);
+  tdeApp->config()->deleteGroup(group);
 #endif
 }
 
diff --git a/src/common/nokde/nokde_tdecmdlineargs.cpp b/src/common/nokde/nokde_tdecmdlineargs.cpp
index 25b8a9d..dc8d3f0 100644
--- a/src/common/nokde/nokde_tdecmdlineargs.cpp
+++ b/src/common/nokde/nokde_tdecmdlineargs.cpp
@@ -142,20 +142,20 @@ bool TDECmdLineArgs::ignoreUnknown = false;
 
 void
 TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname, const char* programName,
-                   const char *_description, const char *_version, bool noKApp)
+                   const char *_description, const char *_version, bool noTDEApp)
 {
    init(_argc, _argv,
         new TDEAboutData(_appname, programName, _version, _description),
-        noKApp);
+        noTDEApp);
 }
 
 void
 TDECmdLineArgs::init(int _argc, char **_argv, const char *_appname,
-                   const char *_description, const char *_version, bool noKApp)
+                   const char *_description, const char *_version, bool noTDEApp)
 {
    init(_argc, _argv,
         new TDEAboutData(_appname, _appname, _version, _description),
-        noKApp);
+        noTDEApp);
 }
 
 void
@@ -176,7 +176,7 @@ TDECmdLineArgs::init(const TDEAboutData* ab)
 
 
 void
-TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool /*noKApp*/)
+TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool /*noTDEApp*/)
 {
    argc = _argc;
    argv = _argv;
@@ -204,7 +204,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool /
 #ifdef TQ_WS_WIN
    win32_slashify(mCwd, PATH_MAX);
 #endif
-//   if (!noKApp)
+//   if (!noTDEApp)
 //      TDEApplication::addCmdLineOptions();
 }
 
diff --git a/src/common/nokde/nokde_tdecmdlineargs.h b/src/common/nokde/nokde_tdecmdlineargs.h
index 57112d8..846cfa9 100644
--- a/src/common/nokde/nokde_tdecmdlineargs.h
+++ b/src/common/nokde/nokde_tdecmdlineargs.h
@@ -252,14 +252,14 @@ public:
    *        translation. Example: I18N_NOOP("KEdit")
    * @param _description A short description of what your application is about.
    * @param _version A version.
-   * @param noKApp Set this true to not add commandline options for
+   * @param noTDEApp Set this true to not add commandline options for
    *        TQApplication / TDEApplication
    *
    * @since 3.2
    */
    static void init(int _argc, char **_argv, const char *_appname,
                     const char* programName, const char *_description,
-                    const char *_version, bool noKApp = false);
+                    const char *_version, bool noTDEApp = false);
    /**
     * @deprecated
     * You should convert any calls to this method to use the one
@@ -268,7 +268,7 @@ public:
     */
   static void init(int _argc, char **_argv,
                    const char *_appname, const char *_description,
-                   const char *_version, bool noKApp = false) TDE_DEPRECATED;
+                   const char *_version, bool noTDEApp = false) TDE_DEPRECATED;
 
   /**
    * Initialize class.
@@ -280,11 +280,11 @@ public:
    * @param _argc As passed to @p main(...).
    * @param _argv As passed to @p main(...).
    * @param about A TDEAboutData object describing your program.
-   * @param noKApp Set this true to not add commandline options for
+   * @param noTDEApp Set this true to not add commandline options for
    *        TQApplication / TDEApplication
    */
   static void init(int _argc, char **_argv,
-                   const TDEAboutData *about, bool noKApp = false);
+                   const TDEAboutData *about, bool noTDEApp = false);
 
   /**
    * Initialize Class