Rename obsolete tq methods to standard names

20 files changed, 100 insertions, 100 deletions

diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 85900c15..6c9a78c8 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -179,10 +179,10 @@ void KTouch::keyPressEvent(TQKeyEvent *keyEvent) {
 	if (keyEvent->text().length() > 1) {
 		kdDebug() << "[KTouch::keyPressEvent]  text = '" << TQString(keyEvent->text()).ascii() << "'" << endl;
 	}
-    TQChar key = keyEvent->text().at(0); // get first tqunicode character
+    TQChar key = keyEvent->text().at(0); // get first unicode character
 	// HACK : manually filter out known dead keys
 //	bool has_dead_key = true;
-	switch (key.tqunicode()) {
+	switch (key.unicode()) {
 		case 94   : m_lastDeadKey = TQChar(uint(94)); break;
 		case 176  : m_lastDeadKey = TQChar(uint(176)); break;
 		case 180  : m_lastDeadKey = TQChar(uint(180)); break;
@@ -468,9 +468,9 @@ void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level
 void KTouch::changeKeyboard(int num) {
     if (static_cast<unsigned int>(num)>=m_keyboardFiles.count()) return;
     Prefs::setCurrentKeyboardFile( m_keyboardFiles[num] );
-//	kdDebug() << "[KTouch::changeKeyboard]  new keyboard tqlayout = " << Prefs::currentKeyboardFile() << endl;
+//	kdDebug() << "[KTouch::changeKeyboard]  new keyboard layout = " << Prefs::currentKeyboardFile() << endl;
     m_keyboardLayoutAction->setCurrentItem(num);
-	// call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen tqlayout file is corrupt
+	// call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen layout file is corrupt
     m_keyboardWidget->applyPreferences(this, false);
 }
 // ----------------------------------------------------------------------------
@@ -620,8 +620,8 @@ void KTouch::init() {
 */
 	}
 
-    // if keyboard tqlayout (loaded by Prefs is not available (e.g. the 
-    // tqlayout file has been deleted) switch to default keyboard
+    // if keyboard layout (loaded by Prefs is not available (e.g. the 
+    // layout file has been deleted) switch to default keyboard
     if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) {
         TQString default_keyboard;
         // determine locale
@@ -652,7 +652,7 @@ void KTouch::init() {
 }
 // ----------------------------------------------------------------------------
 
-// Creates the tqlayout and GUI setup for a practice session
+// Creates the layout and GUI setup for a practice session
 void KTouch::initTrainingSession() {
 	//kdDebug() << "[KTouch::initTrainingSession]  setting up layouts and widgets for new training session..." << endl;
     // Build the training area. The status widget has a fixed vertical size, the slide line and the
@@ -753,7 +753,7 @@ void KTouch::updateFileLists() {
 	// TODO : search in i18n() directories
     m_keyboardFiles = dirs->findAllResources("data","ktouch/*.keyboard");
 
-    // remove the number tqlayout, since this is the necessary default tqlayout and will be
+    // remove the number layout, since this is the necessary default layout and will be
     // added anyway
     TQStringList::iterator it = m_keyboardFiles.find("number.keyboard");
     if (it!=m_keyboardFiles.end())      m_keyboardFiles.remove(it);
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index 620dfb49..ceec8abc 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -101,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 tqlayout (called from menu).
+    /// Quick-changes the keyboard layout (called from menu).
     void changeKeyboard(int num);
     /// Quick-changes the colour scheme used on the keyboard (called from menu).
     void changeColor(int num);
@@ -111,7 +111,7 @@ class KTouch : public KMainWindow {
   protected:
     /// Reimplementated to save preferences and
     bool queryExit();
-    /// Some tqlayout fixes here...
+    /// Some layout fixes here...
 	void resizeEvent(TQResizeEvent *);
     /// Accepts a typed char.
     void keyPressEvent(TQKeyEvent *keyEvent);
@@ -128,7 +128,7 @@ class KTouch : public KMainWindow {
 	
     /// Initialises the program during a normal startup
 	void init();
-	/// Creates the tqlayout and GUI setup for a practice session
+	/// Creates the layout and GUI setup for a practice session
 	void initTrainingSession();
     /// Creates the (standard) actions and entries in the menu.
     void setupActions();
@@ -171,8 +171,8 @@ 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 tqlayout files.
-    TQStringList     		m_keyboardTitles;       ///< A list of the titles of all default keyboard tqlayout 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.
 
 	KTouchStatisticsData	m_stats;				///< All user statistics are kept here.
 
diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui
index 2e13f7d0..38245a56 100644
--- a/ktouch/src/ktouchcoloreditor_dlg.ui
+++ b/ktouch/src/ktouchcoloreditor_dlg.ui
@@ -129,7 +129,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout18</cstring>
+                        <cstring>layout18</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -179,7 +179,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -255,7 +255,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -367,7 +367,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout24</cstring>
+                                <cstring>layout24</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -426,7 +426,7 @@
                                 </spacer>
                                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                                     <property name="name">
-                                        <cstring>tqlayout22</cstring>
+                                        <cstring>layout22</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -525,7 +525,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="2">
                                     <property name="name">
-                                        <cstring>tqlayout20</cstring>
+                                        <cstring>layout20</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -617,7 +617,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout28</cstring>
+                                <cstring>layout28</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/ktouch/src/ktouchdefaults.h b/ktouch/src/ktouchdefaults.h
index 8f6631db..d66a1663 100644
--- a/ktouch/src/ktouchdefaults.h
+++ b/ktouch/src/ktouchdefaults.h
@@ -21,7 +21,7 @@ extern const unsigned int BEGINNER_SPEED;		///< Speed for rating in characters p
 extern const unsigned int ADVANCED_SPEED;		///< Speed for rating in characters per minute.
 extern const unsigned int PROFESSIONAL_SPEED;	///< Speed for rating in characters per minute.
 
-extern const int KEYBOARD_MARGIN;				///< The margin around the keybaord tqlayout.
+extern const int KEYBOARD_MARGIN;				///< The margin around the keybaord layout.
 
 extern const int LCD_UPDATE_INTERVAL;    		///< Update interval for LCD display and statistics.
 
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp
index a8c6d83a..476a8502 100644
--- a/ktouch/src/ktouchkeyboard.cpp
+++ b/ktouch/src/ktouchkeyboard.cpp
@@ -34,7 +34,7 @@ void KTouchKeyboard::clear() {
 }
 // ----------------------------------------------------------------------------
 
-// Loads a keyboard tqlayout (old format) from file (returns true if successful).
+// Loads a keyboard layout (old format) from file (returns true if successful).
 bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
     // Ok, first download the contents as usual using the KIO lib
     // File is only downloaded if not local, otherwise it's just opened
@@ -176,14 +176,14 @@ bool KTouchKeyboard::read(TQTextStream& in) {
 // Loads keyboard data from file into an XML document
 bool KTouchKeyboard::read(const TQDomDocument& doc) {
 	// clean current data
-	kdDebug() << "Reading new keyboard tqlayout" << endl;
+	kdDebug() << "Reading new keyboard layout" << endl;
     m_keys.clear();
 	m_connectors.clear();
 	m_title = TQString();
 	// retrieve the title
 	TQDomNodeList entries = doc.elementsByTagName("Title");
 	if (entries.count() >= 1)	m_title = entries.item(0).firstChild().nodeValue();
-	else						m_title = i18n("untitled keyboard tqlayout");
+	else						m_title = i18n("untitled keyboard layout");
 	kdDebug() << "Title: " << m_title << endl;
 	// retrieve the comment
 	entries = doc.elementsByTagName("Comment");
@@ -235,7 +235,7 @@ void KTouchKeyboard::write(TQDomDocument& doc) const {
 	// Store title and ensure that the file contains a title!
 	TQDomElement title = doc.createElement("Title");
 	TQDomText titleText;
-	if (m_title.isEmpty())	titleText = doc.createTextNode( i18n("untitled keyboard tqlayout") );
+	if (m_title.isEmpty())	titleText = doc.createTextNode( i18n("untitled keyboard layout") );
 	else					titleText = doc.createTextNode(m_title);
 	title.appendChild(titleText);
 	root.appendChild(title);
@@ -281,7 +281,7 @@ void KTouchKeyboard::createDefault() {
     const int keyWidth = 20;
     const int col = keyWidth+keySpacing;
     const int row = keyHeight+keySpacing;
-    // First let's create the visible tqlayout.
+    // First let's create the visible layout.
 	// This means we have to create all keys that will be displayed.
     // Note: purely decorative keys get a key character code of 0!
     m_keys.clear();
@@ -327,7 +327,7 @@ void KTouchKeyboard::createDefault() {
     m_connectors.push_back( KTouchKeyConnector('.', '.', '6', 0) );
 	
 	m_title = "Number keypad";
-	m_comment = "Predefined keyboard tqlayout";
+	m_comment = "Predefined keyboard layout";
 	m_language = TQString();
 	// language does not apply to numbers... that's one of the nice things with math :-)
 	m_fontSuggestions = "Monospace";
@@ -352,12 +352,12 @@ bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString*
         bool result = readKeyboard(target, msg);
         KIO::NetAccess::removeTempFile(target);
         if (!result && errorMsg!=NULL)
-            *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").arg(url.url()) + msg;
+            *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg;
         return result;
     }
     else {
         if (errorMsg!=NULL)
-            *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url());
+            *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(url.url());
         return false;
     }
 }
@@ -382,7 +382,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) {
     TQTextStream out( &outfile );
     out << "########################################## \n";
     out << "#                                        # \n";
-    out << "#  Keyboard tqlayout file for KTouch       # \n";
+    out << "#  Keyboard layout file for KTouch       # \n";
     out << "#                                        # \n";
     out << "########################################## \n";
     out << "#\n";
@@ -396,7 +396,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) {
            default : out << "NormalKey  "; break;
         }
         TQRect rect=key->frame();
-        out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t'
+        out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t'
             << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl;
     }
 
@@ -408,15 +408,15 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) {
 }
 
 void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) {
-    // let's check whether the keyboard tqlayout has changed
+    // let's check whether the keyboard layout has changed
     if (KTouchConfig().m_currentKeyboardFile!=m_currentLayout) {
-        // if the tqlayout is the number tqlayout just create it and we're done
+        // if the layout is the number layout just create it and we're done
         if (KTouchConfig().m_currentKeyboardFile=="number.keyboard") {
             createDefaultKeyboard();
             resizeEvent(NULL);
             return;
         }
-        // ok, let's load this tqlayout
+        // ok, let's load this layout
         if (silent) {
             // during initialisation we don't want to have a message box, that's why this is silent
             if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile )))
@@ -427,8 +427,8 @@ void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) {
         else {
             TQString errorMsg;
             if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ), &errorMsg)) {
-                KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will "
-                    "be created instead. You can choose another keyboard tqlayout in the preferences dialog."),
+                KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will "
+                    "be created instead. You can choose another keyboard layout in the preferences dialog."),
                     errorMsg);
                 createDefaultKeyboard();
             }
