Rename a number of classes to enhance compatibility with KDE4

6 files changed, 30 insertions, 30 deletions

diff --git a/kdejava/koala/examples/kscribble/KPenBrushDlg.java b/kdejava/koala/examples/kscribble/KPenBrushDlg.java
index 61b8f969..a1fb0502 100644
--- a/kdejava/koala/examples/kscribble/KPenBrushDlg.java
+++ b/kdejava/koala/examples/kscribble/KPenBrushDlg.java
@@ -8,9 +8,9 @@ import org.kde.koala.*;
   * window and reads the config file as well as providing a menubar, toolbar
   * and statusbar. An instance of KBaseView creates your center view, which is connected
   * to the window's Doc object.
-  * KBase reimplements the methods that KMainWindow provides for main window handling and supports
-  * full session management as well as using KActions.
-  * @see KMainWindow
+  * KBase reimplements the methods that TDEMainWindow provides for main window handling and supports
+  * full session management as well as using TDEActions.
+  * @see TDEMainWindow
   * @see TDEApplication
   * @see TDEConfig
   *
diff --git a/kdejava/koala/examples/kscribble/KScribbleApp.java b/kdejava/koala/examples/kscribble/KScribbleApp.java
index b2009802..f0ea02ad 100644
--- a/kdejava/koala/examples/kscribble/KScribbleApp.java
+++ b/kdejava/koala/examples/kscribble/KScribbleApp.java
@@ -9,17 +9,17 @@ import org.kde.koala.*;
   * Child windows are created in createClient(), which gets a document instance as it's document to
   * display whereby one document can have several views.The MDI child is an instance of KScribbleView,
   * the document an instance of KScribbleDoc.
-  * 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
+  * KScribbleApp reimplements the methods that TDEMainWindow provides for main window handling and supports
+  * full session management as well as keyboard accelerator configuration by using TDEAccel.
+  * @see TDEMainWindow
   * @see TDEApplication
   * @see TDEConfig
-  * @see KAccel
+  * @see TDEAccel
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 1.1 code generation
   */
