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/kdevelop@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

71 files changed, 168 insertions, 168 deletions

diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui
index 15bf9940..f53ec3df 100644
--- a/parts/abbrev/abbrevconfigwidgetbase.ui
+++ b/parts/abbrev/abbrevconfigwidgetbase.ui
@@ -185,6 +185,6 @@
     <slot access="protected">removeTemplate()</slot>
     <slot access="protected">selectionChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui
index 93e72d4b..bab82762 100644
--- a/parts/abbrev/addtemplatedlgbase.ui
+++ b/parts/abbrev/addtemplatedlgbase.ui
@@ -168,8 +168,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index ab8f7af0..562c31bb 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -648,8 +648,8 @@
     <slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint &amp; )</slot>
     <slot>showTemplates(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kiconview.h</includehint>
diff --git a/parts/appwizard/common/COPYING.LIB b/parts/appwizard/common/COPYING.LIB
index 271a81c9..4da30f2f 100644
--- a/parts/appwizard/common/COPYING.LIB
+++ b/parts/appwizard/common/COPYING.LIB
@@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure tqlayouts and accessors, and small macros and small inline
+structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui
index 844e889f..5ce4936a 100644
--- a/parts/appwizard/filepropspagebase.ui
+++ b/parts/appwizard/filepropspagebase.ui
@@ -157,8 +157,8 @@
     <slot>slotSelectionChanged()</slot>
     <slot>slotClassnameChanged(const QString&amp;)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui
index 134d7c51..29687ff9 100644
--- a/parts/appwizard/importdlgbase.ui
+++ b/parts/appwizard/importdlgbase.ui
@@ -355,8 +355,8 @@ will be the author, everything between
     <slot access="protected">projectTypeChanged(const QString &amp;)</slot>
     <slot access="protected">projectTypeChanged(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui
index a8433bbf..9ac7dba9 100644
--- a/parts/appwizard/vcs_form.ui
+++ b/parts/appwizard/vcs_form.ui
@@ -79,6 +79,6 @@
     <include location="global" impldecl="in declaration">tqwidgetstack.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index 64788d4a..4582fa4b 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -862,10 +862,10 @@ correctly.
                                     <cstring>Pad_ParenthesesIn</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Add spa&amp;ces inside tqparentheses</string>
+                                    <string>Add spa&amp;ces inside parentheses</string>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>Insert space padding around tqparenthesis on the inside only.</string>
+                                    <string>Insert space padding around parenthesis on the inside only.</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox">
@@ -873,10 +873,10 @@ correctly.
                                     <cstring>Pad_ParenthesesOut</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>A&amp;dd spaces outside tqparentheses</string>
+                                    <string>A&amp;dd spaces outside parentheses</string>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>Insert space padding around tqparenthesis on the outside only.</string>
+                                    <string>Insert space padding around parenthesis on the outside only.</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox">
@@ -884,10 +884,10 @@ correctly.
                                     <cstring>Pad_ParenthesesUn</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Remove &amp;unnecessary spaces around tqparentheses</string>
+                                    <string>Remove &amp;unnecessary spaces around parentheses</string>
                                 </property>
                                 <property name="toolTip" stdset="0">
-                                    <string>Remove unnecessary space padding around tqparenthesis.</string>
+                                    <string>Remove unnecessary space padding around parenthesis.</string>
                                 </property>
                             </widget>
                             <widget class="TQCheckBox">
@@ -1327,6 +1327,6 @@ multiple single-statement lines.</string>
 <Q_SLOTS>
     <slot>allFiles()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui
index 3e3c1cad..5fe07a63 100644
--- a/parts/bookmarks/bookmarks_settings_base.ui
+++ b/parts/bookmarks/bookmarks_settings_base.ui
@@ -233,7 +233,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 70e26439..7cce890a 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -38,11 +38,11 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
 
     TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
 
-    tqparents_button = new TQToolButton(this);
-    tqparents_button->setPixmap( UserIcon("CTtqparents", KIcon::DefaultState, ClassViewFactory::instance()) );
-    tqparents_button->setToggleButton(true);
-    tqparents_button->setFixedSize(tqparents_button->tqsizeHint());
-    TQToolTip::add(tqparents_button, i18n("Show tqparents"));
+    parents_button = new TQToolButton(this);
+    parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
+    parents_button->setToggleButton(true);
+    parents_button->setFixedSize(parents_button->tqsizeHint());
+    TQToolTip::add(parents_button, i18n("Show parents"));
 
     tqchildren_button = new TQToolButton(this);
     tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
@@ -95,7 +95,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     firstrowLayout->addWidget(class_combo, 1);
     firstrowLayout->addWidget(close_button, 0);
 
-    secondrowLayout->addWidget(tqparents_button);
+    secondrowLayout->addWidget(parents_button);
     secondrowLayout->addWidget(tqchildren_button);
     secondrowLayout->addWidget(clients_button);
     secondrowLayout->addWidget(suppliers_button);
@@ -112,7 +112,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
              this, TQT_SLOT(slotClose()) );
     connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
              this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
-    connect( tqparents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
+    connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
     connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
     connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
     connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
@@ -170,7 +170,7 @@ void ClassToolDialog::viewNone()
 }
 
 
-/** View the tqparents of the current class. */
+/** View the parents of the current class. */
 void ClassToolDialog::viewParents()
 {
     currentOperation = ViewParents;
@@ -202,7 +202,7 @@ void ClassToolDialog::viewSuppliers()
 }
 
 
-/** View methods in this class and tqparents. */
+/** View methods in this class and parents. */
 void ClassToolDialog::viewMethods()
 {
     currentOperation = ViewMethods;
@@ -210,7 +210,7 @@ void ClassToolDialog::viewMethods()
 }
 
 
-/** View attributes in this class and tqparents. */
+/** View attributes in this class and parents. */
 void ClassToolDialog::viewAttributes()
 {
     currentOperation = ViewAttributes;
@@ -283,7 +283,7 @@ void ClassToolDialog::updateCaptionAndButtons()
     switch (currentOperation)
         {
         case ViewParents:
-            button = tqparents_button;
+            button = parents_button;
             caption = i18n("Parents");
             break;
         case ViewChildren:
@@ -312,7 +312,7 @@ void ClassToolDialog::updateCaptionAndButtons()
             break;
         }
 
-    tqparents_button->setOn(false);
+    parents_button->setOn(false);
     tqchildren_button->setOn(false);
     clients_button->setOn(false);
     suppliers_button->setOn(false);
@@ -339,7 +339,7 @@ void ClassToolDialog::buildTree()
     switch (currentOperation)
         {
         case ViewParents:
-            class_tree->insertClassAndClasses(currentClass, currentClass->tqparents);
+            class_tree->insertClassAndClasses(currentClass, currentClass->parents);
             break;
         case ViewChildren:
             {
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index a33c7f2b..c8d88e71 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -45,7 +45,7 @@ public slots:
 
     /** View nothing. */
     void viewNone();
-    /** View the tqparents of the current class. */
+    /** View the parents of the current class. */
     void viewParents();
     /** View the tqchildren of the current class. */
     void viewChildren();
@@ -53,9 +53,9 @@ public slots:
     void viewClients();
     /** View all classes that this class has as attributes. */
     void viewSuppliers();
-    /** View methods in this class and tqparents. */
+    /** View methods in this class and parents. */
     void viewMethods();
-    /** View attributes in this class and tqparents. */
+    /** View attributes in this class and parents. */
     void viewAttributes();
 
 private slots:
@@ -75,7 +75,7 @@ private:
     ClassToolWidget *class_tree;
     TQComboBox *class_combo;
     
-    TQToolButton *tqparents_button;
+    TQToolButton *parents_button;
     TQToolButton *tqchildren_button;
     TQToolButton *clients_button;
     TQToolButton *suppliers_button;
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 59e744f1..2817db82 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -60,16 +60,16 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueLis
 }
 
 
-void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &tqparentList)
+void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList)
 {
     ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass);
     
     ClassTreeItem *lastItem = 0;
 
-    TQPtrListIterator<ParsedParent> it(tqparentList);
+    TQPtrListIterator<ParsedParent> it(parentList);
     for (; it.current(); ++it) {
-        ParsedClass *tqparentClass = m_part->classStore()->getClassByName((*it)->name());
-        lastItem = new ClassTreeClassItem(root, lastItem, tqparentClass);
+        ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name());
+        lastItem = new ClassTreeClassItem(root, lastItem, parentClass);
         lastItem->setExpandable(false);
     }
     
