TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 8 deletions

diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index ba5f8e56..4703fd92 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -30,7 +30,7 @@ class KToggleAction;
 class KActionMenu;
 class KSelectAction;
 
-class KTouchStatus;
+class KTouchtqStatus;
 class KTouchSlideLine;
 class KTouchKeyboardWidget;
 class KTouchTrainer;
@@ -58,6 +58,7 @@ class KTouchPrefColorsLayout;
 /// object and all the widgets.
 class KTouch : public KMainWindow {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /// Constructor, creates the KTouch proggy.
     KTouch();
@@ -100,7 +101,7 @@ class KTouch : public KMainWindow {
     void trainingStatistics();          ///< The action Training->Show training statistics...
     void optionsPreferences();          ///< The action Settings->Configure KTouch...
 
-    /// Quick-changes the keyboard layout (called from menu).
+    /// Quick-changes the keyboard tqlayout (called from menu).
     void changeKeyboard(int num);
     /// Quick-changes the colour scheme used on the keyboard (called from menu).
     void changeColor(int num);
@@ -110,7 +111,7 @@ class KTouch : public KMainWindow {
   protected:
     /// Reimplementated to save preferences and
     bool queryExit();
-    /// Some layout fixes here...
+    /// Some tqlayout fixes here...
 	void resizeEvent(TQResizeEvent *);
     /// Accepts a typed char.
     void keyPressEvent(TQKeyEvent *keyEvent);
@@ -127,7 +128,7 @@ class KTouch : public KMainWindow {
 	
     /// Initialises the program during a normal startup
 	void init();
-	/// Creates the layout and GUI setup for a practice session
+	/// Creates the tqlayout and GUI setup for a practice session
 	void initTrainingSession();
     /// Creates the (standard) actions and entries in the menu.
     void setupActions();
@@ -153,7 +154,7 @@ class KTouch : public KMainWindow {
     KSelectAction		   *m_keyboardColorAction;
     KSelectAction		   *m_defaultLectureAction;
 
-    KTouchStatus           *m_statusWidget;         ///< Pointer to the status widget on top of the main widget.
+    KTouchtqStatus           *m_statusWidget;         ///< Pointer to the status widget on top of the main widget.
     KTouchSlideLine        *m_slideLineWidget;      ///< Pointer to the sliding line widget.
     KTouchKeyboardWidget   *m_keyboardWidget;       ///< Pointer to the keyboard widget.
     KTouchTrainer          *m_trainer;              ///< The training 'master' (runs the training).
@@ -170,12 +171,12 @@ class KTouch : public KMainWindow {
 	TQStringList     		m_examinationFiles;     ///< A list of all default examination files.
 	TQStringList     		m_examinationTitles;    ///< A list of the titles of all default examination files.
 	
-    TQStringList     		m_keyboardFiles;        ///< A list of all default keyboard layout files.
-    TQStringList     		m_keyboardTitles;       ///< A list of the titles of all default keyboard layout files.
+    TQStringList     		m_keyboardFiles;        ///< A list of all default keyboard tqlayout files.
+    TQStringList     		m_keyboardTitles;       ///< A list of the titles of all default keyboard tqlayout files.
 
 	KTouchStatisticsData	m_stats;				///< All user statistics are kept here.
 
-	QChar					m_lastDeadKey;			///< Temporary storage of last dead key.
+	TQChar					m_lastDeadKey;			///< Temporary storage of last dead key.
 };
 
 /// A global pointer to the main widget (actually only used to retrieve some data).