Rename a number of classes to enhance compatibility with KDE4

7 files changed, 68 insertions, 68 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index 1729c84f..fb8c4bf9 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="KFontRequester" row="0" column="1">
+        <widget class="TDEFontRequester" row="0" column="1">
             <property name="name">
                 <cstring>kcfg_TableFont</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <cstring>kcfg_TableFont</cstring>
             </property>
         </widget>
-        <widget class="KFontRequester" row="1" column="1">
+        <widget class="TDEFontRequester" row="1" column="1">
             <property name="name">
                 <cstring>kcfg_IPAFont</cstring>
             </property>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 1230f507..e15f8aef 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 
 EntryDlg::EntryDlg(
-  KMainWindow   *main,
+  TDEMainWindow   *main,
   kvoctrainDoc  *doc,
   bool           multi_sel,
   bool           origin,
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
index d1fee66f..14f263bc 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
@@ -39,7 +39,7 @@
 
 class LangSet;
 class TQTabWidget;
-class KMainWindow;
+class TDEMainWindow;
 class kvoctrainDoc;
 
 class EntryDlg : public KDialogBase
@@ -54,7 +54,7 @@ public:
   enum EnableType {EnableAll, EnableOnlyCommon, EnableNone, EnableOnlyOriginal };
 
   EntryDlg
-  ( KMainWindow   *main,
+  ( TDEMainWindow   *main,
     kvoctrainDoc  *doc,
     bool           multi_sel,
     bool           origin,
@@ -214,7 +214,7 @@ protected:
   TQTabWidget       *tabber;
 
   vector<TQTableSelection> selections;
-  KMainWindow     *mainwin;
+  TDEMainWindow     *mainwin;
   TQSize            oldMainSize;
   TQPoint           oldMainPos;
   bool             docked;
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index 86cc7589..b2e90a86 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -41,7 +41,7 @@
 #include "prefs.h"
 
 kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
-: KMainWindow(parent, name)
+: TDEMainWindow(parent, name)
 {
   doc = 0;
   view = 0;
@@ -106,17 +106,17 @@ void kvoctrainApp::initActions()
   fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document"));
   fileOpen->setToolTip(fileOpen->whatsThis());
 
-  fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
+  fileOpenExample = new TDEAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
   fileOpen->setWhatsThis(i18n("Open a vocabulary document"));
   fileOpen->setToolTip(fileOpen->whatsThis());
 
-  fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
+  fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
   fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
   fileGHNS->setToolTip(fileGHNS->whatsThis());
 
   fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
 
-  fileMerge = new KAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
+  fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
   fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one"));
   fileMerge->setToolTip(fileOpen->whatsThis());
 
@@ -156,52 +156,52 @@ void kvoctrainApp::initActions()
   editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary"));
   editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis());
 
-  editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
+  editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
   editAppend->setWhatsThis(i18n("Append a new row to the vocabulary"));
   editAppend->setToolTip(editAppend->whatsThis());
 
-  editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
+  editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
   editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows"));
   editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis());
 
-  editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
+  editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
   editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows"));
   editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis());
 
-  editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
+  editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
   editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary"));
   editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());
 
-  vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
+  vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
   vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary"));
   vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis());
 
-  vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
+  vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
   vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries"));
   vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis());
 
-  vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
+  vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
   vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary"));
   vocabCleanUp->setToolTip(vocabCleanUp->whatsThis());
 
-  vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
+  vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
   connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage()));
   connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int)));
   connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
 
-  vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
+  vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
   connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage()));
 
-  vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
+  vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
   connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage()));
   connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int)));
   connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
 
-  vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
+  vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
   vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
   vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis());
 
-  vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
+  vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
   vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document"));
   vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis());
 
@@ -224,11 +224,11 @@ void kvoctrainApp::initActions()
   vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text "));
   vocabSearch->setToolTip(vocabSearch->whatsThis());
   /*
-  learningResumeQuery = new KAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
+  learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
   //learningResumeQuery->setWhatsThis(i18n(""));
   learningResumeQuery->setToolTip(learningResumeQuery->whatsThis());
 
-  learningResumeMultipleChoice = new KAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
+  learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
   //learningResumeMultipleChoice->setWhatsThis(i18n(""));
   learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis());
   */
@@ -236,13 +236,13 @@ void kvoctrainApp::initActions()
   configApp->setWhatsThis(i18n("Show the configuration dialog"));
   configApp->setToolTip(configApp->whatsThis());
 
-  /*configQueryOptions = new KAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
+  /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
   configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog"));
   configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/
 
   actionCollection()->setHighlightingEnabled(true);
   connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &)));
-  //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool)));
+  //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool)));
 
   if (!initialGeometrySet())
       resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
@@ -253,7 +253,7 @@ void kvoctrainApp::initActions()
   configToolbar->setWhatsThis(i18n("Toggle display of the toolbars"));
   configToolbar->setToolTip(configToolbar->whatsThis());
 
-  learn_menu = (TQPopupMenu*) child( "learning", "KPopupMenu" );
+  learn_menu = (TQPopupMenu*) child( "learning", "TDEPopupMenu" );
   connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
   connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
   connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index f17411c1..f6296b5e 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -73,7 +73,7 @@ class KVTNewStuff;
   * and statusbar. For the main view, an instance of class kvoctrainView is
   * created which creates your view.
   */