@@ -124,14 +124,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f
 {
     ClassTreeItem *lastItem = 0;
     
-    // First treat all tqparents.
-    for ( ParsedParent *pParent = parsedClass->tqparents.first();
+    // First treat all parents.
+    for ( ParsedParent *pParent = parsedClass->parents.first();
           pParent != 0;
-          pParent = parsedClass->tqparents.next() )
+          pParent = parsedClass->parents.next() )
         {
-            ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name());
-            if (tqparentClass)
-                addClassAndMethods(tqparentClass, filter, &lastItem);
+            ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name());
+            if (parentClass)
+                addClassAndMethods(parentClass, filter, &lastItem);
         }
     
     // Add the current class
@@ -142,14 +142,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f
 void ClassToolWidget::insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter)
 {
     ClassTreeItem *lastItem = 0;
-    // First treat all tqparents.
-    for ( ParsedParent *pParent = parsedClass->tqparents.first();
+    // First treat all parents.
+    for ( ParsedParent *pParent = parsedClass->parents.first();
           pParent != 0;
-          pParent = parsedClass->tqparents.next() )
+          pParent = parsedClass->parents.next() )
         {
-            ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name());
-            if (tqparentClass)
-                addClassAndAttributes(tqparentClass, filter, &lastItem);
+            ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name());
+            if (parentClass)
+                addClassAndAttributes(parentClass, filter, &lastItem);
         }
     
     // Add the current class
diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h
index 740d5545..9ad4ef4a 100644
--- a/parts/classview/classtoolwidget.h
+++ b/parts/classview/classtoolwidget.h
@@ -27,7 +27,7 @@ public:
     ~ClassToolWidget();
 
     void insertClassAndClasses(ParsedClass *parsedClass, TQValueList<ParsedClass*> classList);
-    void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &tqparentList);
+    void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList<ParsedParent> &parentList);
     void insertAllClassMethods(ParsedClass *parsedClass, PIAccess filter);
     void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter);
 
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 00a5a87a..f4e21f2a 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -433,7 +433,7 @@ protected:
 
 void ClassToolTip::maybeTip(const TQPoint &p)
 {
-    ClassTreeBase *ctw = static_cast<ClassTreeBase*>(tqparentWidget());
+    ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
 
     TQListViewItem *item = ctw->itemAt(p);
     TQRect r = ctw->tqitemRect(item);
@@ -525,7 +525,7 @@ void ClassTreeBase::slotItemExecuted( TQListViewItem* item )
     if (!item)
         return;
 
-    // toggle open state for tqparents
+    // toggle open state for parents
     if (item->childCount() > 0)
         setOpen(item, !isOpen(item));
 
diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui
index ae3bcea4..39202844 100644
--- a/parts/ctags2/ctags2_createtagfilebase.ui
+++ b/parts/ctags2/ctags2_createtagfilebase.ui
@@ -139,7 +139,7 @@
     <slot>createTagFile()</slot>
     <slot>validate()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 60fe4ca5..6dc0063b 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -268,7 +268,7 @@ int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const &
 {
 	if ( pattern.isEmpty() ) return -1;
 
-	// ctags interestingly escapes "/", but aptqparently nothing else. lets revert that
+	// ctags interestingly escapes "/", but apparently nothing else. lets revert that
 	TQString unescaped = pattern;
 	unescaped.tqreplace( "\\/", "/" );
 
diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui
index db02f864..3969a4f1 100644
--- a/parts/ctags2/ctags2_selecttagfilebase.ui
+++ b/parts/ctags2/ctags2_selecttagfilebase.ui
@@ -119,7 +119,7 @@
 <Q_SLOTS>
     <slot>validate()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 2ea6e4aa..2367f673 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -368,7 +368,7 @@
     <slot>moveUpTagFile()</slot>
     <slot>moveDownTagFile()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index 801a9c3d..99f150e7 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -173,7 +173,7 @@
     <slot access="private">line_edit_changed()</slot>
     <slot access="private">regeneratebutton_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui
index 7a53590b..76d21693 100644
--- a/parts/distpart/distpart_ui.ui
+++ b/parts/distpart/distpart_ui.ui
@@ -1210,8 +1210,8 @@ Build Files</string>
     <slot>slotRemoveFile(TQListBoxItem *item)</slot>
 </Q_SLOTS>
 <pixmapfunction>DesktopIcon</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui
index a24d4d79..699361be 100644
--- a/parts/documentation/addcatalogdlgbase.ui
+++ b/parts/documentation/addcatalogdlgbase.ui
@@ -199,7 +199,7 @@
     <slot>locationURLChanged( const QString &amp; )</slot>
     <slot>docTypeChanged( const QString &amp; )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui
index 7798ed79..b073b6ee 100644
--- a/parts/documentation/docglobalconfigwidgetbase.ui
+++ b/parts/documentation/docglobalconfigwidgetbase.ui
@@ -550,7 +550,7 @@
     <slot>updateConfig()</slot>
     <slot>updateIndex()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui
index 25bf023f..3476d07a 100644
--- a/parts/documentation/docprojectconfigwidgetbase.ui
+++ b/parts/documentation/docprojectconfigwidgetbase.ui
@@ -143,7 +143,7 @@
 <Q_SLOTS>
     <slot>changeDocSystem(const QString &amp;)</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/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui
index 2962e58d..6f5ea912 100644
--- a/parts/documentation/editbookmarkdlg.ui
+++ b/parts/documentation/editbookmarkdlg.ui
@@ -156,7 +156,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui
index 07989ef9..8a064022 100644
--- a/parts/documentation/editcatalogdlgbase.ui
+++ b/parts/documentation/editcatalogdlgbase.ui
@@ -187,7 +187,7 @@
 <Q_SLOTS>
     <slot>locationURLChanged( const QString &amp; )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui
index de265bfe..4321cea0 100644
--- a/parts/documentation/find_documentation_optionsbase.ui
+++ b/parts/documentation/find_documentation_optionsbase.ui
@@ -214,5 +214,5 @@ sources and change their priority here.</string>
     <slot>sourceMoveUp()</slot>
     <slot>sourceMoveDown()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui
index 19da4dab..0fa52676 100644
--- a/parts/documentation/find_documentationbase.ui
+++ b/parts/documentation/find_documentationbase.ui
@@ -159,7 +159,7 @@
     <slot>clickOnItem( TQListViewItem * item )</slot>
     <slot>buttonPressedOnItem( int button, TQListViewItem * item, const QPoint &amp; pos, int c )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="1" margin="1"/>
+<layoutdefaults spacing="1" margin="1"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index f50ceb3d..999eaf4a 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -434,9 +434,9 @@ void DocDoxygenPlugin::createBookIndex(const TQString &tagfile, IndexBox* index,
 }
 
 void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
-    DocumentationCatalogItem *item, TQDomElement &tqparentEl, const TQString &prefix)
+    DocumentationCatalogItem *item, TQDomElement &parentEl, const TQString &prefix)
 {
-    TQDomElement docEl = tqparentEl;
+    TQDomElement docEl = parentEl;
 
     TQDomElement childEl = docEl.firstChild().toElement();
     while (!childEl.isNull())
@@ -460,7 +460,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
             || (childEl.attribute("kind") == "slot")
             || (childEl.attribute("kind") == "signal") ))
         {
-            TQString classname = tqparentEl.namedItem("name").firstChild().toText().data();
+            TQString classname = parentEl.namedItem("name").firstChild().toText().data();
             TQString membername = childEl.namedItem("name").firstChild().toText().data();
             TQString anchor = childEl.namedItem("anchor").firstChild().toText().data();
             TQString arglist = childEl.namedItem("arglist").firstChild().toText().data();
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
index d24cedb9..b3755cbe 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
@@ -58,7 +58,7 @@ protected:
     void createBookIndex(const TQString &tagfile, IndexBox* index, DocumentationCatalogItem* item, const TQString &baseHtmlUrl = TQString());
     
     void createIndexFromTag(TQDomDocument &dom, IndexBox* index, DocumentationCatalogItem* item,
-        TQDomElement &tqparentEl, const TQString &prefix);
+        TQDomElement &parentEl, const TQString &prefix);
     
     void autoSetupDocs(const TQString &defaultDir, const TQString &searchDir, 
         const TQString &name);
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index dbcbb07f..6ae9b2e2 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -178,11 +178,11 @@ void ChmProtocol::get( const KURL& url )
         TQRegExp mergeParam("<param name=\"Merge\" value=\"(.*)\">", false);
         mergeParam.setMinimal(true);
 