diff --git a/ktouch/src/ktouchkeyboard.h b/ktouch/src/ktouchkeyboard.h
index 0e2ebfd6..fa88bed5 100644
--- a/ktouch/src/ktouchkeyboard.h
+++ b/ktouch/src/ktouchkeyboard.h
@@ -24,7 +24,7 @@
 
 class KURL;
 
-/// This class stores the keyboard tqlayout and the connectivity between characters 
+/// This class stores the keyboard layout and the connectivity between characters 
 /// and the actual keys.
 class KTouchKeyboard  {
   public:
@@ -32,7 +32,7 @@ class KTouchKeyboard  {
 	KTouchKeyboard() { createDefault(); }
 	/// Clears the keyboard (resets all data)
 	void clear();
-    /// Loads a keyboard tqlayout (old format) from file (returns true if successful).
+    /// Loads a keyboard layout (old format) from file (returns true if successful).
     bool load(TQWidget * window, const KURL& url);
     /// Loads a lecture (in XML format) from file (returns true if successful).
     bool loadXML(TQWidget * window, const KURL& url);
@@ -47,7 +47,7 @@ class KTouchKeyboard  {
     TQValueVector<KTouchKeyConnector>	m_connectors;	///< Vector with connectivity data.
 	
 	TQString		m_title;			///< Title of the keyboard (to appear in the menu).
-	TQString		m_comment;			///< Comments about the creator of the keyboard tqlayout.
+	TQString		m_comment;			///< Comments about the creator of the keyboard layout.
 	TQString		m_language;			///< Language ID of keyboard
 	TQString		m_fontSuggestions;	///< Suggestions of fonts to be used on the keys.
 
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index 3e3abf62..40944155 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) {
 
 void KTouchKeyboardEditor::transfer_to_dialog() {
 	if (m_currentURL.isEmpty()) {
-		titleEdit->setText( i18n("untitled keyboard tqlayout") );
+		titleEdit->setText( i18n("untitled keyboard layout") );
 		keyboardCommentEdit->setText("");
 	}
 	else {
@@ -173,7 +173,7 @@ void KTouchKeyboardEditor::transfer_to_dialog() {
     
 void KTouchKeyboardEditor::transfer_from_dialog() {
 	m_keyboard.m_title = titleEdit->text();
-	if (m_keyboard.m_title.isEmpty())  m_keyboard.m_title = i18n("untitled keyboard tqlayout");
+	if (m_keyboard.m_title.isEmpty())  m_keyboard.m_title = i18n("untitled keyboard layout");
 	m_keyboard.m_comment = keyboardCommentEdit->text();
 	m_keyboard.m_language = languageEdit->text();
 }
diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui
index 23c88168..6f945dd2 100644
--- a/ktouch/src/ktouchkeyboardeditor_dlg.ui
+++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -169,7 +169,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp
index 3e476f65..99cc63cc 100644
--- a/ktouch/src/ktouchkeyboardwidget.cpp
+++ b/ktouch/src/ktouchkeyboardwidget.cpp
@@ -51,12 +51,12 @@ bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQSt
         bool result = readKeyboard(target, msg);
         KIO::NetAccess::removeTempFile(target);
         if (!result && errorMsg!=NULL)
-            *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").arg(url.url()) + msg;
+            *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg;
         return result;
     }
     else {
         if (errorMsg!=NULL)
-            *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url());
+            *errorMsg = i18n("Could not download/open keyboard layout file from '%1'.").arg(url.url());
         return false;
     }
 }
@@ -81,7 +81,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) {
     TQTextStream out( &outfile );
     out << "########################################## \n";
     out << "#                                        # \n";
-    out << "#  Keyboard tqlayout file for KTouch       # \n";
+    out << "#  Keyboard layout file for KTouch       # \n";
     out << "#                                        # \n";
     out << "########################################## \n";
     out << "#\n";
@@ -95,7 +95,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) {
            default : out << "NormalKey  "; break;
         }
         TQRect rect=key->frame();
-        out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t'
+        out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t'
             << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl;
     }
 
@@ -112,16 +112,16 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) {
     	setMaximumHeight(100);
 	else
     	setMaximumHeight(10000);
-    // let's check whether the keyboard tqlayout has changed
+    // let's check whether the keyboard layout has changed
     if (Prefs::currentKeyboardFile() != m_currentLayout) {
-        // if the tqlayout is the number tqlayout just create it and we're done
+        // if the layout is the number layout just create it and we're done
 		//kdDebug() << "[KTouchKeyboardWidget::applyPreferences]  keyboard = " << Prefs::currentKeyboardFile() << endl;
         if (Prefs::currentKeyboardFile()=="number.keyboard") {
             createDefaultKeyboard();
             resizeEvent(NULL);
             return;
         }
-        // ok, let's load this tqlayout
+        // ok, let's load this layout
         if (silent) {
             // during initialisation we don't want to have a message box, that's why this is silent
             if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() )))
