Rename a number of classes to enhance compatibility with KDE4

3 files changed, 35 insertions, 35 deletions

diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp
index c593a3f9..58af2410 100644
--- a/kverbos/kverbos/kverbos.cpp
+++ b/kverbos/kverbos/kverbos.cpp
@@ -48,7 +48,7 @@
 
 int KVerbosApp::kverbosCounter = 0;
 
-KVerbosApp::KVerbosApp(TQWidget* , const char* name):KMainWindow (0, name)
+KVerbosApp::KVerbosApp(TQWidget* , const char* name):TDEMainWindow (0, name)
 {
   // als erstes das Logo starten
   TDEStartupLogo* start_logo = new TDEStartupLogo(0);
@@ -116,11 +116,11 @@ KVerbosApp::~KVerbosApp()
 
 void KVerbosApp::initActions()
 {
-  fileNewWindow = new KAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window");
+  fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window");
   fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
   fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
   fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
-  fileOpenStandard = new KAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard");
+  fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard");
   fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
   fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
   fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
@@ -129,12 +129,12 @@ void KVerbosApp::initActions()
   editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
   editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
   editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
-  editErfassen = new KAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen");
-  editBearbeiten = new KAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten");
+  editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen");
+  editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten");
 
-  settingOptions = new KAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options");
-  userUsername = new KAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username");
-  userResults = new KAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results");
+  settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options");
+  userUsername = new TDEAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username");
+  userResults = new TDEAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results");
  
   fileNewWindow->setToolTip(i18n("Opens a new application window"));
   fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file"));
@@ -500,7 +500,7 @@ void KVerbosApp::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;
 	// In der Dokumentation konnte ich leider nicht finden, wozu diese memberliste gut ist.
 	if(memberList)
 	{
diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h
index 2325d482..c125ea0b 100644
--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@@ -45,16 +45,16 @@ class KFeederControl;
   * window and reads the config file as well as providing a menubar, toolbar
   * and statusbar. An instance of KVerbosView creates your center view, which is connected
   * to the window's Doc object.
-  * KVerbosApp reimplements the methods that KMainWindow provides for main window handling and supports
-  * full session management as well as using KActions.
-  * @see KMainWindow
+  * KVerbosApp 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
   */
-class KVerbosApp : public KMainWindow
+class KVerbosApp : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -86,7 +86,7 @@ class KVerbosApp : public KMainWindow
     /** read general Options again and initialize all variables like the recent file list
      */
     void readOptions();
-    /** initializes the KActions of the application */
+    /** initializes the TDEActions of the application */
     void initActions();
     /** sets up the statusbar for the main window by initialzing a statuslabel.
      */
@@ -221,26 +221,26 @@ class KVerbosApp : public KMainWindow
      */
     KVerbosDoc *doc;
 
-    // KAction pointers to enable/disable actions
-    KPopupMenu* menuUser;
-    KAction* fileNewWindow;
-    KAction* fileNew;
-    KAction* fileOpen;
-    KRecentFilesAction* fileOpenRecent;
-	KAction* fileOpenStandard;
-    KAction* fileSave;
-    KAction* fileSaveAs;
-    KAction* fileClose;
-    KAction* filePrint;
-    KAction* fileQuit;
-    KAction* editCut;
-    KAction* editCopy;
-    KAction* editPaste;
-    KAction* editErfassen;
-    KAction* editBearbeiten;
-    KAction* settingOptions;
-    KAction* userUsername;
-    KAction* userResults;
+    // TDEAction pointers to enable/disable actions
+    TDEPopupMenu* menuUser;
+    TDEAction* fileNewWindow;
+    TDEAction* fileNew;
+    TDEAction* fileOpen;
+    TDERecentFilesAction* fileOpenRecent;
+	TDEAction* fileOpenStandard;
+    TDEAction* fileSave;
+    TDEAction* fileSaveAs;
+    TDEAction* fileClose;
+    TDEAction* filePrint;
+    TDEAction* fileQuit;
+    TDEAction* editCut;
+    TDEAction* editCopy;
+    TDEAction* editPaste;
+    TDEAction* editErfassen;
+    TDEAction* editBearbeiten;
+    TDEAction* settingOptions;
+    TDEAction* userUsername;
+    TDEAction* userResults;
 
 
 
diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h
index f4087933..24bbab7b 100644
--- a/kverbos/kverbos/kverbosdoc.h
+++ b/kverbos/kverbos/kverbosdoc.h
@@ -41,7 +41,7 @@ class KVerbosUser;
  *
  *  The KVerbosDoc class provides a document object that can be used in conjunction with
  *  the classes KVerbosApp and KVerbosView to create a document-view model for standard KDE
- *  applications based on TDEApplication and KMainWindow. Thereby, the document object
+ *  applications based on TDEApplication and TDEMainWindow. Thereby, the document object
  *  is created by the KVerbosApp instance and contains the document structure with the
  *  according methods for manipulation of the document data by KVerbosView objects. Also,
  *  KVerbosDoc contains the methods for serialization of the document data from and to files.