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

64 files changed, 140 insertions, 140 deletions

diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui
index 27ad6d5a..0ad0f62e 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -370,6 +370,6 @@
     <slot>currentChanged(TQListViewItem*)</slot>
     <slot>updateGUI()</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/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui
index 3518b3a0..a3887be6 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -454,6 +454,6 @@
     <slot>updateGUI()</slot>
     <slot>browseImplementationFile()</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/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 9ee7b8b5..1670f252 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p )
 /**
  * %{APPNAME}ConfigPage
  */
-%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
-    : Kate::PluginConfigPage( tqparentWidget )
+%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+    : Kate::PluginConfigPage( parentWidget )
 {
     TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" );
     lo->setSpacing(KDialogBase::spacingHint());
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 3082884e..3550a344 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -71,7 +71,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage
     friend class KatePlugin%{APPNAME};
 
 public:
-    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
     ~%{APPNAME}ConfigPage ();
 
     /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ).  */
diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/kconfig35/appview_base.ui
index 5852f806..3ee8d513 100644
--- a/languages/cpp/app_templates/kconfig35/appview_base.ui
+++ b/languages/cpp/app_templates/kconfig35/appview_base.ui
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui
index 8c8b9012..46a35473 100644
--- a/languages/cpp/app_templates/kconfig35/prefs-base.ui
+++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
index 92a83f43..c3780092 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
@@ -206,7 +206,7 @@
    </item>
   </tqlayout>
  </widget>
- <tqlayoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections/>
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index 98bf5f19..f1e5fdfb 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -138,7 +138,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </tqlayout>
  </widget>
- <tqlayoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
index 7cba9a36..588f9dc9 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
index 140e8df4..30849e54 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
index 7cba9a36..588f9dc9 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
index 140e8df4..30849e54 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui
index 4540c922..365f4cf2 100644
--- a/languages/cpp/app_templates/khello2/widgetbase.ui
+++ b/languages/cpp/app_templates/khello2/widgetbase.ui
@@ -48,5 +48,5 @@
 <Q_SLOTS>
     <slot>button_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui
index 2aefef82..94fb52fa 100644
--- a/languages/cpp/app_templates/kmake/mainview.ui
+++ b/languages/cpp/app_templates/kmake/mainview.ui
@@ -72,5 +72,5 @@
 <Q_SLOTS>
     <slot>slotHelloButtonClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index 034e2fb3..d020ed5e 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L;
     s_global = 0L;
 }
 
-KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    %{APPNAME}Part *part = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       part->setReadWrite( false );
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h
index 149b4b50..b0f934d9 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h
@@ -19,7 +19,7 @@ public:
     %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 );
     ~%{APPNAME}Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
index 389fb431..fe8c0cca 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
@@ -8,12 +8,12 @@
 
 #include <tqpainter.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
 }
 
-bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
+bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget )
 {
     // If nothing is loaded, do initialize here
     return TRUE;
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h
index 0ec011ae..fc67a523 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.h
@@ -13,11 +13,11 @@ class %{APPNAME}Part : public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Part( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
-    virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 );
 
     virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store );
     virtual bool loadXML( TQIODevice *, const TQDomDocument & );
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 45a8116a..479a6782 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -12,7 +12,7 @@
 #include <tqtextstream.h>
 #include <tqmultilineedit.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName,
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName,
                                   TQObject *tqparent, const char *name )
     : KParts::ReadWritePart(tqparent, name)
 {
@@ -20,7 +20,7 @@
     setInstance( %{APPNAME}PartFactory::instance() );
 
     // this should be your custom internal widget
-    m_widget = new TQMultiLineEdit( tqparentWidget, widgetName );
+    m_widget = new TQMultiLineEdit( parentWidget, widgetName );
 
     // notify the part that this is our internal widget
     setWidget(m_widget);
@@ -164,12 +164,12 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L;
     s_instance = 0L;
 }
 
-KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                         TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    %{APPNAME}Part* obj = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name );
+    %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h
index 8d5417ad..3a481c5c 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.h
+++ b/languages/cpp/app_templates/kpartapp/app_part.h
@@ -26,7 +26,7 @@ public:
     /**
      * Default constructor
      */