-        std::stack<int> tqparents;
+        std::stack<int> parents;
         int counter = 1;
         int current = 0;
         int old = 0, pos = 0;
-        tqparents.push(0);
+        parents.push(0);
         while ((pos = s.tqfind(object, pos)) != -1) {
             if(htmlOutput) output += s.mid(old, pos - old);
             if(catalog) {
@@ -191,12 +191,12 @@ void ChmProtocol::get( const KURL& url )
                 int pos = 0;
                 while( (pos = ms.tqfind(ex, pos)) != -1) {
                     if(ms.mid(pos, 4) == "<UL>") {
-                        tqparents.push(current);
+                        parents.push(current);
                     } else{
-                        if(tqparents.empty()){
+                        if(parents.empty()){
                         }else{
-                            current = tqparents.top();
-                            tqparents.pop();
+                            current = parents.top();
+                            parents.pop();
                         }
                     }
                     pos++;
@@ -221,7 +221,7 @@ void ChmProtocol::get( const KURL& url )
                             KURL u = url;
                             u.setPath(bigpath + local);
                             TQString str;
-                            output += str.sprintf("%i\n%i\n", tqparents.top(), current);
+                            output += str.sprintf("%i\n%i\n", parents.top(), current);
                             output += name + "\n" + u.prettyURL() + "\n";
                         }
                         m_bIndex = 1;
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index 7b91c7fc..951c718a 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -47,10 +47,10 @@ KChmPartFactory::~KChmPartFactory()
    delete s_about;
 }
 
-KParts::Part* KChmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *,
+KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
                                  const char *name, const char *, const TQStringList & )
 {
-   KChmPart* part = new KChmPart( tqparentWidget, name );
+   KChmPart* part = new KChmPart( parentWidget, name );
    return part;
 }
 
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 37bb4695..7cbda958 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -39,7 +39,7 @@ class KChmPartFactory: public KParts::Factory
       virtual ~KChmPartFactory();
 
       virtual KParts::Part* createPartObject(
-		  TQWidget *tqparentWidget, const char *widgetName,
+		  TQWidget *parentWidget, const char *widgetName,
           TQObject *tqparent, const char *name,
 		  const char *classname, const TQStringList &args );
 
diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui
index 1d04e0a2..bf53e4a9 100644
--- a/parts/documentation/selecttopicbase.ui
+++ b/parts/documentation/selecttopicbase.ui
@@ -138,5 +138,5 @@
 <Q_SLOTS>
     <slot>newSlot()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index bf4af7ea..3414ee6d 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -329,7 +329,7 @@ InputStrList::InputStrList(const TQString & label,
 {
     TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
     
-    TQWidget *dw = new TQWidget(this); /* dummy widget used for tqlayouting */
+    TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
     TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
     le  = new KLineEdit(dw);
     lab = new TQLabel(le,label+":", this );
diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui
index 089141a2..6302f05f 100644
--- a/parts/filecreate/fcconfigwidgetbase.ui
+++ b/parts/filecreate/fcconfigwidgetbase.ui
@@ -535,6 +535,6 @@
     <slot>edit_template_content_button_clicked()</slot>
     <slot>edit_type_content_button_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui
index 6ea599e2..371c37c9 100644
--- a/parts/filecreate/fctemplateeditbase.ui
+++ b/parts/filecreate/fctemplateeditbase.ui
@@ -183,8 +183,8 @@
 <Q_SLOTS>
     <slot>init()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index 893a9be3..faf18a37 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -271,8 +271,8 @@
 <Q_SLOTS>
     <slot>init()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/parts/filecreate/file-templates/ui b/parts/filecreate/file-templates/ui
index 0a453896..670a758b 100644
--- a/parts/filecreate/file-templates/ui
+++ b/parts/filecreate/file-templates/ui
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog
index 60a0004d..e6be7b92 100644
--- a/parts/filecreate/file-templates/ui-confdialog
+++ b/parts/filecreate/file-templates/ui-confdialog
@@ -161,5 +161,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialog b/parts/filecreate/file-templates/ui-dialog
index 4b0c8bb2..92e9bfff 100644
--- a/parts/filecreate/file-templates/ui-dialog
+++ b/parts/filecreate/file-templates/ui-dialog
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb
index 2929f9e3..f369c82f 100644
--- a/parts/filecreate/file-templates/ui-dialogb
+++ b/parts/filecreate/file-templates/ui-dialogb
@@ -119,5 +119,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4
index e1b84f42..4925e2dd 100644
--- a/parts/filecreate/file-templates/ui-dialogb-qt4
+++ b/parts/filecreate/file-templates/ui-dialogb-qt4
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class=TQWIDGET_OBJECT_NAME_STRING name="tqlayoutWidget" >
+  <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" >
    <property name="geometry" >
     <rect>
      <x>20</x>
diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr
index 0b7dde40..76b7f24e 100644
--- a/parts/filecreate/file-templates/ui-dialogr
+++ b/parts/filecreate/file-templates/ui-dialogr
@@ -119,5 +119,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4
index 8e2d0608..74dbf04c 100644
--- a/parts/filecreate/file-templates/ui-dialogr-qt4
+++ b/parts/filecreate/file-templates/ui-dialogr-qt4
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class=TQWIDGET_OBJECT_NAME_STRING name="tqlayoutWidget" >
+  <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" >
    <property name="geometry" >
     <rect>
      <x>300</x>
diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin
index 4e0a093b..fd24b2f5 100644
--- a/parts/filecreate/file-templates/ui-mainwin
+++ b/parts/filecreate/file-templates/ui-mainwin
@@ -432,5 +432,5 @@
     <slot>helpContents()</slot>
     <slot>helpAbout()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog
index 3c45b07b..f7447450 100644
--- a/parts/filecreate/file-templates/ui-tabdialog
+++ b/parts/filecreate/file-templates/ui-tabdialog
@@ -143,5 +143,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-widget b/parts/filecreate/file-templates/ui-widget
index 0a453896..670a758b 100644
--- a/parts/filecreate/file-templates/ui-widget
+++ b/parts/filecreate/file-templates/ui-widget
@@ -16,5 +16,5 @@
         <string>Form1</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filecreate/file-templates/ui-wizard b/parts/filecreate/file-templates/ui-wizard
index 01338af0..b942afb2 100644
--- a/parts/filecreate/file-templates/ui-wizard
+++ b/parts/filecreate/file-templates/ui-wizard
@@ -24,5 +24,5 @@
         </attribute>
     </widget>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui
index ba22dcd7..f5ae5a6d 100644
--- a/parts/filelist/projectviewconfigbase.ui
+++ b/parts/filelist/projectviewconfigbase.ui
@@ -89,5 +89,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui
index a6b2643c..847e423d 100644
--- a/parts/filelist/projectviewprojectconfigbase.ui
+++ b/parts/filelist/projectviewprojectconfigbase.ui
@@ -87,7 +87,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui
index 9b2779f1..00687a21 100644
--- a/parts/fileview/filegroupsconfigwidgetbase.ui
+++ b/parts/fileview/filegroupsconfigwidgetbase.ui
@@ -224,6 +224,6 @@
     <slot access="protected">moveUp()</slot>
     <slot access="protected">moveDown()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index d2b1b8ad..7093ead9 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -209,7 +209,7 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
     if (!item)
         return;
 
-    // toggle open state for tqparents
+    // toggle open state for parents
     if (item->childCount() > 0)
         setOpen(item, !isOpen(item));
 
diff --git a/parts/fileview/vcscolorsconfigwidgetbase.ui b/parts/fileview/vcscolorsconfigwidgetbase.ui
index 51f93a11..c0144dcf 100644
--- a/parts/fileview/vcscolorsconfigwidgetbase.ui
+++ b/parts/fileview/vcscolorsconfigwidgetbase.ui
@@ -252,7 +252,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorcombo.h</includehint>
     <includehint>kcolorcombo.h</includehint>
diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui
index 07e16d99..4faa7f58 100644
--- a/parts/outputviews/filterdlg.ui
+++ b/parts/outputviews/filterdlg.ui
@@ -160,5 +160,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui
index 1928ad80..e5f4ef6e 100644
--- a/parts/partexplorer/partexplorerformbase.ui
+++ b/parts/partexplorer/partexplorerformbase.ui
@@ -130,8 +130,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui
index 13f8f402..17b3a1df 100644
--- a/parts/quickopen/quickopenbase.ui
+++ b/parts/quickopen/quickopenbase.ui
@@ -170,7 +170,7 @@
     <slot>slotExecuted( TQListBoxItem * )</slot>
     <slot>slotReturnPressed()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui
index 81ae7d2d..48f1d6b8 100644
--- a/parts/quickopen/quickopenfunctionchooseformbase.ui
+++ b/parts/quickopen/quickopenfunctionchooseformbase.ui
@@ -222,7 +222,7 @@
     <slot specifier="pure virtual">slotFileChange( int id )</slot>
     <slot specifier="pure virtual">slotArgsChange( int id )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 5d9b6e88..e8c26e29 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -144,7 +144,7 @@ void RegexpTestDialog::checkPOSIX()
                 regcompMessage = i18n("Invalid collating element");
                 break;
             case REG_EPAREN:
-                regcompMessage = i18n("Unmatched tqparenthesis group operators");
+                regcompMessage = i18n("Unmatched parenthesis group operators");
                 break;
             case REG_ESUBREG:
                 regcompMessage = i18n("Invalid back reference to subexpression");
diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui
index 1b5b01f9..fe6bb670 100644
--- a/parts/regexptest/regexptestdlgbase.ui
+++ b/parts/regexptest/regexptestdlgbase.ui
@@ -344,8 +344,8 @@
     <slot>somethingChanged()</slot>
     <slot access="protected">showRegExpEditor()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui
index 81d9fd68..559a226d 100644
--- a/parts/replace/replacedlg.ui
+++ b/parts/replace/replacedlg.ui
@@ -369,8 +369,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/scripting/scriptingglobalconfigbase.ui b/parts/scripting/scriptingglobalconfigbase.ui
index 155925f5..101d1e53 100644
--- a/parts/scripting/scriptingglobalconfigbase.ui
+++ b/parts/scripting/scriptingglobalconfigbase.ui
@@ -43,7 +43,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index e555115a..6a83681e 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -672,9 +672,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   dlg.setCaption(i18n("Enter Values for Variables"));
 
   TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
-  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
-  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
-  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn");
+  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+  TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
@@ -684,8 +684,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
   labTop->setText(i18n("Enter the replacement values for these variables:"));
-  tqlayoutTop->addWidget(labTop, 0, 0);
-  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
+  layoutTop->addWidget(labTop, 0, 0);
+  tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
 
 
   int i = 0;                                           //walk through the variable map and add
@@ -696,10 +696,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop );
+    layoutVar->addWidget( cb, i ,0, TQt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop );
+    layoutVar->addWidget( te, i, 1, TQt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
     i++;
   }
-  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
   btn1->setText(i18n("&Cancel"));
   btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
-  tqlayoutBtn->addWidget( btn1, 0, 0 );
+  layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
   btn2->setText(i18n("&Apply"));
   btn2->setDefault( TRUE );
   btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
-  tqlayoutBtn->addWidget( btn2, 0, 1 );
+  layoutBtn->addWidget( btn2, 0, 1 );
 
-  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
   //connect the buttons to the TQDialog default slots
@@ -763,8 +763,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     }
     bReturn = true;
 
-    iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
-    iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
+    iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height();
+    iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count();
     iWidth = dlg.tqgeometry().width();
   }
 
