Rename a number of classes to enhance compatibility with KDE4

1 files changed, 12 insertions, 12 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);