-class kvoctrainApp : public KMainWindow
+class kvoctrainApp : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -101,12 +101,12 @@ public:
 
   /** 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 TDEApplication.
-  * @see KMainWindow#saveProperties
+  * @see TDEMainWindow#saveProperties
   */
   virtual void saveProperties(TDEConfig* );
   /** reads the session config file and restores the application's state including the last opened files and documents by reading the
   * temporary files saved by saveProperties()
-  * @see KMainWindow#readProperties
+  * @see TDEMainWindow#readProperties
   */
   virtual void readProperties(TDEConfig* );
 
@@ -229,46 +229,46 @@ public:
   static vector<int> getCsvOrder(kvoctrainDoc *);
 
 private:
-  // KAction pointers to enable/disable actions
-  KAction* fileNew;
-  KAction* fileOpen;
-  KAction* fileOpenExample;
-  KAction* fileGHNS;
-  KRecentFilesAction* fileOpenRecent;
-  KAction* fileMerge;
-  KAction* fileSave;
-  KAction* fileSaveAs;
-  KAction* filePrint;
-  KAction* fileQuit;
-
-  KAction* editCopy;
-  KAction* editPaste;
-  KAction* editSelectAll;
-  KAction* editClearSelection;
-  KAction* editSearchFromClipboard;
-  KAction* editAppend;
-  KAction* editEditSelectedArea;
-  KAction* editRemoveSelectedArea;
-  KAction* editSaveSelectedArea;
-
-  KAction* vocabShowStatistics;
-  KAction* vocabAssignLessons;
-  KAction* vocabCleanUp;
-  KSelectAction* vocabAppendLanguage;
-  KSelectAction* vocabSetLanguage;
-  KSelectAction* vocabRemoveLanguage;
-  KAction* vocabDocumentProperties;
-  KAction* vocabLanguageProperties;
+  // TDEAction pointers to enable/disable actions
+  TDEAction* fileNew;
+  TDEAction* fileOpen;
+  TDEAction* fileOpenExample;
+  TDEAction* fileGHNS;
+  TDERecentFilesAction* fileOpenRecent;
+  TDEAction* fileMerge;
+  TDEAction* fileSave;
+  TDEAction* fileSaveAs;
+  TDEAction* filePrint;
+  TDEAction* fileQuit;
+
+  TDEAction* editCopy;
+  TDEAction* editPaste;
+  TDEAction* editSelectAll;
+  TDEAction* editClearSelection;
+  TDEAction* editSearchFromClipboard;
+  TDEAction* editAppend;
+  TDEAction* editEditSelectedArea;
+  TDEAction* editRemoveSelectedArea;
+  TDEAction* editSaveSelectedArea;
+
+  TDEAction* vocabShowStatistics;
+  TDEAction* vocabAssignLessons;
+  TDEAction* vocabCleanUp;
+  TDESelectAction* vocabAppendLanguage;
+  TDESelectAction* vocabSetLanguage;
+  TDESelectAction* vocabRemoveLanguage;
+  TDEAction* vocabDocumentProperties;
+  TDEAction* vocabLanguageProperties;
   KWidgetAction* vocabLessons;
   KWidgetAction* vocabSearch;
 
-  //KAction* learningResumeQuery;
-  //KAction* learningResumeMultipleChoice;
+  //TDEAction* learningResumeQuery;
+  //TDEAction* learningResumeMultipleChoice;
 
-  KAction* configToolbar;
-  KAction* configNotifications;
-  KAction* configApp;
-  //KAction* configQueryOptions;
+  TDEAction* configToolbar;
+  TDEAction* configNotifications;
+  TDEAction* configApp;
+  //TDEAction* configQueryOptions;
 
   TQString lastPixName;
 
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index bd692037..1e849ccd 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -99,7 +99,7 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
   kvoctrainApp *kva = 0;
   if (app.isRestored()) {
     int n = 1;
-    while (KMainWindow::canBeRestored(n)){
+    while (TDEMainWindow::canBeRestored(n)){
       kva = new kvoctrainApp;
       kva->restore(n);
       kva->show();
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index 02d40854..ea7e98ff 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -272,7 +272,7 @@ void StatistikPage::slotPopupMenu(int row, int col)
   else
     return;
 
-  KPopupMenu *header_m = new KPopupMenu(i18n("Number of Entries per Grade"));
+  TDEPopupMenu *header_m = new TDEPopupMenu(i18n("Number of Entries per Grade"));
 
   header_m->insertItem (i18n(KV_NORM_TEXT) + "\t" + TQString::number(sc->grade[KV_NORM_GRADE]) );
   header_m->insertItem (i18n(KV_LEV1_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV1_GRADE]) );