-    %{APPNAME}Part(TQWidget *tqparentWidget, const char *widgetName,
+    %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName,
                     TQObject *tqparent, const char *name);
 
     /**
@@ -75,7 +75,7 @@ class %{APPNAME}PartFactory : public KParts::Factory
 public:
     %{APPNAME}PartFactory();
     virtual ~%{APPNAME}PartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index 1f27cee4..0818d856 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -17,7 +17,7 @@
 typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory;
 K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
 
-%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *tqparentWidget, const char *widgetName, 
+%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, 
 		TQObject *tqparent, const char *name, const TQStringList & /*args*/)
     : KParts::ReadWritePart(tqparent)
 {
@@ -25,7 +25,7 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
     setInstance( %{APPNAMELC}PartFactory::instance() );
 
     // this should be your custom internal widget
-    m_widget = new TQMultiLineEdit( tqparentWidget, widgetName );
+    m_widget = new TQMultiLineEdit( parentWidget, widgetName );
 
     // notify the part that this is our internal widget
     setWidget(m_widget);
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h
index 39509adf..fabeedbc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h
@@ -28,7 +28,7 @@ public:
     /**
      * Default constructor
      */
-    %{APPNAMELC}Part(TQWidget *tqparentWidget, const char *widgetName,
+    %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName,
                     TQObject *tqparent, const char *name, const TQStringList & /*args*/);
 
     /**
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
index 232d6b44..006b844e 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
@@ -13,8 +13,8 @@
 #include "%{APPNAMELC}kmdiView.h"
 
 
-	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *tqparentWidget, const char *name )
-: KMdiChildView( tqparentWidget, name )
+	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name )
+: KMdiChildView( parentWidget, name )
 {
 	m_part = NULL;
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
index 31167035..8890fb59 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
@@ -17,7 +17,7 @@ class %{APPNAMELC}kmdiView : public KMdiChildView
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		%{APPNAMELC}kmdiView( TQWidget *tqparentWidget=0L, const char *name=0L );
+		%{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L );
 		virtual ~%{APPNAMELC}kmdiView();
 
 		KParts::ReadWritePart *part() { return m_part; }
diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui
index 8b3346de..7830280b 100644
--- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui
+++ b/languages/cpp/app_templates/kscons_kmdi/prefs.ui
@@ -26,5 +26,5 @@
 </widget>
 </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/appview_base.ui b/languages/cpp/app_templates/kscons_kxt/appview_base.ui
index 4604ca4b..41096b1b 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/appview_base.ui
@@ -31,5 +31,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
index 59403c40..a343c6cf 100644
--- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
@@ -122,7 +122,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
index da84ab28..e83bcda9 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
@@ -74,6 +74,6 @@
 <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"/>
 </UI>
diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui
index 5852f806..3ee8d513 100644
--- a/languages/cpp/app_templates/kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kxt/appview_base.ui
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui
index 8c8b9012..46a35473 100644
--- a/languages/cpp/app_templates/kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kxt/prefs-base.ui
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui
index 1243c341..90d39d17 100644
--- a/languages/cpp/app_templates/opieapp/examplebase.ui
+++ b/languages/cpp/app_templates/opieapp/examplebase.ui
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
index 1243c341..90d39d17 100644
--- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui
+++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 5b7e5aa5..441d1bb1 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -1780,8 +1780,8 @@ you right click on a variable in a header file.</string>
     <slot>isValidQtDir(const QString&amp;)</slot>
     <slot>openPluginPaths()</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>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui
index 1bb25fe6..a047fca3 100644
--- a/languages/cpp/classgeneratorconfigbase.ui
+++ b/languages/cpp/classgeneratorconfigbase.ui
@@ -256,6 +256,6 @@
 <Q_SLOTS>
     <slot access="protected">templateTypeChanged(int type)</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/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h
index e7e2c649..2c5f4cb2 100644
--- a/languages/cpp/codeinformationrepository.h
+++ b/languages/cpp/codeinformationrepository.h
@@ -20,7 +20,7 @@
 
 struct TypeProcessor {
     virtual TQString processType( const TQString& type ) = 0;
-    virtual TQString tqparentType() = 0;
+    virtual TQString parentType() = 0;
 };
 
 class KDevCodeRepository;
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index 3d7ff152..0c287beb 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -366,7 +366,7 @@ Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, con
 	new FlagListItem( wallBox,
 	                  "-Wmissing-braces", i18n( "<qt>Warn if an aggregate or union initializer is not fully bracketed</qt>" ) );
 	new FlagListItem( wallBox,
-	                  "-Wtqparentheses", i18n( "<qt>Warn when tqparentheses are omitted in certain contexts</qt>" ) );
+	                  "-Wparentheses", i18n( "<qt>Warn when parentheses are omitted in certain contexts</qt>" ) );
 	new FlagListItem( wallBox,
 	                  "-Wsequence-point", i18n( "<qt>Warn about code that may have undefined semantics because of\n"
 	                                            "violations of sequence point rules in the C standard</qt>" ) );
diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui
index 6a2ab252..fc47d3b2 100644
--- a/languages/cpp/configproblemreporter.ui
+++ b/languages/cpp/configproblemreporter.ui
@@ -184,6 +184,6 @@ If disabled, the parser will typically only run when the file is saved.</string>
     <slot>bgParserCheckbox_toggled( bool b )</slot>
     <slot access="protected">setDelayLabel( int delay )</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/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 08f6aa1e..3d9fcb73 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -828,7 +828,7 @@ struct CompTypeProcessor : public TypeProcessor {
 
   CompTypeProcessor( SimpleType scope, bool processArguments ) : m_scope( scope ), m_processArguments( processArguments ) {}
 
-  virtual TQString tqparentType() {
+  virtual TQString parentType() {
     return m_scope->fullType();
   }
 
@@ -1904,18 +1904,18 @@ SimpleContext* CppCodeCompletion::computeFunctionContext( FunctionDom f, int lin
 
 
       if ( !scope.isEmpty() ) {
-        SimpleType tqparentType;
+        SimpleType parentType;
         /* if( !m_cachedFromContext ) {
           TypePointer t = SimpleType(TQStringList())->locateDecType( scope.join("") ).desc().resolved();;
           if( t )
-            tqparentType = SimpleType( t.data() );
+            parentType = SimpleType( t.data() );
           else
-            tqparentType = SimpleType( scope );
+            parentType = SimpleType( scope );
         } else {*/
-	      tqparentType = SimpleType( scope, getIncludeFiles() );
+	      parentType = SimpleType( scope, getIncludeFiles() );
         //}
-        tqparentType->descForEdit().setTotalPointerDepth( 1 );
-        ctx->setContainer( tqparentType );
+        parentType->descForEdit().setTotalPointerDepth( 1 );
+        ctx->setContainer( parentType );
       }
 
       SimpleType global = ctx->global();
