Rename KApplication to TDEApplication to avoid conflicts with KDE4

16 files changed, 33 insertions, 33 deletions

diff --git a/kdejava/koala/test/dcop/Test.java b/kdejava/koala/test/dcop/Test.java
index 1117bf87..17af906a 100644
--- a/kdejava/koala/test/dcop/Test.java
+++ b/kdejava/koala/test/dcop/Test.java
@@ -17,7 +17,7 @@ public class Test{
          "(C) 2002 Gert-Jan van der Heiden");
     KCmdLineArgs.init( argv, aboutData );
     
-    KApplication app = new KApplication();
+    TDEApplication app = new TDEApplication();
     app.dcopClient().registerAs("JavaTest", false);
     JavaDCOPObject object = new JavaDCOPObject();
     app.exec();    
diff --git a/kdejava/koala/test/kbase/KBase.java b/kdejava/koala/test/kbase/KBase.java
index ed584dcd..6401dd80 100644
--- a/kdejava/koala/test/kbase/KBase.java
+++ b/kdejava/koala/test/kbase/KBase.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.
@@ -55,7 +55,7 @@ public class KBase extends KMainWindow
 public KBase(TQWidget parent, String name)
 {
   super(parent, name, 0);
-  KApplication kapp = KApplication.kApplication();
+  TDEApplication kapp = TDEApplication.kApplication();
   config=kapp.config();
 
   ///////////////////////////////////////////////////////////////////
@@ -230,7 +230,7 @@ protected void readOptions()
 }
 
     /** 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)
@@ -245,7 +245,7 @@ protected void saveProperties(KConfig _cfg)
     KURL url=doc.URL();	
     _cfg.writeEntry("filename", url.url());
     _cfg.writeEntry("modified", doc.isModified());
-    String tempname = KApplication.kApplication().tempSaveName(url.url());
+    String tempname = TDEApplication.kApplication().tempSaveName(url.url());
     String tempurl= KURL.encode_string(tempname, 0);
     KURL _url = new KURL(tempurl);
     doc.saveDocument(_url);
@@ -265,7 +265,7 @@ protected void readProperties(KConfig _cfg)
   if(modified)
   {
     boolean canRecover = false;
-    String tempname = KApplication.kApplication().checkRecoverFile(filename, canRecover);
+    String tempname = TDEApplication.kApplication().checkRecoverFile(filename, canRecover);
     KURL _url = new KURL(tempname);
   	
     if(canRecover)
@@ -561,7 +561,7 @@ public static void main(String[] cmdLineArgs)
 	KCmdLineArgs.init( cmdLineArgs, aboutData );
 	KCmdLineArgs.addCmdLineOptions( options ); // Add our own options.
 
-  KApplication app = new KApplication();
+  TDEApplication app = new TDEApplication();
 
   if (app.isRestored())
   {
diff --git a/kdejava/koala/test/kbase/KBaseDoc.java b/kdejava/koala/test/kbase/KBaseDoc.java
index 3683c0b2..d253123b 100644
--- a/kdejava/koala/test/kbase/KBaseDoc.java
+++ b/kdejava/koala/test/kbase/KBaseDoc.java
@@ -6,7 +6,7 @@ import org.kde.koala.*;
 /**	KBaseDoc provides a document object for a document-view model.
   *
   * The KBaseDoc class provides a document object that can be used in conjunction with the classes JavaApiTestApp and KBaseView
-  * 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 KBaseView objects. Also, KBaseDoc contains the methods for serialization of the document data from and to files.
   *
diff --git a/kdejava/koala/test/kblend/KBlendTest.java b/kdejava/koala/test/kblend/KBlendTest.java
index 2c5dd7be..063745bf 100644
--- a/kdejava/koala/test/kblend/KBlendTest.java
+++ b/kdejava/koala/test/kblend/KBlendTest.java
@@ -13,7 +13,7 @@ import org.kde.koala.*;
  *  This is a translation to java from kblendtest.cpp in the tests library
  *  of tdeui source.
  *
- * @see KApplication
+ * @see TDEApplication
  * @see KImageEffect
  *
  * @author Cristian Tibirna <tibirna@kde.org>, java translation Kenneth J. Pouncey, kjpou@hotmail.com
@@ -24,7 +24,7 @@ public class KBlendTest {
 
    public static void main(String[] args) {
       KCmdLineArgs.init(args, "kblendtest", "KBlendTest", "It blends!", "0.1");
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
       KBlendWidget w = new KBlendWidget(null,"KBlendTest");
       w.setCaption(app.name());
       app.setMainWidget(w);
diff --git a/kdejava/koala/test/kcharselect/KCharSelectTest.java b/kdejava/koala/test/kcharselect/KCharSelectTest.java
index b07a1937..38bf5dad 100644
--- a/kdejava/koala/test/kcharselect/KCharSelectTest.java
+++ b/kdejava/koala/test/kcharselect/KCharSelectTest.java
@@ -12,7 +12,7 @@ public class KCharSelectTest {
 
       KCmdLineArgs.init(args, "kcharselecttest", "KCharSelectTest", 
                               "A KCharSelect test app", "0.1");
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
       KCharSelect selector = new KCharSelect(null,"char selector");
       selector.resize( selector.sizeHint() );
       app.setMainWidget(selector);
diff --git a/kdejava/koala/test/kcombobox/KComboBoxTest.java b/kdejava/koala/test/kcombobox/KComboBoxTest.java
index 0f914a2e..95fb6232 100644
--- a/kdejava/koala/test/kcombobox/KComboBoxTest.java
+++ b/kdejava/koala/test/kcombobox/KComboBoxTest.java
@@ -13,7 +13,7 @@ import java.util.*;
  *      - Editable ComboBox
  *      - Select Only ComboBox
    * @see KComboBox
-   * @see KApplication
+   * @see TDEApplication
    * @see KConfig
    *
    * @author original author unknown, java translation Kenneth J. Pouncey,
@@ -35,7 +35,7 @@ import java.util.*;
        KCmdLineArgs.init( cmdLineArgs, aboutData );
        KCmdLineArgs.addCmdLineOptions( options ); // Add our own options.
 
-       KApplication app = new KApplication();
+       TDEApplication app = new TDEApplication();
 
        // parse the args
        KCmdLineArgs args = KCmdLineArgs.parsedArgs();
diff --git a/kdejava/koala/test/kdatepicker/KDatePickTest.java b/kdejava/koala/test/kdatepicker/KDatePickTest.java
index 57ff7f5a..d5957297 100644
--- a/kdejava/koala/test/kdatepicker/KDatePickTest.java
+++ b/kdejava/koala/test/kdatepicker/KDatePickTest.java
@@ -9,7 +9,7 @@ public class KDatePickTest {
       KLocale.setMainCatalogue("tdelibs");
       KCmdLineArgs.init(args, "kdatepickertest", "KDatePickTest", 
                          "A KDatePicker test..", "0.1");
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
       KDatePicker picker = new KDatePicker();
       app.setMainWidget(picker);
       picker.show();
diff --git a/kdejava/koala/test/kfontdialog/KFontDialogTest.java b/kdejava/koala/test/kfontdialog/KFontDialogTest.java
index 3ef83d12..c94e7b93 100644
--- a/kdejava/koala/test/kfontdialog/KFontDialogTest.java
+++ b/kdejava/koala/test/kfontdialog/KFontDialogTest.java
@@ -34,7 +34,7 @@ import org.kde.koala.*;
  *  of tdeui source.
  *
  * @see KFontDialog
- * @see KApplication
+ * @see TDEApplication
  * @see KConfig
  *
  * @author Bernd Johannes Wuebben, java translation Kenneth J. Pouncey, kjpou@hotmail.com
@@ -55,7 +55,7 @@ public class KFontDialogTest {
       KCmdLineArgs.init( cmdLineArgs, aboutData );
       KCmdLineArgs.addCmdLineOptions( options ); // Add our own options.
 
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
 
       // parse the args
       KCmdLineArgs args = KCmdLineArgs.parsedArgs();
diff --git a/kdejava/koala/test/khelpers/KHelpers.java b/kdejava/koala/test/khelpers/KHelpers.java
index fbc3fb54..8274b6bd 100644
--- a/kdejava/koala/test/khelpers/KHelpers.java
+++ b/kdejava/koala/test/khelpers/KHelpers.java
@@ -11,7 +11,7 @@ import org.kde.koala.*;
  *
  *
  * @see KMainWindow
- * @see KApplication
+ * @see TDEApplication
  *
  * @author java translation Kenneth J. Pouncey, kjpou@hotmail.com
  * @version 0.1
@@ -26,7 +26,7 @@ public class KHelpers extends KMainWindow {
    protected int idfiletquit;
 
    // reference to the application
-   KApplication kapp;
+   TDEApplication kapp;
 
    // time to display the message in the status bar
    int HelpMessageTime = 200;
@@ -34,7 +34,7 @@ public class KHelpers extends KMainWindow {
    public KHelpers () {
 
       // get a reference to the application
-      kapp = KApplication.kApplication();
+      kapp = TDEApplication.kApplication();
 
       TQPopupMenu file = new TQPopupMenu(this);
 
diff --git a/kdejava/koala/test/khelpers/Main.java b/kdejava/koala/test/khelpers/Main.java
index 57f4fb7f..a43fb15b 100644
--- a/kdejava/koala/test/khelpers/Main.java
+++ b/kdejava/koala/test/khelpers/Main.java
@@ -10,7 +10,7 @@ import org.kde.koala.*;
  *
  *  ToolTips, What's This?, and More
  *
- * @see KApplication
+ * @see TDEApplication
  * @see KCmdLineArgs
  *
  * @author java translation Kenneth J. Pouncey, kjpou@hotmail.com
@@ -35,7 +35,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();
       KHelpers khelpers = new KHelpers();
 
       khelpers.show();
diff --git a/kdejava/koala/test/kioslave/KioslaveTest.java b/kdejava/koala/test/kioslave/KioslaveTest.java
index 9caec2aa..e627c25f 100644
--- a/kdejava/koala/test/kioslave/KioslaveTest.java
+++ b/kdejava/koala/test/kioslave/KioslaveTest.java
@@ -246,7 +246,7 @@ void slotQuit(){
   }
   if (slave != null )
     Scheduler.disconnectSlave(slave);
-  KApplication.kApplication().quit();
+  TDEApplication.kApplication().quit();
 }
 
 
@@ -526,7 +526,7 @@ static String[][] options =
 public static void main(String[] argv) {
   KCmdLineArgs.init( argv, "kioslavetest", "KIOSlaveTest", description, version );
   KCmdLineArgs.addCmdLineOptions( options );
-  KApplication app = new KApplication();
+  TDEApplication app = new TDEApplication();
 
   KCmdLineArgs args = KCmdLineArgs.parsedArgs();
 
diff --git a/kdejava/koala/test/kmenu/KdeMenuSample.java b/kdejava/koala/test/kmenu/KdeMenuSample.java
index 60d117bf..5e4fe860 100644
--- a/kdejava/koala/test/kmenu/KdeMenuSample.java
+++ b/kdejava/koala/test/kmenu/KdeMenuSample.java
@@ -15,7 +15,7 @@ import org.kde.koala.KCmdLineArgs;
 import org.kde.qt.TQPopupMenu;
 import org.kde.qt.TQTextView;
 import org.kde.koala.KMenuBar;
-import org.kde.koala.KApplication;
+import org.kde.koala.TDEApplication;
 import org.kde.koala.KURL;
 import org.kde.koala.KFileDialog;
 import org.kde.koala.KMessageBox;
@@ -38,10 +38,10 @@ public class KdeMenuSample extends KMainWindow {
       kdejava.initialize();
 	}
     
-    KApplication kApp = null;
+    TDEApplication kApp = null;
 
     /** Creates a new instance of KdeMenuSample */