-public class KScribbleApp extends KMainWindow implements Resource {
+public class KScribbleApp extends TDEMainWindow implements Resource {
 
    /** the configuration object of the application */
    private TDEConfig config;
@@ -84,26 +84,26 @@ public class KScribbleApp extends KMainWindow implements Resource {
 	   this(null, null);
    }
 
-   /** initializes the KActions of the application */
+   /** initializes the TDEActions of the application */
    protected void initKeyAccel() {
 
-      KAccel keyAccel = new KAccel(this);
+      TDEAccel keyAccel = new TDEAccel(this);
 
       // fileMenu accelerators
-	  keyAccel.insert(KStdAccel.New, this, SLOT("slotFileNew()"));
-	  keyAccel.insert(KStdAccel.Open, this, SLOT("slotFileOpen()"));
-	  keyAccel.insert(KStdAccel.Save, this, SLOT("slotFileSave()"));
-	  keyAccel.insert(KStdAccel.Close, this, SLOT("slotFileClose()"));
-	  keyAccel.insert(KStdAccel.Print, this, SLOT("slotFilePrint()"));
-	  keyAccel.insert(KStdAccel.Quit, this, SLOT("slotFileQuit()"));
+	  keyAccel.insert(TDEStdAccel.New, this, SLOT("slotFileNew()"));
+	  keyAccel.insert(TDEStdAccel.Open, this, SLOT("slotFileOpen()"));
+	  keyAccel.insert(TDEStdAccel.Save, this, SLOT("slotFileSave()"));
+	  keyAccel.insert(TDEStdAccel.Close, this, SLOT("slotFileClose()"));
+	  keyAccel.insert(TDEStdAccel.Print, this, SLOT("slotFilePrint()"));
+	  keyAccel.insert(TDEStdAccel.Quit, this, SLOT("slotFileQuit()"));
 
       // editMenu accelerators
-	  keyAccel.insert(KStdAccel.Cut, this, SLOT("slotEditCut()"));
-	  keyAccel.insert(KStdAccel.Copy, this, SLOT("slotEditCopy()"));
-	  keyAccel.insert(KStdAccel.Paste, this, SLOT("slotEditPaste()"));
+	  keyAccel.insert(TDEStdAccel.Cut, this, SLOT("slotEditCut()"));
+	  keyAccel.insert(TDEStdAccel.Copy, this, SLOT("slotEditCopy()"));
+	  keyAccel.insert(TDEStdAccel.Paste, this, SLOT("slotEditPaste()"));
 
       // help accelerator
-	  keyAccel.insert(KStdAccel.Help, this, SLOT("appHelpActivated()"));
+	  keyAccel.insert(TDEStdAccel.Help, this, SLOT("appHelpActivated()"));
 
       keyAccel.readSettings();
 
@@ -611,8 +611,8 @@ public class KScribbleApp extends KMainWindow implements Resource {
       }
 
       // bar position settings
-      int toolBarPos = KToolBar.Top;
-      toolBarPos = config.readUnsignedNumEntry("ToolBarPos", KToolBar.Top);
+      int toolBarPos = TDEToolBar.Top;
+      toolBarPos = config.readUnsignedNumEntry("ToolBarPos", TDEToolBar.Top);
       toolBar().setBarPos(toolBarPos);
 
      // initialize the recent file list
@@ -819,13 +819,13 @@ public class KScribbleApp extends KMainWindow implements Resource {
       saveOptions();
       // close the first window, the list makes the next one the first again.
       // This ensures that queryClose() is called on each window to ask for closing
-      KMainWindow w;
+      TDEMainWindow w;
 
       ArrayList memberlist = memberList();
       if(memberlist != null) {
          Iterator it = memberlist.iterator();
          while (it.hasNext()) {
-            w = (KMainWindow)it.next();
+            w = (TDEMainWindow)it.next();
             // only close the window if the closeEvent is accepted. If the user
             // presses Cancel on the saveModified() dialog,
             // the window and the application stay open.
diff --git a/kdejava/koala/examples/kscribble/KScribbleDoc.java b/kdejava/koala/examples/kscribble/KScribbleDoc.java
index c9d0bf11..089a3adb 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 TDEApplication and KMainWindow. Thereby, the document object
+  * to create a document-view model for standard KDE applications based on TDEApplication and TDEMainWindow. 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/KScribbleView.java b/kdejava/koala/examples/kscribble/KScribbleView.java
index 05bc0d47..17b80ff7 100644
--- a/kdejava/koala/examples/kscribble/KScribbleView.java
+++ b/kdejava/koala/examples/kscribble/KScribbleView.java
@@ -2,7 +2,7 @@ import org.kde.qt.*;
 import org.kde.koala.*;
 
 /** The KScribbleView class provides the view widget for the KScribble instance.
- * The View instance inherits TQWidget as a base class and represents the view object of a KMainWindow. As KScribbleView is part of the
+ * The View instance inherits TQWidget as a base class and represents the view object of a TDEMainWindow. As KScribbleView is part of the
  * docuement-view model, it needs a reference to the document object connected with it by the KScribble class to manipulate and display
  * the document structure provided by the KScribbleDoc class.
  *
diff --git a/kdejava/koala/examples/kscribble/Main.java b/kdejava/koala/examples/kscribble/Main.java
index 01f8d2d5..b797f8a5 100644
--- a/kdejava/koala/examples/kscribble/Main.java
+++ b/kdejava/koala/examples/kscribble/Main.java
@@ -18,9 +18,9 @@ import org.kde.koala.*;
   * window and reads the config file as well as providing a menubar, toolbar
   * and statusbar. An instance of KBaseView creates your center view, which is connected
   * to the window's Doc object.
-  * KBase reimplements the methods that KMainWindow provides for main window handling and supports
-  * full session management as well as using KActions.
-  * @see KMainWindow
+  * KBase reimplements the methods that TDEMainWindow provides for main window handling and supports
+  * full session management as well as using TDEActions.
+  * @see TDEMainWindow
   * @see TDEApplication
   * @see TDEConfig
   *
diff --git a/kdejava/koala/examples/simplemail/SimpleMailFrm.java b/kdejava/koala/examples/simplemail/SimpleMailFrm.java
index f4c22a53..93b3d4e0 100644
--- a/kdejava/koala/examples/simplemail/SimpleMailFrm.java
+++ b/kdejava/koala/examples/simplemail/SimpleMailFrm.java
@@ -16,7 +16,7 @@ import java.util.LinkedList;
 
 
 
-class SimpleMailFrm extends KMainWindow {
+class SimpleMailFrm extends TDEMainWindow {
     
     
     TQGroupBox groupBox1;