Rename obsolete tq methods to standard names

(cherry picked from commit abcbb684982167791304dc2fe0bc979489506b43)

45 files changed, 225 insertions, 225 deletions

diff --git a/languages/ada/ada.g b/languages/ada/ada.g
index 8c073e23..5f97952b 100644
--- a/languages/ada/ada.g
+++ b/languages/ada/ada.g
@@ -1773,7 +1773,7 @@ tokens {
   // part 3: Non-RM synthetic tokens.
   // They exist mainly to normalize the node structure with respect to
   // optional items. (Without them, the presence or absence of an optional
-  // item would change the node tqlayout, but we want a fixed tqlayout.)
+  // item would change the node layout, but we want a fixed layout.)
   ABSTRACT_FUNCTION_DECLARATION;
   ABSTRACT_PROCEDURE_DECLARATION;
   ACCESS_TO_FUNCTION_DECLARATION;
diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp
index acbc5bf4..68607851 100644
--- a/languages/ada/backgroundparser.cpp
+++ b/languages/ada/backgroundparser.cpp
@@ -25,7 +25,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter,
                                     const TQString& source,
                                     const TQString& filename )
     : m_reporter( reporter ),
-      m_source( source.tqunicode(), source.length() ),
+      m_source( source.unicode(), source.length() ),
       m_fileName( filename )
 {
 }
diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui
index 0ca00eb4..4e42f714 100644
--- a/languages/cpp/addattributedialogbase.ui
+++ b/languages/cpp/addattributedialogbase.ui
@@ -79,7 +79,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -133,7 +133,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -178,7 +178,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui
index 40a59154..a8048708 100644
--- a/languages/cpp/addmethoddialogbase.ui
+++ b/languages/cpp/addmethoddialogbase.ui
@@ -90,7 +90,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -144,7 +144,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -189,7 +189,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index 5f9d906a..32afca2e 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -17,7 +17,7 @@
     : TQWidget(parent),
       DCOPObject("%{APPNAME}Iface")
 {
-    // setup our tqlayout manager to automatically add our widgets
+    // setup our layout manager to automatically add our widgets
     TQHBoxLayout *top_layout = new TQHBoxLayout(this);
     top_layout->setAutoAdd(true);
 
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp
index 673df14e..ff83190f 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/kapp/pref.cpp
@@ -25,8 +25,8 @@
 %{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    layout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
@@ -34,8 +34,8 @@
 %{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    layout->setAutoAdd(true);
 
     new TQLabel(i18n("Add something here"), this);
 }
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
index f85bd963..6738a789 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
@@ -15,7 +15,7 @@
   <property name="autoFillBackground" >
    <bool>true</bool>
   </property>
-  <tqlayout class="TQGridLayout" >
+  <layout class="TQGridLayout" >
    <property name="leftMargin" >
     <number>11</number>
    </property>
@@ -204,7 +204,7 @@
      </property>
     </widget>
    </item>
-  </tqlayout>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index 3a78c979..87a191f1 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -9,7 +9,7 @@
     <height>156</height>
    </rect>
   </property>
-  <tqlayout class="TQGridLayout" >
+  <layout class="TQGridLayout" >
    <item row="0" column="0" >
     <widget class="TQLabel" name="textLabel2_2" >
      <property name="text" >
@@ -136,7 +136,7 @@ p, li { white-space: pre-wrap; }
      </property>
     </spacer>
    </item>
-  </tqlayout>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
index 006b844e..d7c00001 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
@@ -35,9 +35,9 @@
 			part()->widget()->setFocus();
 			setFocusProxy(part()->widget());
 
-			TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" );
+			TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" );
 			part()->widget()->reparent( this, TQPoint(0, 0) );
-			tqlayout->addWidget( part()->widget() );
+			layout->addWidget( part()->widget() );
 
 			// connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) );
 		}
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
index 6a7bef4f..a4c2e177 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
@@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){
 	
 	/*
 	 *  Send the key
-	 * ke is the tqunicode
+	 * ke is the unicode
 	 * _ke + 0x41 is the keycode
 	 *  m_state Normally the state 
 	 * down/up
diff --git a/languages/cpp/app_templates/qtopia4app/examplebase.ui b/languages/cpp/app_templates/qtopia4app/examplebase.ui
index 76e7d49f..107d4e96 100644
--- a/languages/cpp/app_templates/qtopia4app/examplebase.ui
+++ b/languages/cpp/app_templates/qtopia4app/examplebase.ui
@@ -15,7 +15,7 @@
     <property name="windowTitle" >
       <string>%{APPNAME}</string>
     </property>
-    <tqlayout class="TQVBoxLayout" >
+    <layout class="TQVBoxLayout" >
       <property name="margin" >
         <number>11</number>
       </property>
@@ -39,6 +39,6 @@
           </property>
         </widget>
       </item>
-    </tqlayout>
+    </layout>
   </widget>
 </ui>
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 32ef470d..2ed0cf58 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -561,7 +561,7 @@ void CCConfigWidget::openPluginPaths()
     kdDebug(9024) << "Plugin paths opened" << endl;
     QtBuildConfig* c = m_pPart->qtBuildConfig();
     KDialog d( this );
-    TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d );
+    TQVBoxLayout* mainlayout = new TQVBoxLayout( &d );
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
     connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept()));
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d );
@@ -576,8 +576,8 @@ void CCConfigWidget::openPluginPaths()
     req->setMode( KFile::Directory );
     KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d );
     p->insertStringList( c->designerPluginPaths() );
-    maintqlayout->addWidget( p );
-    maintqlayout->addLayout( btns );
+    mainlayout->addWidget( p );
+    mainlayout->addLayout( btns );
     d.resize( 450, 250 );
     if( d.exec() == TQDialog::Accepted)
     {
diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui
index 5daf1e34..dae89168 100644
--- a/languages/cpp/ccconfigwidgetbase.ui
+++ b/languages/cpp/ccconfigwidgetbase.ui
@@ -36,7 +36,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -77,7 +77,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout13</cstring>
+                                            <cstring>layout13</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -227,7 +227,7 @@ completion-box.</string>
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout14</cstring>
+                                            <cstring>layout14</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -299,7 +299,7 @@ argument hint</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -397,7 +397,7 @@ Note: Parsing may become very slow when this is enabled
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout6</cstring>
+                                            <cstring>layout6</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -605,7 +605,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout6</cstring>
+                                    <cstring>layout6</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -905,7 +905,7 @@ This option only applies to QMake projects.</string>
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -974,7 +974,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1006,7 +1006,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout8</cstring>
+                                    <cstring>layout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1149,7 +1149,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1178,7 +1178,7 @@ This option only applies to QMake projects.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1250,7 +1250,7 @@ This option only applies to QMake projects.</string>
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>tqlayout5_2</cstring>
+                                    <cstring>layout5_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index 9ce8307c..a886374f 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -101,9 +101,9 @@ private:
 GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
-	tqlayout->addSpacing( 10 );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this );
 	new FlagCheckBox( output_group, controller,
@@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
 	                  "-save-temps", i18n( "Do not delete intermediate output like assembler files" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addSpacing( 10 );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
 	if ( type != GccOptionsPlugin::GPP )
@@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
 	                  "-short-double", i18n( "Make 'double' the same as 'float'" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 
@@ -167,8 +167,8 @@ void GeneralTab::writeFlags( TQStringList *list )
 OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this );
 	Odefault = new TQRadioButton( i18n( "Default" ), group );
@@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent,
 	}
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 
@@ -264,9 +264,9 @@ void OptimizationTab::writeFlags( TQStringList *list )
 G77Tab::G77Tab( TQWidget *parent, const char *name )
 		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
-	tqlayout->addSpacing( 10 );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this );
 	new FlagCheckBox( dialect_group, controller,
@@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
 	                  "-fonetrip", i18n( "DO loops are executed at least once" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addSpacing( 10 );
+	layout->addSpacing( 10 );
 
 	TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
 	new FlagCheckBox( codegen_group, controller,
@@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
 	                  "-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) );
 
 	TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 
@@ -319,8 +319,8 @@ void G77Tab::writeFlags( TQStringList *list )
 Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name ), controller( new FlagCheckBoxController )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	new FlagCheckBox( this, controller,
 	                  "-w", i18n( "Inhibit all warnings" ) );
@@ -417,8 +417,8 @@ void Warnings1Tab::writeFlags( TQStringList *list )
 Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
 		: TQWidget( parent, name )
 {
-	TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
-	tqlayout->setAutoAdd( true );
+	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+	layout->setAutoAdd( true );
 
 	wrestBox = new FlagListBox( this );
 
@@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
 	                        "deprecated by using the 'deprecated' attribute</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wpacked", i18n( "<qt>Warn if a structure is given the packed attribute, but the packed\n"
-	                                    "attribute has no effect on the tqlayout or size of the structure</qt>" ) );
+	                                    "attribute has no effect on the layout or size of the structure</qt>" ) );
 	new FlagListItem( wrestBox,
 	                  "-Wpadded", i18n( "<qt>Warn if padding is included in a structure, either to align an\n"
 	                                    "element of the structure or to align the whole structure</qt>" ) );
diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui
index 0e03bec2..d752d715 100644
--- a/languages/cpp/configproblemreporter.ui
+++ b/languages/cpp/configproblemreporter.ui
@@ -62,7 +62,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui
index f4d3a399..3e61701b 100644
--- a/languages/cpp/cppnewclassdlgbase.ui
+++ b/languages/cpp/cppnewclassdlgbase.ui
@@ -446,7 +446,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>tqlayout5</cstring>
+                                    <cstring>layout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -640,7 +640,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout4</cstring>
+                                        <cstring>layout4</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index bde8d623..e96d7395 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     buttonbox->addStretch();
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     TQPushButton *cancel   = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->tqlayout();
+    buttonbox->layout();
     topLayout->addWidget(buttonbox);
 
     connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
index eee96cb9..72bb4c93 100644
--- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui
+++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui
@@ -102,7 +102,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -208,7 +208,7 @@ check this option.</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -303,7 +303,7 @@ check this option.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 89497fb2..af608d22 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -1234,7 +1234,7 @@ TQWidget* ComplexEditCell::createEditor() const
     TQPushButton* b = new TQPushButton("...", box);
     // This is exactly what is done in TQDesigner source in the
     // similar context. Haven't had any success making the good look
-    // with tqlayout, I suppose that sizeHint for button is always larger
+    // with layout, I suppose that sizeHint for button is always larger
     // than 20.
     b->setFixedWidth( 20 );
 
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index a3a35faa..c5a25e50 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -356,8 +356,8 @@ void OutputText::copyAll()
 
     // Make sure the text is pastable both with Ctrl-C and with
     // middle click.
-    TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
-    TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
+    TQApplication::clipboard()->setText(text, TQClipboard::Clipboard);
+    TQApplication::clipboard()->setText(text, TQClipboard::Selection);
 }
 
 void OutputText::toggleShowInternalCommands()
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index e61c7d29..3c136fbe 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -84,7 +84,7 @@ namespace GDBDebugger
         {
             TQVBoxLayout* l = new TQVBoxLayout(this);
 
-            // Grid tqlayout: labels + address field
+            // Grid layout: labels + address field
             TQGridLayout* gl = new TQGridLayout(l);
 
             gl->setColSpacing(0, 2);
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 0803fa82..c37822bd 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
 
 void VariableTree::copyToClipboard(TQListViewItem* item)
 {
-    TQClipboard *qb = KApplication::tqclipboard();
+    TQClipboard *qb = KApplication::clipboard();
     TQString text = item->text( 1 );
 
     qb->setText( text, TQClipboard::Clipboard );
@@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs)
             s = s.mid(i+2);
     }
 
-    // A hack to nicely display TQStrings. The content of TQString is tqunicode
+    // A hack to nicely display TQStrings. The content of TQString is unicode
     // for for ASCII only strings we get ascii character mixed with \000.
     // Remove those \000 now.
 
@@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes()
         else
             varTree->controller()->addCommand(
                 new ValueSpecialRepresentationCommand(
-                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\""));
+                    this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\""));
 
         return true;
     }
@@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     if (!alive_)
     {
         /* Draw this as disabled. */
-        TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(),
+        TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(),
                                  column, width, align);
     }
     else
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index 6f0ac590..19fd0db1 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
@@ -35,7 +35,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index bc314743..89d32931 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() {
 
     int len = m_cleanName.length();
     for ( int a = 0; a < len; a++ )
-			ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1));
+			ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1));
 
 
     int n = 1;