-    public KdeMenuSample(KApplication kApp) {
+    public KdeMenuSample(TDEApplication kApp) {
         super(null,"Menu Sample",1);
         this.kApp = kApp;
         setCaption("TDE Tutorial");
@@ -130,7 +130,7 @@ public class KdeMenuSample extends KMainWindow {
     public static void main(String [] argv) {
 	KCmdLineArgs.init(argv, "menuapp", "MenuApp",
                          "A simple menu example", "0.1");
-        KApplication menuApp = new KApplication();
+        TDEApplication menuApp = new TDEApplication();
         KdeMenuSample mainWnd = new KdeMenuSample(menuApp);
         
         mainWnd.resize(100,300);
diff --git a/kdejava/koala/test/kprogress/KProgressTest.java b/kdejava/koala/test/kprogress/KProgressTest.java
index b42f348a..0afdd8c0 100644
--- a/kdejava/koala/test/kprogress/KProgressTest.java
+++ b/kdejava/koala/test/kprogress/KProgressTest.java
@@ -8,7 +8,7 @@ import org.kde.koala.*;
  *  of tdeui source.
  *
  * @see KProgress
- * @see KApplication
+ * @see TDEApplication
  *
  * @author orignal unknown, java translation Kenneth J. Pouncey, kjpou@hotmail.com
  * @version 0.1
@@ -29,7 +29,7 @@ public class KProgressTest {
       KCmdLineArgs.init( cmdLineArgs, aboutData );
       KCmdLineArgs.addCmdLineOptions( options ); // Add our own options.
 
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
 
       // parse the args
       KCmdLineArgs args = KCmdLineArgs.parsedArgs();
diff --git a/kdejava/koala/test/ksystemtray/Test.java b/kdejava/koala/test/ksystemtray/Test.java
index f5f8f90c..49f3d7ac 100644
--- a/kdejava/koala/test/ksystemtray/Test.java
+++ b/kdejava/koala/test/ksystemtray/Test.java
@@ -13,7 +13,7 @@ public class Test {
     KCmdLineArgs.init( argv, aboutData );
     KCmdLineArgs.addCmdLineOptions(options);
     System.out.println("1");
-    KApplication app = new KApplication();
+    TDEApplication app = new TDEApplication();
     System.out.println("2");
     KSystemTray systemTrayIcon = new KSystemTray(null, "test");
     System.out.println("3");
diff --git a/kdejava/koala/test/simplebrowser/KSimpleBrowser.java b/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
index 714ed72a..051dfeab 100644
--- a/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
+++ b/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
@@ -11,7 +11,7 @@ import org.kde.koala.*;
  *  A Simple Web Browser - A feature-limited Web Browser.
  *
  * @see KMainWindow
- * @see KApplication
+ * @see TDEApplication
  * @see KHTMLPart
  *
  * @author java translation Kenneth J. Pouncey, kjpou@hotmail.com
diff --git a/kdejava/koala/test/simplebrowser/Main.java b/kdejava/koala/test/simplebrowser/Main.java
index d5a64ab3..e7902629 100644
--- a/kdejava/koala/test/simplebrowser/Main.java
+++ b/kdejava/koala/test/simplebrowser/Main.java
@@ -11,7 +11,7 @@ import org.kde.koala.*;
  *  A Simple Web Browser
  *
  *
- * @see KApplication
+ * @see TDEApplication
  *
  * @author java translation Kenneth J. Pouncey, kjpou@hotmail.com
  * @version 0.1
@@ -23,7 +23,7 @@ public class Main {
 
       KCmdLineArgs.init(cmdLineArgs, "ksimplebrowser", "KSimpleBrowser",
                          "A KDE 3 Development Example - KSimpleBrowser", "0.1");
-      KApplication app = new KApplication();
+      TDEApplication app = new TDEApplication();
       KSimpleBrowser kbrowser = new KSimpleBrowser("KSimpleBrowser");
 
       kbrowser.show();