Rename a number of classes to enhance compatibility with KDE4

7 files changed, 45 insertions, 45 deletions

diff --git a/kdejava/koala/test/kbase/KBase.java b/kdejava/koala/test/kbase/KBase.java
index 0e0117de..1be572bd 100644
--- a/kdejava/koala/test/kbase/KBase.java
+++ b/kdejava/koala/test/kbase/KBase.java
@@ -8,16 +8,16 @@ 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
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 1.2 code generation
   */
-public class KBase extends KMainWindow
+public class KBase extends TDEMainWindow
 {
     public static final int ID_STATUS_MSG = 1;
 
@@ -34,21 +34,21 @@ public class KBase extends KMainWindow
      */
     private KBaseDoc doc;
 
-    // KAction references to enable/disable actions
-    private KAction fileNewWindow;
-    private KAction fileNew;
-    private KAction fileOpen;
-    private KRecentFilesAction fileOpenRecent;
-    private KAction fileSave;
-    private KAction fileSaveAs;
-    private KAction fileClose;
-    private KAction filePrint;
-    private KAction fileQuit;
-    private KAction editCut;
-    private KAction editCopy;
-    private KAction editPaste;
-    private KToggleAction viewToolBar;
-    private KToggleAction viewStatusBar;
+    // TDEAction references to enable/disable actions
+    private TDEAction fileNewWindow;
+    private TDEAction fileNew;
+    private TDEAction fileOpen;
+    private TDERecentFilesAction fileOpenRecent;
+    private TDEAction fileSave;
+    private TDEAction fileSaveAs;
+    private TDEAction fileClose;
+    private TDEAction filePrint;
+    private TDEAction fileQuit;
+    private TDEAction editCut;
+    private TDEAction editCopy;
+    private TDEAction editPaste;
+    private TDEToggleAction viewToolBar;
+    private TDEToggleAction viewStatusBar;
 
     /** construtor of KBase, calls all init functions to create the application.
      */
@@ -81,13 +81,13 @@ public KBase()
 	this(null, null);
 }
 
