Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 18 insertions, 18 deletions

diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp
index 3b80abe..cd470b4 100644
--- a/src/common/global/about.cpp
+++ b/src/common/global/about.cpp
@@ -54,7 +54,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd
   Q_ASSERT( !gui );
 #else
   printf("%s: version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION);
-  if ( !gui ) KApplication::disableAutoDcopRegistration();
+  if ( !gui ) TDEApplication::disableAutoDcopRegistration();
 #endif
   TDECmdLineArgs::init(argc, argv, about);
   TDECmdLineArgs::addCmdLineOptions(options);
@@ -65,7 +65,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd
   (void)new TQCoreApplication(argc, argv);
 #  endif
 #else
-  (void)new KApplication(gui, gui);
+  (void)new TDEApplication(gui, gui);
 #endif
 }
 
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp
index daaedd6..f80ecf5 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_kcmdlineargs.cpp
@@ -205,7 +205,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const KAboutData *_about, bool /*n
    win32_slashify(mCwd, PATH_MAX);
 #endif
 //   if (!noKApp)
-//      KApplication::addCmdLineOptions();
+//      TDEApplication::addCmdLineOptions();
 }
 
 TQString TDECmdLineArgs::cwd()
@@ -685,7 +685,7 @@ TDECmdLineArgs::parseAllArgs()
 }
 
 /**
- * For KApplication only:
+ * For TDEApplication only:
  *
  * Return argc
  */
@@ -693,7 +693,7 @@ int *
 TDECmdLineArgs::tqt_argc()
 {
 //   if (!argsList)
-//      KApplication::addCmdLineOptions(); // Lazy bastards!
+//      TDEApplication::addCmdLineOptions(); // Lazy bastards!
 
    static int tqt_argc = -1;
    if( tqt_argc != -1 )
@@ -716,7 +716,7 @@ TDECmdLineArgs::tqt_argc()
 }
 
 /**
- * For KApplication only:
+ * For TDEApplication only:
  *
  * Return argv
  */
@@ -724,7 +724,7 @@ char ***
 TDECmdLineArgs::tqt_argv()
 {
 //   if (!argsList)
-//      KApplication::addCmdLineOptions(); // Lazy bastards!
+//      TDEApplication::addCmdLineOptions(); // Lazy bastards!
 
    static char** tqt_argv;
    if( tqt_argv != NULL )
diff --git a/src/common/nokde/nokde_kcmdlineargs.h b/src/common/nokde/nokde_kcmdlineargs.h
index 9dbd01f..7f3c958 100644
--- a/src/common/nokde/nokde_kcmdlineargs.h
+++ b/src/common/nokde/nokde_kcmdlineargs.h
@@ -79,7 +79,7 @@ struct TDECORE_EXPORT KCmdLineOptions
 #define KCmdLineLastOption { 0, 0, 0 }
 
 class TDECmdLineArgsList;
-class KApplication;
+class TDEApplication;
 class KUniqueApplication;
 class KCmdLineParsedOptions;
 class KCmdLineParsedArgs;
@@ -118,7 +118,7 @@ class TDECmdLineArgsPrivate;
  *     ....
  *
  *     // Handle our own options/arguments
- *     // A KApplication will usually do this in main but this is not
+ *     // A TDEApplication will usually do this in main but this is not
  *     // necessary.
  *     // A KUniqueApplication might want to handle it in newInstance().
  *
@@ -232,7 +232,7 @@ class TDECmdLineArgsPrivate;
  */
 class TDECORE_EXPORT TDECmdLineArgs
 {
-  friend class KApplication;
+  friend class TDEApplication;
   friend class KUniqueApplication;
   friend class TQPtrList<TDECmdLineArgs>;
 public:
@@ -253,7 +253,7 @@ public:
    * @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
-   *        TQApplication / KApplication
+   *        TQApplication / TDEApplication
    *
    * @since 3.2
    */
@@ -281,7 +281,7 @@ public:
    * @param _argv As passed to @p main(...).
    * @param about A KAboutData object describing your program.
    * @param noKApp Set this true to not add commandline options for
-   *        TQApplication / KApplication
+   *        TQApplication / TDEApplication
    */
   static void init(int _argc, char **_argv,
                    const KAboutData *about, bool noKApp = false);
@@ -533,8 +533,8 @@ public:
 
   /**
    *  Reset all option definitions, i.e. cancel all addCmdLineOptions calls.
-   *  Note that KApplication's options are removed too, you might want to
-   *  call KApplication::addCmdLineOptions if you want them back.
+   *  Note that TDEApplication's options are removed too, you might want to
+   *  call TDEApplication::addCmdLineOptions if you want them back.
    *
    *  You usually don't want to call this method.
    */
@@ -593,14 +593,14 @@ private:
   static void parseAllArgs();
 
   /**
-   * @internal for KApplication only:
+   * @internal for TDEApplication only:
    *
    * Return argc
    */
   static int *tqt_argc();
 
   /**
-   * @internal for KApplication only:
+   * @internal for TDEApplication only:
    *
    * Return argv
    */
@@ -659,7 +659,7 @@ private:
   void load( TQDataStream &);
 
   /**
-   * @internal for KApplication only
+   * @internal for TDEApplication only
    *
    * Initialize class.
    *
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index df055a7..c724d1a 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -674,7 +674,7 @@ void MainWindow::updateGUI()
     if ( Main::project() ) caption += " - ";
     caption += Main::currentEditor()->url().filepath();
   }
-  setCaption(KApplication::kApplication()->makeStdCaption(caption));
+  setCaption(TDEApplication::kApplication()->makeStdCaption(caption));
 
   emit stateChanged();
 }