@@ -132,8 +132,8 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) {
         else {
             TQString errorMsg;
             if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ), &errorMsg)) {
-                KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will "
-                    "be created instead. You can choose another keyboard tqlayout in the preferences dialog."),
+                KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will "
+                    "be created instead. You can choose another keyboard layout in the preferences dialog."),
                     errorMsg);
                 createDefaultKeyboard();
             }
@@ -397,13 +397,13 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro
                 w=h=8; // default values for old keyboard files
             m_keyList.append( new KTouchFingerKey(keyAscII, keyText, x+1, y+1, w, h) );
             m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) );
-// 			kdDebug() << "read : F : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl;
+// 			kdDebug() << "read : F : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl;
         }
         else if (keyType=="ControlKey") {
             lineStream >> keyText >> x >> y >> w >> h;
             m_keyList.append( new KTouchControlKey(keyAscII, keyText, x+1, y+1, w-2, h-2) );
             m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) );
-// 			kdDebug() << "read : C : tqunicode = " << keyAscII << " char = " << keyText << endl;
+// 			kdDebug() << "read : C : unicode = " << keyAscII << " char = " << keyText << endl;
         }
         else if (keyType=="NormalKey") {
             int fingerCharCode;
@@ -412,12 +412,12 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro
             // retrieve the finger key with the matching char
             m_keyList.append( new KTouchNormalKey(keyAscII, keyText, x+1, y+1, w, h) );
             m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, fingerCharCode, 0) );
