Rename a number of classes to enhance compatibility with KDE4

7 files changed, 26 insertions, 26 deletions

diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 4e9ba2da..39a0b445 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -59,7 +59,7 @@
 KTouch * KTouchPtr = NULL;
 
 KTouch::KTouch()
-  : KMainWindow( 0, "KTouch" ),
+  : TDEMainWindow( 0, "KTouch" ),
     m_statusWidget(NULL),
     m_keyboardWidget(NULL),
 	m_trainer(NULL)
@@ -530,7 +530,7 @@ bool KTouch::queryExit() {
 void KTouch::resizeEvent(TQResizeEvent * event) {
 	changeStatusbarStats(m_trainer->m_levelStats.m_correctChars, m_trainer->m_levelStats.m_totalChars, m_trainer->m_levelStats.m_words,
 		m_trainer->m_sessionStats.m_correctChars, m_trainer->m_sessionStats.m_totalChars, m_trainer->m_sessionStats.m_words);
-	KMainWindow::resizeEvent(event);
+	TDEMainWindow::resizeEvent(event);
 }
 // ----------------------------------------------------------------------------
 
@@ -683,26 +683,26 @@ void KTouch::initTrainingSession() {
 // Creates the (standard) actions and entries in the menu.
 void KTouch::setupActions() {
 	// *** File menu ***
-    new KAction(i18n("&Open lecture..."), "open_lecture", 0,
+    new TDEAction(i18n("&Open lecture..."), "open_lecture", 0,
 		TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture");
-    new KAction(i18n("&Edit lecture..."), "edit_lecture", 0,
+    new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0,
 		TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture");
-    new KAction(i18n("&Edit color scheme..."), "edit_colors", 0,
+    new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0,
 		TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors");
-//    new KAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, 
+//    new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, 
 //		TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard");
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection());
 
 	// *** Training menu ***
-    new KAction(i18n("&Start New Session"), "launch", 0,
+    new TDEAction(i18n("&Start New Session"), "launch", 0,
         TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession");
-    m_trainingPause = new KAction(i18n("&Pause Session"), "player_pause", 0,
+    m_trainingPause = new TDEAction(i18n("&Pause Session"), "player_pause", 0,
         TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause");
-    new KAction(i18n("&Lecture Statistics"), "kalarm", 0,
+    new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0,
         TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats");
  
     // Setup menu entries for the training lectures
-    m_defaultLectureAction = new KSelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures");
+    m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures");
 	m_defaultLectureAction->setMenuAccelsEnabled(false);
     m_defaultLectureAction->setItems(m_lectureTitles);
     m_defaultLectureAction->setCurrentItem(0);  
@@ -711,13 +711,13 @@ void KTouch::setupActions() {
 	// *** Settings menu ***    
     KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
     // Setup menu entries for keyboard layouts    
-    m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts");
+    m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts");
 	m_keyboardLayoutAction->setMenuAccelsEnabled(false);
     m_keyboardLayoutAction->setItems(m_keyboardTitles);
     connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int)));
 
 	// Setup menu entries for colour schemes
-	m_keyboardColorAction = new KSelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes");
+	m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes");
     TQStringList schemes_list;
     for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i)
 		schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name);
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index 85697d59..dd7f859d 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -26,9 +26,9 @@
 #include <kurl.h>
 
 class TQLabel;
-class KToggleAction;
-class KActionMenu;
-class KSelectAction;
+class TDEToggleAction;
+class TDEActionMenu;
+class TDESelectAction;
 
 class KTouchStatus;
 class KTouchSlideLine;
@@ -48,7 +48,7 @@ class KTouchPrefColorsLayout;
 /// It handles the lecture, training data, status and all other widgets that are
 /// needed to get the program running. Since all special tasks are delegated to the
 /// appropriate widgets and classes, the remaining code in KTouch is basically the
-/// startup and KAction stuff.<p>
+/// startup and TDEAction stuff.<p>
 /// A word about dialogs. All dialogs in this program are not created by default. 
 /// Instead they are created "on first use". This
 /// saves memory (because we don't need them always) and the startup speed increases.<p>
@@ -56,7 +56,7 @@ class KTouchPrefColorsLayout;
 /// typed char. It delegates the character to the trainer
 /// (KTouchTrainer), which will then process it. So the heavy work lies in the trainer
 /// object and all the widgets.
-class KTouch : public KMainWindow {
+class KTouch : public TDEMainWindow {
     Q_OBJECT
   
   public:
@@ -148,11 +148,11 @@ class KTouch : public KMainWindow {
 	void updateKeyboardActionCheck();
 	
     // *** Public member variables ***
-    KAction                *m_trainingPause;        ///< Action for "pause training session".
+    TDEAction                *m_trainingPause;        ///< Action for "pause training session".
 
-    KSelectAction		   *m_keyboardLayoutAction;
-    KSelectAction		   *m_keyboardColorAction;
-    KSelectAction		   *m_defaultLectureAction;
+    TDESelectAction		   *m_keyboardLayoutAction;
+    TDESelectAction		   *m_keyboardColorAction;
+    TDESelectAction		   *m_defaultLectureAction;
 
     KTouchStatus           *m_statusWidget;         ///< Pointer to the status widget on top of the main widget.
     KTouchSlideLine        *m_slideLineWidget;      ///< Pointer to the sliding line widget.
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index ac51b005..9d3ce406 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -60,7 +60,7 @@ bool KTouchKeyboardEditor::startEditor(const KURL& url) {
 void KTouchKeyboardEditor::fontBtnClicked() {
 	//kdDebug() << "Fontbutton clicked" << endl;
     TQFont f;
-    if (KFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
+    if (TDEFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
 		m_keyboard.m_fontSuggestions = f.toString();
 		// update font and keyboard display
 		titleEdit->setFont(f);  
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index f8504c21..27c74ec4 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -81,7 +81,7 @@ bool KTouchLectureEditor::startEditor(const KURL& url) {
 
 void KTouchLectureEditor::fontBtnClicked() {
     TQFont f(m_lecture.m_fontSuggestions);
-    if (KFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
+    if (TDEFontDialog::getFont(f, false, this, true)==TQDialog::Accepted) {
         linesTextEdit->setFont(f);
         lectureCommentEdit->setFont(f);
         levelCommentEdit->setFont(f);
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 65882275..20ecbb94 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -115,7 +115,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <column>
                                 <property name="text">
                                     <string>Levels</string>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index f205c1ab..3a23de1b 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -278,7 +278,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="KFontRequester" row="2" column="0" rowspan="1" colspan="2">
+                        <widget class="TDEFontRequester" row="2" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>kcfg_Font</cstring>
                             </property>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 3105d19c..36bc7c23 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -102,7 +102,7 @@
                                 <string>Font for keys on keyboard:</string>
                             </property>
                         </widget>
-                        <widget class="KFontRequester">
+                        <widget class="TDEFontRequester">
                             <property name="name">
                                 <cstring>kcfg_KeyboardFont</cstring>
                             </property>