@@ -2564,7 +2564,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
           }
 
           if ( !scope.isEmpty() ) {
-            SimpleType tqparentType;
+            SimpleType parentType;
 
 	          /*if( !m_cachedFromContext ) {
 		          TypePointer t = createGlobalNamespace();
@@ -2584,14 +2584,14 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) {
 	            d.setIncludeFiles( getIncludeFiles() );
 	            SimpleTypeImpl * i = SimpleType( TQStringList(), getIncludeFiles() ) ->locateDecType( d ).desc().resolved().data();
               if ( i ) {
-                tqparentType = i;
+                parentType = i;
               } else {
-	              tqparentType = SimpleType( scope, getIncludeFiles() );
+	              parentType = SimpleType( scope, getIncludeFiles() );
               }
             } else {
-	            tqparentType = SimpleType( scope, getIncludeFiles() );
+	            parentType = SimpleType( scope, getIncludeFiles() );
             }
-            this_type = tqparentType;
+            this_type = parentType;
             this_type->descForEdit().setTotalPointerDepth( 1 );
             ctx->setContainer( this_type );
           }
@@ -3687,8 +3687,8 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType typeR, TQValueLis
     args << Catalog::QueryArgument( "name", fullname );
 
 
-	  TQValueList<LocateResult> tqparents = typeR->getBases( );
-    for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
+	  TQValueList<LocateResult> parents = typeR->getBases( );
+    for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) {
       if ( !( *it ) ->resolved() )
         continue;
       SimpleType tp = SimpleType( ( *it ) ->resolved() );
@@ -3812,9 +3812,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     if ( m_completionMode != SignalCompletion ) {
       if ( !type->isNamespace() ) {
         if ( num == 1 )
-          e.postfix += ";   (protected)"; // in " + proc.tqparentType() + ")";
+          e.postfix += ";   (protected)"; // in " + proc.parentType() + ")";
         if ( num == 2 )
-          e.postfix += ";   (private)"; // in " + proc.tqparentType() + ")";
+          e.postfix += ";   (private)"; // in " + proc.parentType() + ")";
       }
     }
 
@@ -3930,9 +3930,9 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList
     computeCompletionEntryList( klass->name(), type, entryList, klass->typeAliasList(), isInstance, depth );
   }
 
-	TQValueList<LocateResult> tqparents = type->getBases( );
+	TQValueList<LocateResult> parents = type->getBases( );
 
-	for ( TQValueList<LocateResult>::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
+	for ( TQValueList<LocateResult>::Iterator it = parents.begin(); it != parents.end(); ++it ) {
     if ( !( *it ) ->resolved() )
       continue;
 
diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index 5d1580e4..31d25e2c 100644
--- a/languages/cpp/cppnewclassdlgbase.ui
+++ b/languages/cpp/cppnewclassdlgbase.ui
@@ -1282,8 +1282,8 @@ Namespace1::Namespace2::...::NamespaceN</string>
     <slot access="protected">classNamespaceChanged( const QString &amp; )</slot>
     <slot access="protected">headeronly_box_stateChanged(int val)</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>classgeneratorconfig.h</includehint>
 </includehints>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index e58d3a86..384ba03e 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -871,7 +871,7 @@ TQStringList CppSupportPart::reorder( const TQStringList &list )
 	for ( it = list.begin(); it != list.end(); ++it )
 	{
 		TQString filePath = *it;
-		// brilliant stuff.. this method is aptqparently called both with
+		// brilliant stuff.. this method is apparently called both with
 		// relative and absolute paths..
 		if ( !filePath.startsWith("/") )
 		{
diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui
index b9a9bca5..fd4feaf6 100644
--- a/languages/cpp/creategettersetter.ui
+++ b/languages/cpp/creategettersetter.ui
@@ -222,7 +222,7 @@
 <Q_SLOTS>
     <slot access="protected">slotInlineChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui
index 54857eae..acc7a9ca 100644
--- a/languages/cpp/createpcsdialogbase.ui
+++ b/languages/cpp/createpcsdialogbase.ui
@@ -160,7 +160,7 @@
     <slot>slotSelected(const QString&amp;)</slot>
     <slot>slotSelectionChanged(TQListViewItem*)</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/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index aaf4476b..088aff77 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -117,7 +117,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
         menu->popup(e->globalPos());
     } else {
         moving_ = true;
-        offset_ = tqparentWidget()->pos() - e->globalPos();
+        offset_ = parentWidget()->pos() - e->globalPos();
         setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
         TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
         setPalette(TQPalette(tqcolorGroup().background()));
diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index 38048f18..a3a1e321 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -431,8 +431,8 @@ or if your executable contains the gdb stub
 <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>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui
index 17321999..51cfe410 100644
--- a/languages/cpp/debugger/debuggertracingdialogbase.ui
+++ b/languages/cpp/debugger/debuggertracingdialogbase.ui
@@ -133,7 +133,7 @@ If custom format string is not enabled, names and values of all expressions will
 <Q_SLOTS>
     <slot>enableOrDisable()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 7877a92c..ba51e871 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -327,7 +327,7 @@ TQPopupMenu* OutputText::createPopupMenu(const TQPoint&)
                                this,
                                TQT_SLOT(toggleShowInternalCommands()));
 
-    popup->setItemChecked(id, tqparent_->showInternalCommands_);
+    popup->setItemChecked(id, parent_->showInternalCommands_);
     popup->tqsetWhatsThis(
         id, 
         i18n(
@@ -348,8 +348,8 @@ void OutputText::copyAll()
 {
     /* See comments for allCommandRaw_ for explanations of
        this complex logic, as opposed to calling text(). */
-    TQStringList& raw = tqparent_->showInternalCommands_ ?
-        tqparent_->allCommandsRaw_ : tqparent_->userCommandsRaw_;
+    TQStringList& raw = parent_->showInternalCommands_ ?
+        parent_->allCommandsRaw_ : parent_->userCommandsRaw_;
     TQString text;
     for (unsigned i = 0; i < raw.size(); ++i)
         text += raw[i];
@@ -362,7 +362,7 @@ void OutputText::copyAll()
 
 void OutputText::toggleShowInternalCommands()
 {
-    tqparent_->setShowInternalCommands(!tqparent_->showInternalCommands_);
+    parent_->setShowInternalCommands(!parent_->showInternalCommands_);
 }
 
 
diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h
index ace1c00d..171fdb86 100644
--- a/languages/cpp/debugger/gdboutputwidget.h
+++ b/languages/cpp/debugger/gdboutputwidget.h
@@ -121,7 +121,7 @@ class OutputText : public TQTextEdit
 public:
     OutputText(GDBOutputWidget* tqparent) 
     : TQTextEdit(tqparent), 
-      tqparent_(tqparent)
+      parent_(tqparent)
     {}
 
     TQPopupMenu* createPopupMenu(const TQPoint& pos);
@@ -131,7 +131,7 @@ private slots:
     void toggleShowInternalCommands();
 
 private:
-    GDBOutputWidget* tqparent_;
+    GDBOutputWidget* parent_;
 };
 
 }
diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp
index d8ae62b8..46f5251b 100644
--- a/languages/cpp/debugger/gdbparser.cpp
+++ b/languages/cpp/debugger/gdbparser.cpp
@@ -97,7 +97,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
         // - composites (arrays and structures)
         // - pointers to functions. In this case type is
         //   enclosed in "{}". Not sure why it's so, as
-        //   when printing pointer, type is in tqparenthesis.
+        //   when printing pointer, type is in parenthesis.
         if (type == typePointer)
         {
             // Looks like type in braces at the beginning. Strip it.
@@ -126,7 +126,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s)
 
         // We can't find the first ')', because type can contain '(' and ')'
         // characters if its function pointer. So count opening and closing
-        // tqparentheses.
+        // parentheses.
 
         start = skipDelim(start, '(', ')');
     }
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 2b1b33b5..00141e92 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -762,9 +762,9 @@
 <entry name="dialog boxes, KSpellConfig configuration dialog" url="ch10lev1sec3.html"/>
 <entry name="dialog boxes, tqlayout, CGotoDialog example" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, tqlayout, design issues" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, hierarchies of tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, hierarchies of layouts" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, tqlayout, manual placement" url="ch08lev1sec2.html"/>
-<entry name="dialog boxes, tqlayout, nested tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="dialog boxes, tqlayout, nested layouts" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, tqlayout, QLayout classes" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, tqlayout, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="dialog boxes, modal, advantages/disadvantages" url="ch08lev1sec3.html"/>
@@ -1082,9 +1082,9 @@
 <entry name="gdb (GNU debugger)" url="ch02.html"/>
 <entry name="tqgeometry management (widgets), dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
 <entry name="tqgeometry management (widgets), dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
 <entry name="tqgeometry management (widgets), dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="tqgeometry management (widgets), dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqgeometry management (widgets), dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
 <entry name="tqgeometry management (widgets), dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
 <entry name="tqgeometry management (widgets), dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="tqgeometry management (widgets), QBoxLayout manager" url="ch04lev1sec3.html"/>
