Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

16 files changed, 21 insertions, 21 deletions

diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog
index f8d02b6a..6225920b 100644
--- a/ktouch/ChangeLog
+++ b/ktouch/ChangeLog
@@ -13,7 +13,7 @@
              color scheme includes now keyboard and slide line
              colors, new option to have common slide line colors
              in configuration (request: #90548)
-  * Bugfix:  several keyboard tqlayouts were wrong (showing the
+  * Bugfix:  several keyboard layouts were wrong (showing the
              wrong colors and were therefore misleading), a few
              have been already fixed and the others temporarily 
              removed from the install section of the make files
@@ -33,7 +33,7 @@
              (bug report: 
   * Feature: default keyboard is selected based on KDE locale 
              (requests: #54379, #99947)
-  * Feature: quick select lists of training lectures/keyboard tqlayouts are now
+  * Feature: quick select lists of training lectures/keyboard layouts are now
              sorted alphabetically
   * Bugfix:  trailing spaces are removed from lines when lecture is 
              read (bug: #107080)
@@ -55,7 +55,7 @@
   * Bugfix:  fixed false error on reading single-level-lectures (bug: #120414)
   * Feature: lines with spaces at the end are trimmed (whitespace removed)
   * Feature: line length limit increased to 300 (request: #116838)
-  * Added:   added new/fixed keyboard tqlayouts 
+  * Added:   added new/fixed keyboard layouts 
              (requests: #40962, #85584, #119670)
 
 2006-03-27 Andreas Nicolai <andreas.nicolai@gmx.net>
@@ -240,7 +240,7 @@
   (new version)
   * ktouch 0.60 is out
   * new features:
-      Change between different keyboard tqlayouts. Supported keyboard's is English, German and Norwegian.
+      Change between different keyboard layouts. Supported keyboard's is English, German and Norwegian.
 
 2000-05-09  Haavard Froeiland <haavard@users.sourceforge.net>
 
diff --git a/ktouch/ktouch.lsm b/ktouch/ktouch.lsm
index 9bd6c444..ab0235d1 100644
--- a/ktouch/ktouch.lsm
+++ b/ktouch/ktouch.lsm
@@ -7,7 +7,7 @@ Description:    A education program to learn to touch-type. It provieds
                 fingers on the keyboard. It also shows the user which finger
                 to move to press the next key. It automatically adjusts to
                 different levels depending on the speed. It has support
-                for different keyboard tqlayouts(languages).
+                for different keyboard layouts(languages).
 Keywords:       touch typing education training
 Author:         haavard@users.sourceforge.net (Haavard Froeiland)
 Maintained-by:  ghorwin@users.sourceforge.net (Andreas Nicolai)
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index dbd10eef..1f2a7501 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -608,7 +608,7 @@ void KTouch::init() {
 	//kdDebug() << "[KTouch::init]  populating file lists..." << endl;
     updateFileLists();  // create lists with default lecture/keyboard/examination files/colour scheme files
 	//kdDebug() << "[KTouch::init]  " << m_lectureFiles.count() << " lectures available" << endl;
-	//kdDebug() << "[KTouch::init]  " << m_keyboardFiles.count() << " keyboard tqlayouts available" << endl;
+	//kdDebug() << "[KTouch::init]  " << m_keyboardFiles.count() << " keyboard layouts available" << endl;
 	//kdDebug() << "[KTouch::init]  " << m_examinationFiles.count() << " examination files available" << endl;
 
 	if (Prefs::currentLectureFile() == "default") {
@@ -654,7 +654,7 @@ void KTouch::init() {
 
 // Creates the tqlayout and GUI setup for a practice session
 void KTouch::initTrainingSession() {
-	//kdDebug() << "[KTouch::initTrainingSession]  setting up tqlayouts and widgets for new training session..." << endl;
+	//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
     // keyboard grow according to their vertical stretch factors (see last argument in the constructors
     // of TQSizePolicy)
@@ -710,7 +710,7 @@ void KTouch::setupActions() {
 
 	// *** Settings menu ***    
     KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
-    // Setup menu entries for keyboard tqlayouts    
+    // Setup menu entries for keyboard layouts    
     m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts");
 	m_keyboardLayoutAction->setMenuAccelsEnabled(false);
     m_keyboardLayoutAction->setItems(m_keyboardTitles);
diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui
index d512bb02..0be9d5f2 100644
--- a/ktouch/src/ktouchcoloreditor_dlg.ui
+++ b/ktouch/src/ktouchcoloreditor_dlg.ui
@@ -792,7 +792,7 @@
     <slot>updateClicked()</slot>
     <slot>colorSchemeChanged(TQListBoxItem * item)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui
index 7fa7b07f..14c1c6bb 100644
--- a/ktouch/src/ktouchkeyboardeditor_dlg.ui
+++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui
@@ -389,7 +389,7 @@
     <slot>removeBtnClicked()</slot>
     <slot>keySelectionChanged(QListBoxItem*)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ktouch/src/ktouchkeys.cpp b/ktouch/src/ktouchkeys.cpp
index 6f45d40a..83efa572 100644
--- a/ktouch/src/ktouchkeys.cpp
+++ b/ktouch/src/ktouchkeys.cpp
@@ -68,7 +68,7 @@ void KTouchNormalKey::paint(TQPainter& p) const {
         p.setPen( colorScheme.m_frame );
         textColor = colorScheme.m_text;
     };
-    KTouchBaseKey::paint(p);  // call the tqparents paint() function
+    KTouchBaseKey::paint(p);  // call the parents paint() function
     p.setPen(textColor);
    
     p.setFont( m_font );
diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h
index c429790d..df19b56d 100644
--- a/ktouch/src/ktouchkeys.h
+++ b/ktouch/src/ktouchkeys.h
@@ -123,7 +123,7 @@ class KTouchControlKey : public KTouchBaseKey {
   public:
     /// Constructor
     KTouchControlKey(const TQChar& keyChar, const TQString& keyText, int x, int y, int w, int h);
-    /// Extends the tqparents paint routine (draws the text or other fancy stuff).
+    /// Extends the parents paint routine (draws the text or other fancy stuff).
     void paint(TQPainter& p) const;
 };
 // ------------------------------------------------------------------------------------
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 7a4ae7dd..a4e8f989 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -664,7 +664,7 @@
     <slot>setModified()</slot>
     <slot>fontBtnClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui
index e9a522bc..f878335f 100644
--- a/ktouch/src/ktouchopenrequest_dlg.ui
+++ b/ktouch/src/ktouchopenrequest_dlg.ui
@@ -278,7 +278,7 @@
     <slot>radioBtnChanged()</slot>
     <slot>browseBtnClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui
index 45b43dbe..53c87079 100644
--- a/ktouch/src/ktouchprefcolorslayout.ui
+++ b/ktouch/src/ktouchprefcolorslayout.ui
@@ -504,7 +504,7 @@
     <tabstop>kcfg_ErrorBackgroundColor</tabstop>
     <tabstop>kcfg_CurrentColorScheme</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index 18610f2e..95c44ed6 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -334,7 +334,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontrequester.h</includehint>
 </includehints>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 1de77d3c..1c25d804 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -135,7 +135,7 @@
 <Q_SLOTS>
     <slot>fontChooseBtnClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontrequester.h</includehint>
 </includehints>
diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui
index 7db29ca4..c2928dc0 100644
--- a/ktouch/src/ktouchpreftraininglayout.ui
+++ b/ktouch/src/ktouchpreftraininglayout.ui
@@ -321,7 +321,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp
index b1870b7b..1e54adbc 100644
--- a/ktouch/src/ktouchslideline.cpp
+++ b/ktouch/src/ktouchslideline.cpp
@@ -237,7 +237,7 @@ void KTouchSlideLine::resizeEvent ( TQResizeEvent * ) {
     KD_DEBUG( "[KTouchSlideLine::resizeEvent]" << endl );
 	// required input member variables:  none
 
-	// when the widget is resized, the whole tqgeometry is tqinvalidated, so we do:
+	// when the widget is resized, the whole tqgeometry is invalidated, so we do:
 	//   1. recalculate and store the tqgeometry of the sliding lines
 	//   2. resize the font
 	//   3. recreate the sliding lines (this is done from the resizeFont() function
diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui
index ef913462..568ed7ef 100644
--- a/ktouch/src/ktouchstatistics_dlg.ui
+++ b/ktouch/src/ktouchstatistics_dlg.ui
@@ -1277,7 +1277,7 @@
         <data format="PNG" length="1525">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000005bc494441545885b596416823d719c77f0e0a8c0e0b12b860810533a0057bd88035642133908087e4a29ea2b087684fb1c9253db57b6b4ba125c9a15d07127613ca3a7bc93a812e524f514a4b9f601b3f85763d0e6d7676a1c623b0f00c8989442ca281085e0e23c9abeccab10dd1e5cfa7ff7fbef7f17fdffbde9b9152729a9ff3c7b2e249601e683f84df01518c7cab3e739a7c4f9c76f1e5175cd45f42767f2f27f0da1fae41ea34d9ce500003b86c97a10fc63963022b4f9560f053178046bd558734888e98c00f831aa0fdc4050cc0d61d36bedac0c81a63fcedfdd779bf179ec981999336a1f3ebb262a0b1fc2b93d75ffc0d624fd09d8d119f49c24c4cf77e4cfc5e07882106f94eed44cd78620734ad84fe4a96f8e90e6bff5b030dea77ebc4f3314431994517ede52cdacb39e8c5274d7bf2be8d6341743b4dfa1c68cf77a8b56a68058dce4e8ca643bc23a00df15f4378d03d7101277640bef9e18cf8ddfb33c1bb45d29fe4585d588528a654709385ff0ff1ed101e4448294f3c0b4e75726dc7517d60b53547358ac9bd92a3f185a0fb51cceaed80abbd98e6291687a103eb37d6d55cacaba59eadec595bf57b4ad9b3f651dcedabddc6be626e0ee4d75c7ee31a57e7aee0ffa98fd62873ed992b5cfdfb3ebcbd8efd9cab36ffe54d7eff50bea5595b6d363695e3382ab1564a565e7d4d6dca2da5be566aebdf09def3ee25f110d7ff7c4ba94b2b6acbdb52eacba16ef707fa7da5fe79a1a8befdeff0bb7d95e87f90ef5b5f29fb695b49298f7ac02958c82f2456c682cfc12c98f8918f55302102d77091c458058bfedd3eb9410eb123b0162c8812bd17f9b8291722b0e64daa8d2a967ec48ff3b58f36ff0948e697d7f6710a0e1f3ff818162088024cdd248802d041ec099c94461005a40b69bcae87bbe08ef9200ab0741381205d003ff271175dfcb63fe647f9d2058807c3a39a6cc18a52df28a57695524aa97b7e82a358ed2ab57f675fa94b9547fe9f405f29b564abcd3b5bc7ea36ef6ca92bcf5c39da020d0dbf1d8001e15e88b998e028c6001148483dfaff04164010e3e8d6b13a47b7900379b4053160160c082197cf3d16ddf30e92e97c2e9f4b7a85a4077e4cf7480f84510839e81ff61f8bb5ed3ace603adf3fec431e0402e67f44a71ff5402a712026d3cd50fdac8a356b210291747d20710c07bfe763e78ad0af430b36b63770f2ce981781a0b458421c087e0e543fade2165c6adbb5313fca572a96a8efd493d332728001d477ea94164af8b14fe562053ff6295f2ce3c73ece9c43fd7e1d7a1d444b502e9627f8cac50a5ed7c39977905188756821db72821fe9655b621d5ad4bb7560781dafdf5857cebc8377e0e1ea2ea225707407d99238f30ea22558fc6a91dcce4d4ab3650492d200825e17139b6ae63e2e207a5d8c94cbdaf990d24209d112b8ba8b6ccb713e5777b9d9b849fd6f75a4943353df03b73eb8a5aefff23a5ed7c39ab7f0da93281e48363ed8c05ab2f8c5a5d547f8116efca3caf5f7d6587b6bedb177c4d4dbb074e125e8825518262b587090c4fe818f7bc1219bc95259aee01ff85873c9c41bf123fd65fb25346dfa536d6a018d9648cef5e7024333f0a364a2f9918fa92763d5c646b69b98ba49f56e150a933c3ac8c89bbaf8b1052ceb2e7e04aeeea2451aa66e8e67fa089b3471f5e4dc97164af82d7f82274aee98e3de8ac73a6016202024fd429a200ae13c04ed214621a4a01949380f91d6c57cca3ce287e8b5bd635f1dc738604304869183bd2938887175673abf47721b9ecd8126e4210c3b9087ce101f8eedd432b22da7f2e4939e38bb0321e47259e84076880fc7cd4183e26c110e1fcf7308e69c79ac03536b6bb41a38070eb54f6ad8039bc6a0c1726a99e6a089abb9f83ff301a86dd7707b2eb5ffd4c6bc9d4af4e54c192f7dc61e28668a881d41e56285201fb0f2ec0a413ea0f26c053f978ce7ce4107e349032ff226f891de3be761680651144d2d60ea245cbfb1aea270fa870c407c2a282e15c966b25365e141c8f6ddeda94ff5ef018e80fecc25cb29330000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>ktouchchartwidget.h</includehint>
diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui
index 62e31df5..3721f578 100644
--- a/ktouch/src/ktouchstatuslayout.ui
+++ b/ktouch/src/ktouchstatuslayout.ui
@@ -356,5 +356,5 @@
     <slot>startKTouch()</slot>
     <slot>stopKTouch()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>