1 files changed, 21 insertions, 21 deletions

diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h
index 9ba71d8f..047a7575 100644
--- a/ktouch/src/ktouchkeyboardwidget.h
+++ b/ktouch/src/ktouchkeyboardwidget.h
@@ -17,9 +17,9 @@
 #include <config.h>
 #endif
 
-#include <qwidget.h>
-#include <qvaluevector.h>
-#include <qmap.h>
+#include <tqwidget.h>
+#include <tqvaluevector.h>
+#include <tqmap.h>
 #include "ktouchkeys.h"
 
 #include "ktouchkey.h"  // new class
@@ -39,58 +39,58 @@ class KURL;
  *  and the newKey() slot is called the state changes (and thus the
  *  activated keys and finger key animations etc.)
  */
-class KTouchKeyboardWidget : public QWidget {
+class KTouchKeyboardWidget : public TQWidget {
     Q_OBJECT
   public:
     /// Constructor
-    KTouchKeyboardWidget(QWidget *parent);
+    KTouchKeyboardWidget(TQWidget *parent);
     /// Reads a keyboard layout from the given URL.
     /// The function returns 'true' when the reading was successful or 'false' if not. In this
     /// case the optional parameter errorMsg contains the error message.
-    bool loadKeyboard(QWidget * window, const KURL& url, QString* errorMsg=NULL);
+    bool loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg=NULL);
     /// Saves the keyboard layout to the URL.
-    void saveKeyboard(QWidget * window, const KURL& url);
+    void saveKeyboard(TQWidget * window, const KURL& url);
     /// Applies preferences to the keyboard layout and the keys.
     /// This means that the layout is basically recreated and if the layout type/language
     /// changed it will be reloaded.
-    void applyPreferences(QWidget * window, bool silent);
+    void applyPreferences(TQWidget * window, bool silent);
 
   public slots:
     /// This function displays the next key (or key combination) the user has to press.
-    void newKey(const QChar& nextChar);
+    void newKey(const TQChar& nextChar);
 
   protected:
     /// Draws the keyboard.
-    void paintEvent(QPaintEvent *);
+    void paintEvent(TQPaintEvent *);
     /// Resizes (recalculates m_shift and m_scale) and redraws the keyboard.
-    void resizeEvent(QResizeEvent *);
+    void resizeEvent(TQResizeEvent *);
 
   private:
     /// Does what the name says (create a default keyboard which is a number keypad).
     /// This function is needed in case there no keyboard file could be found.
     void createDefaultKeyboard();
     /// Does the actual reading.
-    bool readKeyboard(const QString& fileName, QString& errorMsg);
+    bool readKeyboard(const TQString& fileName, TQString& errorMsg);
     /// Assigns the background colours to the normal keys, which have a finger key assigned.
     void updateColours();
 
 	// *** new data storage classes ***
-    QValueVector<KTouchKey>          	m_keys;        		///< The geometrical key data.
-    QValueVector<KTouchKeyConnector>	m_keyConnections;	///< Contains the character - key associations.
-	QMap<unsigned int, int> 			m_keyMap;			///< Links target keys with finger keys: m_keyMap[target_key] = finger_key
-	QMap<unsigned int, unsigned int>	m_colorMap;			///< Links finger keys with color indices: m_colorMap[finger_key] = color_index in color scheme
+    TQValueVector<KTouchKey>          	m_keys;        		///< The geometrical key data.
+    TQValueVector<KTouchKeyConnector>	m_keyConnections;	///< Contains the character - key associations.
+	TQMap<unsigned int, int> 			m_keyMap;			///< Links target keys with finger keys: m_keyMap[target_key] = finger_key
+	TQMap<unsigned int, unsigned int>	m_colorMap;			///< Links finger keys with color indices: m_colorMap[finger_key] = color_index in color scheme
 
 	// *** old data storage classes ***
-    QPtrList<KTouchBaseKey>         	m_keyList;     		///< The pointer list with base class pointers to the keys.
-    QValueList<KTouchKeyConnection> 	m_connectorList;	///< Contains the character - key associations.
+    TQPtrList<KTouchBaseKey>         	m_keyList;     		///< The pointer list with base class pointers to the keys.
+    TQValueList<KTouchKeyConnection> 	m_connectorList;	///< Contains the character - key associations.
 
-	static QMap<QChar, int>	 			m_keyCharMap;		///< Links target keys with finger keys: m_keyCharMap[target_key_char] = color_index
+	static TQMap<TQChar, int>	 			m_keyCharMap;		///< Links target keys with finger keys: m_keyCharMap[target_key_char] = color_index
 
     int                 m_keyboardWidth;    ///< The width of the keyboard (maximum of the sums of all keywidths in each line).
     int                 m_keyboardHeight;   ///< The height of the keyboard (sum of all key row heights).
     double              m_shift;            ///< The horizontal shift for the keyboard.
-    QString             m_currentLayout;    ///< The name of the currently used layout.
-    QChar               m_nextKey;          ///< The next to be pressed character.
+    TQString             m_currentLayout;    ///< The name of the currently used layout.
+    TQChar               m_nextKey;          ///< The next to be pressed character.
 
 	bool				m_hideKeyboard;		///< If true, the keyboard won't be shown.
 };