@@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() {
 	
 		int len = m_cleanName.length();
 		for ( int a = 0; a < len; a++ )
-			ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1));
+			ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1));
 	
 	
 		int n = 1;
diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
index c8137575..e2b0ccd3 100644
--- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
+++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp
@@ -115,8 +115,8 @@ private:
 OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *group = new TQVButtonGroup(i18n("Optimization Level"), this);
     Odefault = new TQRadioButton(i18n("Default"), group);
@@ -137,7 +137,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent,
         optBox = 0;
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 
@@ -198,8 +198,8 @@ void OptimizationTab::writeFlags(TQStringList *list)
 HpfTab::HpfTab(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     hpfBox = new TQListView(this);
     hpfBox->addColumn(TQString());
@@ -208,7 +208,7 @@ HpfTab::HpfTab(TQWidget *parent, const char *name)
         new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox);
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 
diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp
index 4dafc60e..fab59972 100644
--- a/languages/java/JavaRecognizer.hpp
+++ b/languages/java/JavaRecognizer.hpp
@@ -103,7 +103,7 @@
  *		o  supports UNICODE?
  *		   Using Unicode charVocabulay makes code file big, but only
  *		   in the bitsets at the end. I need to make ANTLR generate
- *		   tqunicode bitsets more efficiently.
+ *		   unicode bitsets more efficiently.
  * Version 1.19 (April 25, 2002)
  *		Terence added in nice fixes by John Pybus concerning floating
  *		constants and problems with super() calls.  John did a nice
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index fc25a273..1ead5458 100644
--- a/languages/java/app_templates/kappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
@@ -25,7 +25,7 @@ public class %{APPNAME}View extends QWidget
 public %{APPNAME}View(QWidget parent)
 {
     super(parent, null);
-    // setup our tqlayout manager to automatically add our widgets
+    // setup our layout manager to automatically add our widgets
     top_layout = new QHBoxLayout(this);
     top_layout.setAutoAdd(true);
 
diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java
index 48e1ca6a..a50fdb31 100644
--- a/languages/java/app_templates/kappjava/pref.java
+++ b/languages/java/app_templates/kappjava/pref.java
@@ -31,8 +31,8 @@ public class %{APPNAME}PrefPageOne extends QFrame {
 public %{APPNAME}PrefPageOne(QWidget parent)
 {
     super(parent);
-    QHBoxLayout tqlayout = new QHBoxLayout(this);
-    tqlayout.setAutoAdd(true);
+    QHBoxLayout layout = new QHBoxLayout(this);
+    layout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
@@ -42,8 +42,8 @@ public class %{APPNAME}PrefPageTwo extends QFrame {
 public %{APPNAME}PrefPageTwo(QWidget parent)
 {
     super(parent);
-    QHBoxLayout tqlayout = new QHBoxLayout(this);
-    tqlayout.setAutoAdd(true);
+    QHBoxLayout layout = new QHBoxLayout(this);
+    layout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index 8475a284..a4852fd5 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/languages/java/java.g b/languages/java/java.g
index 64902409..1f825ec5 100644
--- a/languages/java/java.g
+++ b/languages/java/java.g
@@ -97,7 +97,7 @@ options {
  *		o  supports UNICODE?
  *		   Using Unicode charVocabulay makes code file big, but only
  *		   in the bitsets at the end. I need to make ANTLR generate
- *		   tqunicode bitsets more efficiently.
+ *		   unicode bitsets more efficiently.
  * Version 1.19 (April 25, 2002)
  *		Terence added in nice fixes by John Pybus concerning floating
  *		constants and problems with super() calls.  John did a nice
@@ -1050,7 +1050,7 @@ options {
 	k=4;                   // four characters of lookahead
 //	charVocabulary='\u0003'..'\uFFFF';
 	charVocabulary='\u0003'..'\u00FF';
-	// without inlining some bitset tests, couldn't do tqunicode;
+	// without inlining some bitset tests, couldn't do unicode;
 	// I need to make ANTLR generate smaller bitsets; see
 	// bottom of JavaLexer.java
 	codeGenBitsetTestThreshold=20;
diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui
index 03a16d7e..6118902c 100644
--- a/languages/lib/designer_integration/implementationwidgetbase.ui
+++ b/languages/lib/designer_integration/implementationwidgetbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -135,7 +135,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -169,7 +169,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="0">
                     <property name="name">
-                        <cstring>tqlayout2_2</cstring>
+                        <cstring>layout2_2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp
index be9a1909..ff202374 100644
--- a/languages/pascal/backgroundparser.cpp
+++ b/languages/pascal/backgroundparser.cpp
@@ -24,7 +24,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter,
                                     const TQString& source,
                                     const TQString& filename )
     : m_reporter( reporter ),
-      m_source( source.tqunicode(), source.length() ),
+      m_source( source.unicode(), source.length() ),
       m_fileName( filename )
 {
 }
diff --git a/languages/pascal/compiler/dccoptions/optiontabs.cpp b/languages/pascal/compiler/dccoptions/optiontabs.cpp
index 58025ad6..94c8b35c 100644
--- a/languages/pascal/compiler/dccoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/dccoptions/optiontabs.cpp
@@ -26,8 +26,8 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     pathController(new FlagPathEditController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this);
     TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group);
@@ -39,19 +39,19 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     new FlagRadioButton(map_group, radioController,
                      "-GD", i18n("Detailed"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagPathEdit(this, "", pathController,
                      "--dynamicloader=", i18n("Default dynamic loader:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController,
                      "-$M", i18n("Reserved address space:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -80,8 +80,8 @@ void LinkerTab::writeFlags( TQStringList * str )
 LocationsTab::LocationsTab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), pathController(new FlagPathEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagPathEdit(this, ":", pathController,
                      "-I", i18n("Include search path (delimited by \":\"):"));
@@ -92,7 +92,7 @@ LocationsTab::LocationsTab( TQWidget * parent, const char * name )
     new FlagPathEdit(this, ":", pathController,
                      "-O", i18n("Object search path (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 LocationsTab::~LocationsTab( )
@@ -115,8 +115,8 @@ void LocationsTab::writeFlags( TQStringList * str )
 Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), pathController(new FlagPathEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagPathEdit(this, "", pathController,
                      "-E", i18n("Executable output directory:"));
@@ -127,7 +127,7 @@ Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
     new FlagPathEdit(this, "", pathController,
                      "-LN", i18n("Package source code directory:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 Locations2Tab::~Locations2Tab( )
@@ -151,8 +151,8 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this);
     new FlagCheckBox(build_group, controller,
@@ -165,7 +165,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
                      "-Z", i18n("Disable implicit package compilation"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@@ -173,7 +173,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
     new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this);
     new FlagCheckBox(message_group, controller,
@@ -182,12 +182,12 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
                      "-W", i18n("Output warning messages"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
     TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this);
     new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 GeneralTab::~GeneralTab( )
@@ -215,10 +215,10 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     listController(new FlagEditController()),
     radioController(new FlagRadioButtonController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
-    TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint());
+    TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint());
 
     TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this);
     TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group);
@@ -234,7 +234,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(align_group, controller,
                      "'-$W+'", i18n("Generate stack frames"), "'-$W-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout2->addWidget(align_group, 0, 0);
+    layout2->addWidget(align_group, 0, 0);
 
     TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this);
     TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group);
@@ -246,7 +246,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagRadioButton(enum_group, radioController,
                      "'-$Z4'", i18n("Unsigned double word (4096M values)"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout2->addWidget(enum_group, 0, 1);
+    layout2->addWidget(enum_group, 0, 1);
 
     TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
     new FlagCheckBox(compile_group, controller,
@@ -266,7 +266,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compile_group, controller,
                      "'-$J+'", i18n("Writable typed constants"), "'-$J-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout2->addWidget(compile_group, 1, 0);
+    layout2->addWidget(compile_group, 1, 0);
 
     TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
     new FlagCheckBox(run_group, controller,
@@ -280,9 +280,9 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(run_group, controller,
                      "'-$R+'", i18n("Range checking"), "'-$R-'");
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout2->addWidget(run_group, 1, 1);
+    layout2->addWidget(run_group, 1, 1);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 CodegenTab::~CodegenTab( )
@@ -312,17 +312,17 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     radioController(new FlagRadioButtonController)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
     TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this);
     new FlagCheckBox(optim_group, controller,
                      "'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'");
-    tqlayout->addWidget(optim_group);
+    layout->addWidget(optim_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
     new FlagCheckBox(debug_group, controller,
@@ -335,7 +335,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-VN", i18n("Namespace debug info"));
     symboldb = new FlagCheckBox(debug_group, controller,
                      "-VR", i18n("Write symbol info in an .rsm file"));
-    tqlayout2->addWidget(debug_group);
+    layout2->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this);
@@ -347,20 +347,20 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "'-$YD'", i18n("Definition information"));
     new FlagRadioButton(debug_add, radioController,
                         "'-$Y+'", i18n("Full reference information"));
-    tqlayout2->addWidget(debug_add);
+    layout2->addWidget(debug_add);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    tqlayout3->addWidget(release);
-    tqlayout3->addWidget(debug);
+    layout3->addWidget(release);
+    layout3->addWidget(debug);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
diff --git a/languages/pascal/compiler/fpcoptions/optiontabs.cpp b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
index 5dd69349..445ab826 100644
--- a/languages/pascal/compiler/fpcoptions/optiontabs.cpp
+++ b/languages/pascal/compiler/fpcoptions/optiontabs.cpp
@@ -26,14 +26,14 @@
 FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
     : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this);
     new FlagCheckBox(output_group, controller,
                      "-vr", i18n("Format errors like GCC does"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this);
     new FlagCheckBox(verbose_group, controller,
@@ -54,7 +54,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
                      "-vd", i18n("Write other debugging info"));
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this);
     new FlagCheckBox(other_group, controller,
@@ -74,7 +74,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
 
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 FeedbackTab::~FeedbackTab()
@@ -98,8 +98,8 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     pathController(new FlagPathEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagPathEdit(this, ":", pathController,
                      "-Fu", i18n("Unit search path (delimited by \":\"):"));
@@ -110,7 +110,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
     new FlagPathEdit(this, ":", pathController,
                      "-Fl", i18n("Library search path (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 FilesAndDirectoriesTab::~FilesAndDirectoriesTab( )
@@ -135,8 +135,8 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
     :TQWidget(parent, name), controller(new FlagCheckBoxController()),
     pathController(new FlagPathEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagPathEdit(this, "", pathController,
                      "-FE", i18n("Write executables and units in:"));
@@ -145,14 +145,14 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
     new FlagPathEdit(this, "", pathController,
                      "-o", i18n("Executable name:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(20);
+    layout->addSpacing(20);
 
     new FlagPathEdit(this, "", pathController,
                      "-e", i18n("Location of as and ld programs:"));
     new FlagPathEdit(this, "", pathController,
                      "-FL", i18n("Dynamic linker executable:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(20);
+    layout->addSpacing(20);
 
     new FlagPathEdit(this, "", pathController,
                      "-Fr", i18n("Compiler messages file:"), KFile::File);
@@ -160,7 +160,7 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
                      "-Fe", i18n("Write compiler messages to file:"), KFile::File);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( )
@@ -185,8 +185,8 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str )
 LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this);
     new FlagCheckBox(compat_group, controller,
@@ -198,7 +198,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compat_group, controller,
                      "-Sp", i18n("GNU Pascal compatibility mode"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this);
     new FlagCheckBox(ccompat_group, controller,
@@ -208,7 +208,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
     new FlagCheckBox(ccompat_group, controller,
                      "-Sm", i18n("Support C style macros"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this);
     new FlagCheckBox(lang_group, controller,
@@ -221,7 +221,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
                      "-St", i18n("Allow the static keyword in objects"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  LanguageTab::~ LanguageTab( )
@@ -243,10 +243,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     asmController(new FlagRadioButtonController)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this);
     new FlagCheckBox(info_group, controller,
@@ -257,9 +257,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                      "-ar", i18n("List register allocation and release info"));
     new FlagCheckBox(info_group, controller,
                      "-at", i18n("List temporary allocations and deallocations"));
-    tqlayout2->addWidget(info_group);
+    layout2->addWidget(info_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    //tqlayout->addSpacing(10);
+    //layout->addSpacing(10);
 
     TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this);
     TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group);
@@ -270,9 +270,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                         "-Rintel", i18n("Intel style assembler"));
     new FlagRadioButton(asmkind_group, asmController,
                         "-Rdirect", i18n("Direct assembler"));
-    tqlayout2->addWidget(asmkind_group);
+    layout2->addWidget(asmkind_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
 
     TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this);
@@ -298,10 +298,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
                         "-Acoff", i18n("Use coff"));
     new FlagRadioButton(asm_group, asmController,
                         "-Apecoff", i18n("Use pecoff"));
-    tqlayout->addWidget(asm_group);
+    layout->addWidget(asm_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  AssemblerTab::~ AssemblerTab( )
@@ -328,12 +328,12 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     optimController(new FlagRadioButtonController)
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-//    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+//    layout->setAutoAdd(true);
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
-    TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
+    TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint());
 
     TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
     new FlagCheckBox(debug_group, controller,
@@ -346,18 +346,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-gh", i18n("Use heaptrc unit"), "-!gh");
     new FlagCheckBox(debug_group, controller,
                      "-gc", i18n("Generate checks for pointers"), "-!gc");
-    tqlayout3->addWidget(debug_group);
+    layout3->addWidget(debug_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout3->addSpacing(10);
+    layout3->addSpacing(10);
 
     TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this);
     new FlagCheckBox(profile_group, controller,
                      "-pg", i18n("Generate profiler code for gprof"), "-!pg");
-    tqlayout3->addWidget(profile_group);
+    layout3->addWidget(profile_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout3->addSpacing(10);
+    layout3->addSpacing(10);
 
-    TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
+    TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint());
 
     TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this);
     m_default = new TQRadioButton(i18n("Default"), optim_group1);
@@ -366,9 +366,9 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "-Og", i18n("Generate smaller code"));
     optim1 = new FlagRadioButton(optim_group1, optimController,
                         "-OG", i18n("Generate faster code"));
-    tqlayout4->addWidget(optim_group1);
+    layout4->addWidget(optim_group1);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout4->addSpacing(10);
+    layout4->addSpacing(10);
 
     TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this);
     m_default2 = new TQRadioButton(i18n("Default"), optim_group2);
@@ -379,11 +379,11 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                         "-O2", i18n("Level 2"));
     optim2 = new FlagRadioButton(optim_group2, optimController,
                         "-O3", i18n("Level 3"));
-    tqlayout4->addWidget(optim_group2);
+    layout4->addWidget(optim_group2);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout4->addSpacing(10);
+    layout4->addSpacing(10);
 
-    TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this);
     m_default3 = new TQRadioButton(i18n("Default"), optim_group3);
@@ -394,7 +394,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-Op2", i18n("Pentium/PentiumMMX"));
     new FlagRadioButton(optim_group3, optimController,
                      "-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6"));
-    tqlayout5->addWidget(optim_group3);
+    layout5->addWidget(optim_group3);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this);
@@ -402,18 +402,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
                      "-Or", i18n("Use register variables"), "-!Or");
     new FlagCheckBox(optim_group4, controller,
                      "-Ou", i18n("Uncertain optimizations"), "-!Ou");
-    tqlayout5->addWidget(optim_group4);
+    layout5->addWidget(optim_group4);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint());
     TQPushButton *release = new TQPushButton(i18n("Release"), this);
     TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
-    tqlayout6->addWidget(release);
-    tqlayout6->addWidget(debug);
+    layout6->addWidget(release);
+    layout6->addWidget(debug);
     connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
     connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
  DebugOptimTab::~ DebugOptimTab( )
@@ -458,8 +458,8 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
     new FlagCheckBox(compile_group, controller,
@@ -467,7 +467,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(compile_group, controller,
                      "-Un", i18n("Do not check the unit name for being the same as the file name"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
     new FlagCheckBox(run_group, controller,
@@ -479,14 +479,14 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
     new FlagCheckBox(run_group, controller,
                      "-Co", i18n("Integer overflow checking"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController,
                     "-Cs", i18n("Stack size:"));
@@ -494,7 +494,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
                     "-Ch", i18n("Heap size:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 CodegenTab::~ CodegenTab( )
@@ -519,9 +519,9 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
     : TQWidget(parent, name), controller(new FlagCheckBoxController()),
     listController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+    TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
 
     TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this);
     new FlagCheckBox(link_group, controller,
@@ -534,7 +534,7 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
                      "-Cn", i18n("Omit the linking stage"));
     new FlagCheckBox(link_group, controller,
                      "-s",  i18n("Create assembling and linking script"));
-    tqlayout2->addWidget(link_group);
+    layout2->addWidget(link_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
     TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this);
@@ -548,15 +548,15 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
                      "-XD",  i18n("Link with dynamic libraries"));
     new FlagCheckBox(exec_group, controller,
                      "-Xc",  i18n("Link with the C library"));
-    tqlayout2->addWidget(exec_group);
+    layout2->addWidget(exec_group);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):"));
-    tqlayout->addWidget(led);
+    layout->addWidget(led);
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 LinkerTab::~LinkerTab( )
@@ -583,8 +583,8 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     pathController(new FlagPathEditController()),
     editController(new FlagEditController())
 {
-    TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->setAutoAdd(true);
+    TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->setAutoAdd(true);
 
     new FlagCheckBox(this, controller,
                      "-B", i18n("Recompile all used units"));
@@ -595,7 +595,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagSpinEdit(this, 1, 1000, 1, 50, editController,
                     "-Se", i18n("Stop after the error:"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this);
     TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group);
@@ -605,7 +605,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagRadioButton(browser_group, radioController,
                      "-bl", i18n("Global and local browser info"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
     TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this);
     TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group);
@@ -625,9 +625,9 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
     new FlagRadioButton(target_group, radioController,
                      "-TBEOS", i18n("BeOS"));
     TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
-    tqlayout->addSpacing(10);
+    layout->addSpacing(10);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 MiscTab::~ MiscTab( )
diff --git a/languages/perl/doc/perl.toc b/languages/perl/doc/perl.toc
index 05bab529..84cb8145 100644
--- a/languages/perl/doc/perl.toc
+++ b/languages/perl/doc/perl.toc
@@ -14,7 +14,7 @@
 <tocsect1 name="Modules: how to write and use" url="man:perlmodlib"/>
 <tocsect1 name="Modules: how to install from CPAN" url="man:perlmodinstall"/>
 <tocsect1 name="Formats" url="man:perlform"/>
-<tocsect1 name="Unicode Support" url="man:perltqunicode"/>
+<tocsect1 name="Unicode Support" url="man:perlunicode"/>
 <tocsect1 name="Locale Support" url="man:perllocale"/>
 <tocsect1 name="References Introduction" url="man:perlreftut"/>
 <tocsect1 name="References, the rest of the story" url="man:perlref"/>
diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc
index c40cda8f..e56091af 100644
--- a/languages/php/doc/php.toc
+++ b/languages/php/doc/php.toc
@@ -557,11 +557,11 @@
     <tocsect2 name="Predefined Constants" url="recode.constants.php"/>
     <tocsect2 name="Recode Functions" url="ref.recode.php"/>
 </tocsect1>
-<tocsect1 name="Unicode" url="book.tqunicode.php">
-    <tocsect2 name="Introduction" url="intro.tqunicode.php"/>
-    <tocsect2 name="Installing/Configuring" url="tqunicode.setup.php"/>
-    <tocsect2 name="Predefined Constants" url="tqunicode.constants.php"/>
-    <tocsect2 name="Unicode Functions" url="ref.tqunicode.php"/>
+<tocsect1 name="Unicode" url="book.unicode.php">
+    <tocsect2 name="Introduction" url="intro.unicode.php"/>
+    <tocsect2 name="Installing/Configuring" url="unicode.setup.php"/>
+    <tocsect2 name="Predefined Constants" url="unicode.constants.php"/>
+    <tocsect2 name="Unicode Functions" url="ref.unicode.php"/>
 </tocsect1>
 <tocsect1 name="Exif" url="book.exif.php">
     <tocsect2 name="Introduction" url="intro.exif.php"/>
@@ -3644,12 +3644,12 @@
 <entry name="recode_file" url="function.recode-file.php"/>
 <entry name="recode_string" url="function.recode-string.php"/>
 <entry name="recode" url="function.recode.php"/>
-<entry name="tqunicode_decode" url="function.tqunicode-decode.php"/>
-<entry name="tqunicode_encode" url="function.tqunicode-encode.php"/>
-<entry name="tqunicode_get_error_mode" url="function.tqunicode-get-error-mode.php"/>
-<entry name="tqunicode_get_subst_char" url="function.tqunicode-get-subst-char.php"/>
-<entry name="tqunicode_set_error_mode" url="function.tqunicode-set-error-mode.php"/>
-<entry name="tqunicode_set_subst_char" url="function.tqunicode-set-subst-char.php"/>
+<entry name="unicode_decode" url="function.unicode-decode.php"/>
+<entry name="unicode_encode" url="function.unicode-encode.php"/>
+<entry name="unicode_get_error_mode" url="function.unicode-get-error-mode.php"/>
+<entry name="unicode_get_subst_char" url="function.unicode-get-subst-char.php"/>
+<entry name="unicode_set_error_mode" url="function.unicode-set-error-mode.php"/>
+<entry name="unicode_set_subst_char" url="function.unicode-set-subst-char.php"/>
 <entry name="exif_imagetype" url="function.exif-imagetype.php"/>
 <entry name="exif_read_data" url="function.exif-read-data.php"/>
 <entry name="exif_tagname" url="function.exif-tagname.php"/>
@@ -6571,7 +6571,7 @@
 <entry name="is_resource" url="function.is-resource.php"/>
 <entry name="is_scalar" url="function.is-scalar.php"/>
 <entry name="is_string" url="function.is-string.php"/>
-<entry name="is_tqunicode" url="function.is-tqunicode.php"/>
+<entry name="is_unicode" url="function.is-unicode.php"/>
 <entry name="isset" url="function.isset.php"/>
 <entry name="print_r" url="function.print-r.php"/>
 <entry name="serialize" url="function.serialize.php"/>
diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui
index 535e7a95..a1da7ee1 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -351,7 +351,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -405,7 +405,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -451,7 +451,7 @@ the internal web browser. Please make sure that the webserver was compiled with
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb
index 6a49bdab..e7aabe3c 100644
--- a/languages/ruby/app_templates/kapp/appview.rb
+++ b/languages/ruby/app_templates/kapp/appview.rb
@@ -31,7 +31,7 @@ class %{APPNAMESC}View < Qt::Widget
         # keep a reference to the DCOP Interface so it doesn't get gc'd
         @dcop = %{APPNAMESC}Iface.new(self)
         
-        # setup our tqlayout manager to automatically add our widgets
+        # setup our layout manager to automatically add our widgets
         top_layout = Qt::HBoxLayout.new(self)
         top_layout.setAutoAdd(true)
     
diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb
index f7f2e312..98669ad2 100644
--- a/languages/ruby/app_templates/kapp/pref.rb
+++ b/languages/ruby/app_templates/kapp/pref.rb
@@ -19,8 +19,8 @@ class %{APPNAMESC}PrefPageOne < Qt::Frame
 
     def initialize(parent)
         super(parent)
-        tqlayout = Qt::HBoxLayout.new(self)
-        tqlayout.setAutoAdd(true)
+        layout = Qt::HBoxLayout.new(self)
+        layout.setAutoAdd(true)
     
         Qt::Label.new(i18n("Add something here"), self)
     end
@@ -30,8 +30,8 @@ class %{APPNAMESC}PrefPageTwo < Qt::Frame
 
     def initialize(parent)
         super(parent)
-        tqlayout = Qt::HBoxLayout.new(self)
-        tqlayout.setAutoAdd(true)
+        layout = Qt::HBoxLayout.new(self)
+        layout.setAutoAdd(true)
     
         Qt::Label.new(i18n("Add something here"), self)
     end
diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp
index e7d616a0..d5458c28 100644
--- a/languages/ruby/debugger/dbgpsdlg.cpp
+++ b/languages/ruby/debugger/dbgpsdlg.cpp
@@ -75,7 +75,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
     TQPushButton *ok       = buttonbox->addButton(KStdGuiItem::ok());
     buttonbox->addStretch();
     TQPushButton *cancel   = buttonbox->addButton(KStdGuiItem::cancel());
-    buttonbox->tqlayout();
+    buttonbox->layout();
     topLayout->addWidget(buttonbox);
 
     connect(ok,     TQT_SIGNAL(clicked()),  TQT_SLOT(accept()));
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 03ff3c63..b2eaa92f 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -202,7 +202,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
 			emit removeWatchExpression(((WatchVarItem*)item)->displayId());
             delete item;
         } else if (res == idCopyToClipboard) {
-            TQClipboard *qb = KApplication::tqclipboard();
+            TQClipboard *qb = KApplication::clipboard();
             TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " +
                             "\"" + item->text( VALUE_COLUMN ) + "\" }";
 
diff --git a/languages/ruby/rubyconfigwidgetbase.ui b/languages/ruby/rubyconfigwidgetbase.ui
index 3487dbe7..569ac658 100644
--- a/languages/ruby/rubyconfigwidgetbase.ui
+++ b/languages/ruby/rubyconfigwidgetbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui
index 18b37baa..5f836677 100644
--- a/languages/sql/sqlconfigwidget.ui
+++ b/languages/sql/sqlconfigwidget.ui
@@ -88,7 +88,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp
index 2f595811..9b123cc5 100644
--- a/languages/sql/sqloutputwidget.cpp
+++ b/languages/sql/sqloutputwidget.cpp
@@ -67,8 +67,8 @@ SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) :
     m_stack->addWidget( m_textEdit );
     m_stack->addWidget( m_table );
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->addWidget( m_stack );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->addWidget( m_stack );
 }
 
 SqlOutputWidget::~SqlOutputWidget()
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index c2d9a63c..78c1c1f2 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -71,8 +71,8 @@ TQString SQLSupportPart::cryptStr(const TQString& aStr)
 {
     TQString result;
     for (unsigned int i = 0; i < aStr.length(); i++)
-	result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
-		  TQChar(0x1001F - aStr[i].tqunicode());
+	result += (aStr[i].unicode() < 0x20) ? aStr[i] :
+		  TQChar(0x1001F - aStr[i].unicode());
     return result;
 }