@@ -777,9 +777,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
     delete it2.data();
   mapVar2Cb.clear();
-  delete tqlayoutTop;
-  delete tqlayoutVar;
-  delete tqlayoutBtn;
+  delete layoutTop;
+  delete layoutVar;
+  delete layoutBtn;
   delete tqlayout;
 
   if (i==0) //if nothing happened this means, that there are no variables to translate
@@ -801,18 +801,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   dlg.setCaption(i18n("Enter Values for Variables"));
 
   TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
-  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
-  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
-  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn");
+  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+  TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  tqlayoutTop->addWidget(labTop, 0, 0);
+  layoutTop->addWidget(labTop, 0, 0);
   labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
-  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
@@ -820,8 +820,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop);
-  tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
+  layoutVar->addWidget( te, 0, 1, TQt::AlignTop);
+  layoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -832,18 +832,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
                             "If you use the same variable later, even in another snippet, the value entered to the right "
                             "will be the default value for that variable.") );
 
-  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
   btn1->setText(i18n("&Cancel"));
-  tqlayoutBtn->addWidget( btn1, 0, 0 );
+  layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
   btn2->setText(i18n("&Apply"));
   btn2->setDefault( TRUE );
-  tqlayoutBtn->addWidget( btn2, 0, 1 );
+  layoutBtn->addWidget( btn2, 0, 1 );
 