@@ -1594,9 +1594,9 @@
 <entry name="tqlayout, dialog boxes, CGotoDialog example" url="ch08lev1sec2.html"/>
 <entry name="tqlayout, dialog boxes, design guidelines" url="ch08lev1sec7.html"/>
 <entry name="tqlayout, dialog boxes, design issues" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, hierarchies of tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, hierarchies of layouts" url="ch08lev1sec2.html"/>
 <entry name="tqlayout, dialog boxes, manual placement" url="ch08lev1sec2.html"/>
-<entry name="tqlayout, dialog boxes, nested tqlayouts" url="ch08lev1sec2.html"/>
+<entry name="tqlayout, dialog boxes, nested layouts" url="ch08lev1sec2.html"/>
 <entry name="tqlayout, dialog boxes, QLayout classes" url="ch08lev1sec2.html"/>
 <entry name="tqlayout, dialog boxes, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
 <entry name="tqlayout managers, creating internally, QVBox/QHBox widgets" url="ch08lev1sec2.html"/>
@@ -2032,7 +2032,7 @@
 <entry name="navigation, drag and drop" url="ch07.html"/>
 <entry name="navigation, menubars, creating" url="ch02lev1sec4.html"/>
 <entry name="navigation, toolbars" url="ch02lev1sec4.html"/>
-<entry name="nested tqlayouts (dialog boxes)" url="ch08lev1sec2.html"/>
+<entry name="nested layouts (dialog boxes)" url="ch08lev1sec2.html"/>
 <entry name="network transparency, applications, classes" url="ch06lev1sec8.html"/>
 <entry name="network transparency, applications" url="ch06lev1sec8.html"/>
 <entry name="network transparency" url="ch01lev1sec2.html"/>
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
index a7678844..df22cab6 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
@@ -58,5 +58,5 @@
 <Q_SIGNALS>
     <signal>enabled(int)</signal>
 </Q_SIGNALS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
index de905d40..b631bfc9 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
@@ -121,7 +121,7 @@ Only the selected entry will be used</string>
 <Q_SLOTS>
     <slot>slotSelectionChanged(TQListBoxItem*)</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/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