-// 			kdDebug() << "read : N : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl;
+// 			kdDebug() << "read : N : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl;
         } else if (keyType=="HiddenKey") {
             int targetChar, fingerChar, controlChar;
             lineStream >> targetChar >> fingerChar >> controlChar;
             m_connectorList.append( KTouchKeyConnection(keyAscII, targetChar, fingerChar, controlChar) );
-//			kdDebug() << "read : H : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl;
+//			kdDebug() << "read : H : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl;
 			
         }
         else {
@@ -437,7 +437,7 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro
         m_keyboardWidth = std::max(m_keyboardWidth, x+w);
         m_keyboardHeight = std::max(m_keyboardHeight, y+h);
     } while (!in.atEnd() && !line.isNull());
-//	kdDebug() << "showing all tqunicode numbers in this file" << endl;
+//	kdDebug() << "showing all unicode numbers in this file" << endl;
 /*	for (std::set<TQChar>::iterator it = keys.begin(); it != keys.end(); ++it)
 		kdDebug() << *it << endl;
 */
@@ -460,9 +460,9 @@ void KTouchKeyboardWidget::updateColours() {
         TQChar targetChar = (*it).m_targetKeyChar; // this is the _base_ character of the key that needs to be highlighted
         TQChar ch = (*it).m_keyChar;
 
-/*		kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.tqunicode() << ") " 
-				  << "target = " << targetChar << "(" << targetChar.tqunicode() << ") " 
-				  << "finger = " << fingerChar << "(" << fingerChar.tqunicode() << ")" << endl;
+/*		kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.unicode() << ") " 
+				  << "target = " << targetChar << "(" << targetChar.unicode() << ") " 
+				  << "finger = " << fingerChar << "(" << fingerChar.unicode() << ")" << endl;
 */
 		m_keyCharMap[ch] = -1;
 
diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h
index d49d58e6..dfada1fa 100644
--- a/ktouch/src/ktouchkeyboardwidget.h
+++ b/ktouch/src/ktouchkeyboardwidget.h
@@ -30,7 +30,7 @@ class KURL;
 /** This is the keyboard widget at the bottom of the training screen.
  *  In addition to the painting functions this class has the member
  *  functions loadKeyboard() and saveKeyboard() which can read and write
- *  a keyboard tqlayout from/into a file.<p>
+ *  a keyboard layout from/into a file.<p>
  *  The keyboard is drawn in the paintEvent() member function. The
  *  resizing, that means the recalculation of m_shift is
  *  done in the resizeEvent() member function.<p>
@@ -45,14 +45,14 @@ class KTouchKeyboardWidget : public TQWidget {
   public:
     /// Constructor
     KTouchKeyboardWidget(TQWidget *parent);
-    /// Reads a keyboard tqlayout from the given URL.
+    /// 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(TQWidget * window, const KURL& url, TQString* errorMsg=NULL);
-    /// Saves the keyboard tqlayout to the URL.
+    /// Saves the keyboard layout to the URL.
     void saveKeyboard(TQWidget * window, const KURL& url);
-    /// Applies preferences to the keyboard tqlayout and the keys.
-    /// This means that the tqlayout is basically recreated and if the tqlayout type/language
+    /// 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(TQWidget * window, bool silent);
 
@@ -90,7 +90,7 @@ class KTouchKeyboardWidget : public TQWidget {
     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.
-    TQString             m_currentLayout;    ///< The name of the currently used tqlayout.
+    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.
diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h
index d0e97d60..68ffa959 100644
--- a/ktouch/src/ktouchkeys.h
+++ b/ktouch/src/ktouchkeys.h
@@ -66,7 +66,7 @@ class KTouchBaseKey {
     int     m_wS;       ///< The scaled width of the key.
     int     m_hS;       ///< The scaled height of the key.
 
-    KeyType m_type;     ///< Stores the type of the key (convenience for saving of the keyboard tqlayout).
+    KeyType m_type;     ///< Stores the type of the key (convenience for saving of the keyboard layout).
 };
 // ---------------------------------------------------------------------------------------
 
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index bbe6cc8d..e12e3158 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -144,7 +144,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -155,7 +155,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout7</cstring>
+                                        <cstring>layout7</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -286,7 +286,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -334,7 +334,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -486,7 +486,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout35</cstring>
+                <cstring>layout35</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui
index d224bce3..4da33c33 100644
--- a/ktouch/src/ktouchopenrequest_dlg.ui
+++ b/ktouch/src/ktouchopenrequest_dlg.ui
@@ -115,7 +115,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -165,7 +165,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui
index 2d519808..6fd8eeea 100644
--- a/ktouch/src/ktouchprefcolorslayout.ui
+++ b/ktouch/src/ktouchprefcolorslayout.ui
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -353,7 +353,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index ff4959f6..f205c1ab 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -82,7 +82,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -193,7 +193,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -247,7 +247,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index c9a2d75b..3105d19c 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -74,7 +74,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -88,10 +88,10 @@
                                 <string>Override keyboard fonts</string>
                             </property>
                             <property name="toolTip" stdset="0">
-                                <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard tqlayout.</string>
+                                <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard layout.</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Every keyboard tqlayout may specify its own font. If the predefined font of a certain keyboard tqlayout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys.</string>
+                                <string>Every keyboard layout may specify its own font. If the predefined font of a certain keyboard layout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys.</string>
                             </property>
                         </widget>
                         <widget class="TQLabel">
diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui
index 7f68f36a..3c6a1c8d 100644
--- a/ktouch/src/ktouchpreftraininglayout.ui
+++ b/ktouch/src/ktouchpreftraininglayout.ui
@@ -60,7 +60,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -174,7 +174,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui
index d54fd2b1..a254c9af 100644
--- a/ktouch/src/ktouchstatistics_dlg.ui
+++ b/ktouch/src/ktouchstatistics_dlg.ui
@@ -69,7 +69,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -127,7 +127,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout28</cstring>
+                            <cstring>layout28</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -515,7 +515,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -573,7 +573,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout28_2</cstring>
+                            <cstring>layout28_2</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -940,7 +940,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout6</cstring>
+                            <cstring>layout6</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1205,7 +1205,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 17e095da..80c92bef 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -41,7 +41,7 @@ int KTouchCharStats::missHitRatio() const {
 // ----------------------------------------------------------------------------
 
 TQTextStream& operator<<(TQTextStream &out, const KTouchCharStats &ch) {
-    return (out << ch.m_char.tqunicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount);
+    return (out << ch.m_char.unicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount);
 }
 // ----------------------------------------------------------------------------
 
@@ -135,9 +135,9 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const {
 	level.appendChild(e);
 	// add char stats
 	TQString char_data;
-    // we append for each missed char the char-tqunicode and the counters
+    // we append for each missed char the char-unicode and the counters
 	for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it)
-		char_data += TQString(" %1 %2 %3").arg(it->m_char.tqunicode())
+		char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode())
 										 .arg(it->m_correctCount).arg(it->m_wrongCount);
 	e = doc.createElement("CharStats");
 	tn = doc.createTextNode(char_data);
@@ -302,9 +302,9 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const {
 	session.appendChild(e);
 	// add char data
 	TQString char_data;
-    // we append for each missed char the char-tqunicode and the counters
+    // we append for each missed char the char-unicode and the counters
 	for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it)
-		char_data += TQString(" %1 %2 %3").arg(it->m_char.tqunicode())
+		char_data += TQString(" %1 %2 %3").arg(it->m_char.unicode())
 				.arg(it->m_correctCount).arg(it->m_wrongCount);
 	e = doc.createElement("CharStats");
 	tn = doc.createTextNode(char_data);
diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui
index 7d93f545..b2625d23 100644
--- a/ktouch/src/ktouchstatuslayout.ui
+++ b/ktouch/src/ktouchstatuslayout.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -85,7 +85,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">