Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 8 insertions, 8 deletions

diff --git a/kdejava/koala/examples/kscribble/KPenBrushDlg.java b/kdejava/koala/examples/kscribble/KPenBrushDlg.java
index 4da95f40..f774f2a7 100644
--- a/kdejava/koala/examples/kscribble/KPenBrushDlg.java
+++ b/kdejava/koala/examples/kscribble/KPenBrushDlg.java
@@ -11,7 +11,7 @@ import org.kde.koala.*;
   * KBase reimplements the methods that KMainWindow provides for main window handling and supports
   * full session management as well as using KActions.
   * @see KMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
diff --git a/kdejava/koala/examples/kscribble/KScribbleApp.java b/kdejava/koala/examples/kscribble/KScribbleApp.java
index d7ce2a68..b3bd5f9f 100644
--- a/kdejava/koala/examples/kscribble/KScribbleApp.java
+++ b/kdejava/koala/examples/kscribble/KScribbleApp.java
@@ -12,7 +12,7 @@ import org.kde.koala.*;
   * KScribbleApp reimplements the methods that KMainWindow provides for main window handling and supports
   * full session management as well as keyboard accelerator configuration by using KAccel.
   * @see KMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   * @see KAccel
   *
@@ -50,14 +50,14 @@ public class KScribbleApp extends KMainWindow implements Resource {
    private TQPrinter printer;
    private int untitledCount = 0;
    private ArrayList pDocList;
-   private KApplication kapp;
+   private TDEApplication kapp;
    private KIconLoader k = new KIconLoader();
 
     /** construtor of KScribbleApp, calls all init functions to create the application.
      */
    public KScribbleApp(TQWidget parent, String name)  {
       super(parent,name, 0);
-      kapp = KApplication.kApplication();
+      kapp = TDEApplication.kApplication();
       config=kapp.config();
 
       printer = new TQPrinter();
@@ -635,7 +635,7 @@ public class KScribbleApp extends KMainWindow implements Resource {
    }
 
     /** saves the window properties for each open window during session end to the session config file, including saving the currently
-     * opened file by a temporary filename provided by KApplication.
+     * opened file by a temporary filename provided by TDEApplication.
      * @see KTMainWindow#saveProperties
      */
    protected void saveProperties(KConfig _cfg) {
diff --git a/kdejava/koala/examples/kscribble/KScribbleDoc.java b/kdejava/koala/examples/kscribble/KScribbleDoc.java
index bbb5c10b..c9d0bf11 100644
--- a/kdejava/koala/examples/kscribble/KScribbleDoc.java
+++ b/kdejava/koala/examples/kscribble/KScribbleDoc.java
@@ -6,7 +6,7 @@ import org.kde.koala.*;
 /**	KScribbleDoc provides a document object for a document-view model.
   *
   * The KScribbleDoc class provides a document object that can be used in conjunction with the classes JavaApiTestApp and KScribbleView
-  * to create a document-view model for standard KDE applications based on KApplication and KMainWindow. Thereby, the document object
+  * to create a document-view model for standard KDE applications based on TDEApplication and KMainWindow. Thereby, the document object
   * is created by the JavaApiTestApp instance and contains the document structure with the according methods for manipulation of the document
   * data by KScribbleView objects. Also, KScribbleDoc contains the methods for serialization of the document data from and to files.
   *
diff --git a/kdejava/koala/examples/kscribble/Main.java b/kdejava/koala/examples/kscribble/Main.java
index 28d2fe96..0dc4c99f 100644
--- a/kdejava/koala/examples/kscribble/Main.java
+++ b/kdejava/koala/examples/kscribble/Main.java
@@ -21,7 +21,7 @@ import org.kde.koala.*;
   * KBase reimplements the methods that KMainWindow provides for main window handling and supports
   * full session management as well as using KActions.
   * @see KMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
@@ -46,7 +46,7 @@ static String VERSION = "0.1";
       KCmdLineArgs.init( cmdLineArgs, aboutData );
       KCmdLineArgs.addCmdLineOptions( options ); // Add our own options.
 
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
       KImageIO.registerFormats();
       KScribbleApp kscribbleapp = new KScribbleApp();