-  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
   te->setFocus();
   // --END-- building a dynamic dialog
 
@@ -872,9 +872,9 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   delete labTop;
   delete btn1;
   delete btn2;
-  delete tqlayoutTop;
-  delete tqlayoutVar;
-  delete tqlayoutBtn;
+  delete layoutTop;
+  delete layoutVar;
+  delete layoutBtn;
   delete tqlayout;
 
   return strReturn;
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index acf7841b..55bd67ad 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -203,7 +203,7 @@
 <Q_SLOTS>
     <slot>slotHelp()</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/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui
index 3d2b6a39..f5c56b99 100644
--- a/parts/snippet/snippetsettingsbase.ui
+++ b/parts/snippet/snippetsettingsbase.ui
@@ -221,7 +221,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index 1f7c9375..59a6fb21 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -47,7 +47,7 @@ public:
     {
         return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra);
     }
-    TextStructItem *tqparentStructItem()
+    TextStructItem *parentStructItem()
     { return static_cast<TextStructItem*>(tqparent()); }
     
     TQString tag;
@@ -298,10 +298,10 @@ void TextToolsWidget::parseXML()
             
             TextStructItem *closingItem = currentItem;
             while (closingItem->tqparent() && closingItem->tag != tag)
-                closingItem = closingItem->tqparentStructItem();
+                closingItem = closingItem->parentStructItem();
             if (closingItem->tqparent()) {
                 closingItem->endpos = endpos;
-                currentItem = closingItem->tqparentStructItem();
+                currentItem = closingItem->parentStructItem();
             } else {
                 kdDebug(9030) << "found no opening tag " << tag << "." << endl;
             }