index d3314b40..67178a73 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
@@ -69,7 +69,7 @@ Only the selected entry will be used</string>
 <Q_SLOTS>
     <slot>slotSelectionChanged(TQListBoxItem*)</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/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index fc28b901..222c7e71 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -128,7 +128,7 @@ Only the selected entry will be used</string>
 <Q_SLOTS>
     <slot>slotSelectionChanged(TQListBoxItem*)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index b496b96a..9e9d6113 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -793,7 +793,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
     }
   }
 
-  ///Ask tqparentsc
+  ///Ask parentsc
   if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) {
     LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode );
     if ( rett->resolved() )
@@ -803,7 +803,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d
         ret = rett.increaseDepth();
   }
 
-  ///Ask the bases and allow them to search in their tqparents.
+  ///Ask the bases and allow them to search in their parents.
   if ( ! ( mode & ExcludeBases ) ) {
     TypeDesc baseName = resolveTemplateParams( name, LocateBase ); ///Resolve all template-params that are at least visible in the scope of the base-declaration
     TQValueList<LocateResult> bases = getBases();
@@ -832,7 +832,7 @@ void SimpleTypeImpl::breakReferences() {
   m_desc.resetResolved();
   //	m_trace.clear();
   m_masterProxy = 0;
-  tqinvalidateCache();
+  invalidateCache();
 }
 
 TypePointer SimpleTypeImpl::bigContainer() {
@@ -848,7 +848,7 @@ SimpleType SimpleTypeImpl::tqparent() {
     return SimpleType( m_parent );
   } else {
     ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl );
-    tqinvalidateSecondaryCache();
+    invalidateSecondaryCache();
     TQStringList sc = scope();
 
     if ( !sc.isEmpty() ) {
@@ -876,7 +876,7 @@ const TypeDesc& SimpleTypeImpl::desc() {
 
 TypeDesc& SimpleTypeImpl::descForEdit() {
   desc();
-  tqinvalidateCache();
+  invalidateCache();
   return m_desc;
 }
 
@@ -942,7 +942,7 @@ TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) {
 }
 
 void SimpleTypeImpl::checkTemplateParams () {
-  tqinvalidateCache();
+  invalidateCache();
   if ( ! m_scope.isEmpty() ) {
     TQString str = m_scope.back();
     m_desc = str;
@@ -956,7 +956,7 @@ void SimpleTypeImpl::checkTemplateParams () {
 }
 
 void SimpleTypeImpl::setScope( const TQStringList& scope ) {
-  tqinvalidateCache();
+  invalidateCache();
   m_scope = scope;
   if ( m_scope.count() == 1 && m_scope.front().isEmpty() ) {
     //kdDebug() << "bad scope set " << kdBacktrace() << endl;
@@ -965,8 +965,8 @@ void SimpleTypeImpl::setScope( const TQStringList& scope ) {
 }
 
 SimpleTypeImpl::TypeOfResult SimpleTypeImpl::searchBases ( const TypeDesc& name /*option!!*/ ) {
-  TQValueList<LocateResult> tqparents = getBases();
-  for ( TQValueList<LocateResult>::iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
+  TQValueList<LocateResult> parents = getBases();
+  for ( TQValueList<LocateResult>::iterator it = parents.begin(); it != parents.end(); ++it ) {
     if ( !( *it ) ->resolved() )
       continue;
     TypeOfResult type = ( *it ) ->resolved() ->typeOf( name );
@@ -985,13 +985,13 @@ void SimpleTypeImpl::setSlaveParent( SimpleTypeImpl& slave ) {
 }
 
 void SimpleTypeImpl::parseParams( TypeDesc desc ) {
-  tqinvalidateCache();
+  invalidateCache();
   m_desc = desc;
   m_desc.clearInstanceInfo();
 }
 
 void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) {
-  tqinvalidateCache();
+  invalidateCache();
   m_desc.templateParams() = desc.templateParams();
 }
 
diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h
index 49b01ee0..d3b288c0 100644
--- a/languages/cpp/simpletype.h
+++ b/languages/cpp/simpletype.h
@@ -410,11 +410,11 @@ class SimpleTypeImpl : public KShared {
     }
 
   protected:
-    virtual void tqinvalidateCache() {}
+    virtual void invalidateCache() {}
     ;
 
     ///Secondary cache also depends on the surrounding
-    virtual void tqinvalidateSecondaryCache() {}
+    virtual void invalidateSecondaryCache() {}
 
     virtual void setSecondaryCacheActive( bool active ) {
       Q_UNUSED( active );
@@ -422,7 +422,7 @@ class SimpleTypeImpl : public KShared {
 
     ///Primary cache is the one associated only with this object. It must only be cleared
     ///when the object pointed to changes
-    virtual void tqinvalidatePrimaryCache( bool onlyNegative = false ) {}
+    virtual void invalidatePrimaryCache( bool onlyNegative = false ) {}
 
     static TQString operatorToString( Operator op );
 
@@ -483,7 +483,7 @@ class SimpleTypeImpl : public KShared {
     ///sets the tqparent-type(type this one is nested in)
     void setParent( TypePointer tqparent ) {
       if( tqparent == m_parent ) return;
-      tqinvalidateSecondaryCache();
+      invalidateSecondaryCache();
       if ( &( *tqparent ) == this ) {
         kdDebug( 9007 ) << "setSlaveParent error\n" << kdBacktrace() << endl;
         return ;
diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h
index 6744d5d8..9d6ed77a 100644
--- a/languages/cpp/simpletypecachebinder.h
+++ b/languages/cpp/simpletypecachebinder.h
@@ -293,7 +293,7 @@ class SimpleTypeCacheBinder : public Base {
     return new SimpleTypeCacheBinder<Base>( this );
    }
 
-   virtual void tqinvalidatePrimaryCache( bool  onlyNegative ) {
+   virtual void invalidatePrimaryCache( bool  onlyNegative ) {
     //if( !m_memberCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" primary caches cleared" << endl;
     if ( !onlyNegative)
      m_memberCache.clear();
@@ -307,7 +307,7 @@ class SimpleTypeCacheBinder : public Base {
     }
     m_classListCache.clear();
    }
-   virtual void tqinvalidateSecondaryCache() {
+   virtual void invalidateSecondaryCache() {
     //if( !m_locateCache.isEmpty() ) dbg() << "\"" << Base::str() << "\" secondary caches cleared" << endl;
     m_locateCache.clear();
     m_haveBasesCache = false;
@@ -322,9 +322,9 @@ class SimpleTypeCacheBinder : public Base {
     primaryActive = active;
    }
 
-   virtual void tqinvalidateCache() {
-    tqinvalidatePrimaryCache( false );
-    tqinvalidateSecondaryCache();
+   virtual void invalidateCache() {
+    invalidatePrimaryCache( false );
+    invalidateSecondaryCache();
    };
   };
 
diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp
index 9afdea75..f662acc5 100644
--- a/languages/cpp/simpletypecatalog.cpp
+++ b/languages/cpp/simpletypecatalog.cpp
@@ -279,13 +279,13 @@ TQStringList SimpleTypeCatalog::getBaseStrings() {
 
  TQStringList ret;
  TQMap<TQString, bool> bases;
-// try with tqparentsc
+// try with parentsc
  TQTime t;
  t.restart();
- TQValueList<Tag> tqparents( getBaseClassList() );
+ TQValueList<Tag> parents( getBaseClassList() );
 
- TQValueList<Tag>::Iterator it = tqparents.begin();
- while ( it != tqparents.end() ) {
+ TQValueList<Tag>::Iterator it = parents.begin();
+ while ( it != parents.end() ) {
   Tag & tag = *it;
   ++it;
 
diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp
index d0c2c2af..4edaddba 100644
--- a/languages/cpp/simpletypefunction.cpp
+++ b/languages/cpp/simpletypefunction.cpp
@@ -455,7 +455,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeCodeModel::findMember( TypeDesc name , Memb
   if ( ret.memberType == MemberInfo::Function || ret.memberType == MemberInfo::Variable || ret.memberType == MemberInfo::Template || ret.memberType == MemberInfo::Typedef || ret.memberType == MemberInfo::NestedType ) {
     //For redirected types it is necessary to add the include-files of the context they were searched in.
     //That is not quite correct, but it makes sure that at least the same namespace-aliases will be activated while the search for the type,
-    //Which is necessary because the alias is tqparented by exactly this class.
+    //Which is necessary because the alias is parented by exactly this class.
 
     ret.type->addIncludeFiles( name.includeFiles() );
   }
@@ -553,8 +553,8 @@ TQStringList SimpleTypeCodeModel::getBaseStrings() {
 
   if ( !m_item || ( klass = dynamic_cast<ClassModel*>( & ( *m_item ) ) ) == 0 ) return ret;
 
-  TQStringList tqparents = klass->baseClassList();
-  for ( TQStringList::Iterator it = tqparents.begin(); it != tqparents.end(); ++it ) {
+  TQStringList parents = klass->baseClassList();
+  for ( TQStringList::Iterator it = parents.begin(); it != parents.end(); ++it ) {
     ret << *it;
   }
 
diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp
index 048eb9ad..cbd128eb 100644
--- a/languages/cpp/simpletypenamespace.cpp
+++ b/languages/cpp/simpletypenamespace.cpp
@@ -224,8 +224,8 @@ void SimpleTypeNamespace::addAliasMap( const TypeDesc& name, const TypeDesc& ali
   if ( symmetric )
     addAliasMap( alias, name, files, recurse, false );
 
-  tqinvalidateSecondaryCache();
-  tqinvalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached)
+  invalidateSecondaryCache();
+  invalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached)
 
   AliasMap::iterator it = m_aliases.tqfind( name.name() );
   if ( it == m_aliases.end() )
@@ -302,7 +302,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/*
 #ifdef PHYSICALLY_IMPORT_NAMESPACES
         if ( desc.resolved()->masterProxy().data() != this ) {
           desc.setResolved( desc.resolved()->clone() ); //expensive, cache is not shared
-          desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the tqparents of all found members correctly
+          desc.resolved()->setMasterProxy( this ); //Possible solution: don't use this, simply set the parents of all found members correctly
         }
 #endif
         d.first.first = desc;
@@ -344,15 +344,15 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files )
   }
 }
 
-void SimpleTypeNamespace::tqinvalidatePrimaryCache( bool onlyNegative ) {
+void SimpleTypeNamespace::invalidatePrimaryCache( bool onlyNegative ) {
   //m_slavesCache.clear();
-  SimpleTypeImpl::tqinvalidatePrimaryCache( onlyNegative );
+  SimpleTypeImpl::invalidatePrimaryCache( onlyNegative );
 }
 
 void SimpleTypeNamespace::addImport( const TypeDesc& import, const IncludeFiles& files, TypePointer perspective ) {
   //ifVerbose( dbg() << "
   if ( !perspective ) perspective = this;
-  tqinvalidateCache();
+  invalidateCache();
   TypeDesc d = import;
   if ( d.resolved() ) {
     #ifdef PHYSICALLY_IMPORT_NAMESPACES
diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h
index ab5131c7..b465cfb6 100644
--- a/languages/cpp/simpletypenamespace.h
+++ b/languages/cpp/simpletypenamespace.h
@@ -135,7 +135,7 @@ class SimpleTypeNamespace : public SimpleTypeImpl {
       return true;
     }
 
-    virtual void tqinvalidatePrimaryCache( bool onlyNegative = false );
+    virtual void invalidatePrimaryCache( bool onlyNegative = false );
   
     virtual MemberInfo findMember( TypeDesc name, MemberInfo::MemberType type =  MemberInfo::AllTypes );
 
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 62b154da..27b08f27 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -144,7 +144,7 @@ m_newFileNames(dummy), m_cppSupport( cppSupport )
 	for (ClassList::const_iterator classIt = myClasses.begin(); classIt != myClasses.end(); ++classIt)
 	{
 		kdDebug() << "base class " << baseClass << " class " << (*classIt)->name()
-			<< " tqparents " << (*classIt)->baseClassList().join(",") << endl;
+			<< " parents " << (*classIt)->baseClassList().join(",") << endl;
 		if ( (*classIt)->baseClassList().tqfindIndex(baseClass) != -1 )
 		{
 			kdDebug() << "base class matched " << endl;
diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui
index a43beb05..6984dcf6 100644
--- a/languages/cpp/subclassingdlgbase.ui
+++ b/languages/cpp/subclassingdlgbase.ui
@@ -239,6 +239,6 @@
 <Q_SLOTS>
     <slot>onChangedClassName()</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/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index b238b734..757b4eae 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -590,7 +590,7 @@ void TypeDesc::makeDataPrivate() {
   if ( m_data.count() > 1 ) {
     m_data = new TypeDescData( *m_data );
   }
-	m_data->tqinvalidateKey();
+	m_data->invalidateKey();
 }
 
 TypeDesc& TypeDesc::makePrivate() {
diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h
index 0759b74e..ddb072d2 100644
--- a/languages/cpp/typedesc.h
+++ b/languages/cpp/typedesc.h
@@ -158,7 +158,7 @@ struct TypeDescData : public KShared {
 
 	TypeDescData() : m_hashValid( false ), m_hash2Valid( false ) {
 	}
-	void tqinvalidateKey() {
+	void invalidateKey() {
 		m_hashValid = false;
 		m_hash2Valid = false;
 	}