-    /** initializes the KActions of the application */
+    /** initializes the TDEActions of the application */
 protected void initActions()
 {
-  fileNewWindow = new KAction(tr("New &Window"), "", new KShortcut(), this, SLOT("slotFileNewWindow()"), actionCollection(),"file_new_window");
+  fileNewWindow = new TDEAction(tr("New &Window"), "", new TDEShortcut(), this, SLOT("slotFileNewWindow()"), actionCollection(),"file_new_window");
   fileNew = KStdAction.openNew(this, SLOT("slotFileNew()"), actionCollection());
   fileOpen = KStdAction.open(this, SLOT("slotFileOpen()"), actionCollection());
-  fileOpenRecent = (KRecentFilesAction) KStdAction.openRecent(this, SLOT("slotFileOpenRecent(KURL)"), actionCollection());
+  fileOpenRecent = (TDERecentFilesAction) KStdAction.openRecent(this, SLOT("slotFileOpenRecent(KURL)"), actionCollection());
   fileSave = KStdAction.save(this, SLOT("slotFileSave()"), actionCollection());
   fileSaveAs = KStdAction.saveAs(this, SLOT("slotFileSaveAs()"), actionCollection());
   // this one crashes for me...
@@ -216,7 +216,7 @@ protected void readOptions()
 
   // bar position settings
 //  int toolBarPos;
-  //Pos=(int) config.readNumEntry("ToolBarPos", KToolBar.Top);
+  //Pos=(int) config.readNumEntry("ToolBarPos", TDEToolBar.Top);
 //  toolBar("mainToolBar").setBarPos(toolBarPos);
 	
   // initialize the recent file list
@@ -446,11 +446,11 @@ public void slotFileQuit()
   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;
   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.
     if(!w.close())
diff --git a/kdejava/koala/test/kbase/KBaseDoc.java b/kdejava/koala/test/kbase/KBaseDoc.java
index d253123b..8c42c40d 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 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 KBaseView objects. Also, KBaseDoc contains the methods for serialization of the document data from and to files.
   *
diff --git a/kdejava/koala/test/kfontdialog/KFontDialogTest.java b/kdejava/koala/test/kfontdialog/TDEFontDialogTest.java
index 4fc6fa1b..c758b9e9 100644
--- a/kdejava/koala/test/kfontdialog/KFontDialogTest.java
+++ b/kdejava/koala/test/kfontdialog/TDEFontDialogTest.java
@@ -28,27 +28,27 @@ import org.kde.koala.*;
 */
 
 /**
- *  Class to test KFontDialog widgets.
+ *  Class to test TDEFontDialog widgets.
  *
  *  This is a translation to java from kfontdialogtest.cpp in the tests library
  *  of tdeui source.
  *
- * @see KFontDialog
+ * @see TDEFontDialog
  * @see TDEApplication
  * @see TDEConfig
  *
  * @author Bernd Johannes Wuebben, java translation Kenneth J. Pouncey, kjpou@hotmail.com
  * @version 0.1
  */
-public class KFontDialogTest {
+public class TDEFontDialogTest {
 
-   static String description = "Java KFontDialog test program.";
+   static String description = "Java TDEFontDialog test program.";
    static String[][] options = {   };
    static String VERSION = "0.1";
 
    public static void main(String[] cmdLineArgs) {
 
-      TDEAboutData aboutData = new TDEAboutData( "kfontdialogtest", "KFontDialogTest",
+      TDEAboutData aboutData = new TDEAboutData( "kfontdialogtest", "TDEFontDialogTest",
          VERSION, description, TDEAboutData.License_GPL,
          "(c) 2002, Kenneth J. Pouncey");
       aboutData.addAuthor("Kenneth J. Pouncey",null, "kjpou@hotmail.com");
@@ -61,7 +61,7 @@ public class KFontDialogTest {
       TDECmdLineArgs args = TDECmdLineArgs.parsedArgs();
 
       TDEConfig aConfig = new TDEConfig();
-      aConfig.setGroup( "KFontDialog-test" );
+      aConfig.setGroup( "TDEFontDialog-test" );
 
       // parameters are Font name, Font Point Size, Font Style, Font Italic
       app.setFont(new TQFont("Helvetica",12,TQFont.Normal,false));
@@ -69,14 +69,14 @@ public class KFontDialogTest {
 
       TQFont font = aConfig.readFontEntry( "Chosen" );
 
-      int nRet = KFontDialog.getFont(font);
+      int nRet = TDEFontDialog.getFont(font);
 
-      // return values from KFontDialog
+      // return values from TDEFontDialog
       //    nRet = 1 for OK Button
       //    nRet = 0 for Cancel button
 
       if (nRet == 1) { // print out font values
-         System.out.println("Ok Button pressed from KFontDialog ");
+         System.out.println("Ok Button pressed from TDEFontDialog ");
          System.out.println("   Font name selected: " + font.family());
          System.out.println("   Font Point Size selected: " + font.pointSize());
          System.out.println("   Font Bold?: " + font.bold());
@@ -88,10 +88,10 @@ public class KFontDialogTest {
 
       int[] flags = { 0 };
 
-      //Static method for KFontDialog needs to be generated
-      nRet = KFontDialog.getFontDiff(font, flags);
+      //Static method for TDEFontDialog needs to be generated
+      nRet = TDEFontDialog.getFontDiff(font, flags);
       if (nRet == 1) {
-         System.out.println("Ok Button pressed from KFontDialog diff dialog ");
+         System.out.println("Ok Button pressed from TDEFontDialog diff dialog ");
          System.out.println("   Font diff flags: " + flags[0]);
          System.out.println("   Font name selected: " + font.family());
          System.out.println("   Font Point Size selected: " + font.pointSize());
diff --git a/kdejava/koala/test/khelpers/KHelpers.java b/kdejava/koala/test/khelpers/KHelpers.java
index 8274b6bd..04235f14 100644
--- a/kdejava/koala/test/khelpers/KHelpers.java
+++ b/kdejava/koala/test/khelpers/KHelpers.java
@@ -10,14 +10,14 @@ import org.kde.koala.*;
  *
  *
  *
- * @see KMainWindow
+ * @see TDEMainWindow
  * @see TDEApplication
  *
  * @author java translation Kenneth J. Pouncey, kjpou@hotmail.com
  * @version 0.1
  */
 
-public class KHelpers extends KMainWindow {
+public class KHelpers extends TDEMainWindow {
 
    // File menu item id's
    protected int idfilenew;
diff --git a/kdejava/koala/test/kmenu/KdeMenuSample.java b/kdejava/koala/test/kmenu/KdeMenuSample.java
index 533da226..3ffbb4d0 100644
--- a/kdejava/koala/test/kmenu/KdeMenuSample.java
+++ b/kdejava/koala/test/kmenu/KdeMenuSample.java
@@ -10,7 +10,7 @@
 import org.kde.koala.kdejava;
 import org.kde.qt.qtjava;
 
-import org.kde.koala.KMainWindow;
+import org.kde.koala.TDEMainWindow;
 import org.kde.koala.TDECmdLineArgs;
 import org.kde.qt.TQPopupMenu;
 import org.kde.qt.TQTextView;
@@ -31,7 +31,7 @@ import org.kde.koala.KPushButton;
  * The kde.org KDE Tutorial from Antonio Larrosa Jimenez 
  * http://person.wanadoo.es/antlarr/tutorial
  */
-public class KdeMenuSample extends KMainWindow {
+public class KdeMenuSample extends TDEMainWindow {
     
    static {
       qtjava.initialize();
diff --git a/kdejava/koala/test/simplebrowser/KSimpleBrowser.java b/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
index c5797e45..b859f60d 100644
--- a/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
+++ b/kdejava/koala/test/simplebrowser/KSimpleBrowser.java
@@ -10,7 +10,7 @@ import org.kde.koala.*;
  *
  *  A Simple Web Browser - A feature-limited Web Browser.
  *
- * @see KMainWindow
+ * @see TDEMainWindow
  * @see TDEApplication
  * @see TDEHTMLPart
  *
@@ -18,7 +18,7 @@ import org.kde.koala.*;
  * @version 0.1
  */
 
-public class KSimpleBrowser extends KMainWindow {
+public class KSimpleBrowser extends TDEMainWindow {
 
 
    static final int URLLined = 1;
diff --git a/kdejava/koala/test/tdeioslave/KioslaveTest.java b/kdejava/koala/test/tdeioslave/KioslaveTest.java
index d8f9f683..e4e88c8c 100644
--- a/kdejava/koala/test/tdeioslave/KioslaveTest.java
+++ b/kdejava/koala/test/tdeioslave/KioslaveTest.java
@@ -13,7 +13,7 @@ import org.kde.qt.*;
 import org.kde.koala.*;
 import java.io.ByteArrayOutputStream;
 
-class KioslaveTest  extends KMainWindow {
+class KioslaveTest  extends TDEMainWindow {
 
   static final int List = 0;
   static final int ListRecursive = 1;