@@ -378,7 +378,7 @@ void TextToolsWidget::parseLaTeX()
         kdDebug(9030) << "Match with " << tag << " and title " << title << endl;
         int level = hierarchyLevels.tqfind(tag);
         while (currentItem->tqparent() && level <= hierarchyLevels.tqfind(currentItem->tag))
-            currentItem = currentItem->tqparentStructItem();
+            currentItem = currentItem->parentStructItem();
         
         TextStructItem *item = new TextStructItem(currentItem);
         item->tag = tag;
diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui
index e17d7f37..78363581 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -235,8 +235,8 @@ executed.&lt;/p&gt;</string>
     <slot returnType="TQString">getApp()</slot>
     <slot access="private">treeSelectionChanged( TQListViewItem * lvi )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index ac1b9464..fbc02bd9 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -57,7 +57,7 @@ ToolsPart::ToolsPart(TQObject *tqparent, const char *name, const TQStringList &)
   connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
            this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
-  // Aptqparently action lists can only be plugged after the
+  // Apparently action lists can only be plugged after the
   // xmlgui client has been registered
   TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu()));
 }
diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui
index 68fbf33e..cd4a7e6f 100644
--- a/parts/tools/toolsconfigwidgetbase.ui
+++ b/parts/tools/toolsconfigwidgetbase.ui
@@ -405,6 +405,6 @@
     <slot access="protected">toolsmenuaddClicked()</slot>
     <slot access="protected">toolsmenuremoveClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui
index 4a5a8c98..864e015b 100644
--- a/parts/uimode/uichooser.ui
+++ b/parts/uimode/uichooser.ui
@@ -245,6 +245,6 @@
 <Q_SLOTS>
     <slot access="protected">maybeEnableCloseOnHover(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui
index 3bdd854c..727215ba 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -338,8 +338,8 @@
     <slot access="private" specifier="non virtual">checkBoxToggled()</slot>
     <slot>init()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
index 471e3efa..ae87176c 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
+++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
@@ -54,5 +54,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>