Rename obsolete tq methods to standard names

8 files changed, 30 insertions, 30 deletions

diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 728c7651..b3950615 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -60,13 +60,13 @@ LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom,
 
 void LanguageSelectWidget::init()
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
 
     TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this );
     groupBox1->setColumnLayout(0, Qt::Vertical );
-    groupBox1->tqlayout()->setSpacing( 6 );
-    groupBox1->tqlayout()->setMargin( 11 );
-    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() );
+    groupBox1->layout()->setSpacing( 6 );
+    groupBox1->layout()->setMargin( 11 );
+    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() );
     groupBox1Layout->setAlignment( TQt::AlignTop );
 
     _currentLanguage = new TQLabel( "", groupBox1 );
@@ -78,13 +78,13 @@ void LanguageSelectWidget::init()
 
     groupBox1Layout->addWidget(_currentLanguage);
     groupBox1Layout->addWidget( _pluginList );
-    tqlayout->addWidget( groupBox1 );
+    layout->addWidget( groupBox1 );
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->tqlayout()->setSpacing( 6 );
-    groupBox2->tqlayout()->setMargin( 11 );
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
+    groupBox2->layout()->setSpacing( 6 );
+    groupBox2->layout()->setMargin( 11 );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
     groupBox2Layout->setAlignment( TQt::AlignTop );
 
     _pluginDescription = new TQLabel( groupBox2 );
@@ -92,7 +92,7 @@ void LanguageSelectWidget::init()
 
     groupBox2Layout->addWidget( _pluginDescription );
 
-    tqlayout->addWidget( groupBox2 );
+    layout->addWidget( groupBox2 );
 
     connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
 
diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui
index f5c436f4..3891110a 100644
--- a/src/mimewarningdialog.ui
+++ b/src/mimewarningdialog.ui
@@ -124,7 +124,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -181,7 +181,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 0d7cf9aa..1a433252 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -133,7 +133,7 @@ void Button::drawButton(TQPainter *p)
 
     tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
 
-    tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+    style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
                         TQRect(0,0,pm.width(),pm.height()),
                         colorGroup(), flags, TQStyleOption());
 
@@ -211,7 +211,7 @@ TQSize Button::sizeHint(const TQString &text) const
         h = TQMAX( h, ih );
     }
     if ( isMenuButton() )
-        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
         w += pm->width();
@@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
             h = TQMAX(h, sz.height());
     }
 
-    return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
             expandedTo(TQApplication::globalStrut()));
 }
 
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index 0da55ecd..041c5bf4 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -32,7 +32,7 @@ namespace Ideal {
 class Button;
 class ButtonBar;
 
-/**@short A tqlayout for a ButtonBar class.
+/**@short A layout for a ButtonBar class.
 
 Overrides minimumSize method to allow shrinking button bar buttons.*/
 class ButtonLayout: public TQBoxLayout{
diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui
index cc1fe69e..a773a155 100644
--- a/src/pluginselectdialogbase.ui
+++ b/src/pluginselectdialogbase.ui
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -106,7 +106,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui
index a44765ab..78d20d17 100644
--- a/src/profileengine/editor/addprofilewidget.ui
+++ b/src/profileengine/editor/addprofilewidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -53,7 +53,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -85,7 +85,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui
index 2a420299..4c6af611 100644
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@@ -49,7 +49,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -192,7 +192,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout7</cstring>
+                                <cstring>layout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -221,7 +221,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -263,7 +263,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -303,7 +303,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -410,7 +410,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
diff --git a/src/settingswidget.ui b/src/settingswidget.ui
index 7fa05b06..e5d1ac1f 100644
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@@ -63,7 +63,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -135,7 +135,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -187,7 +187,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -272,7 +272,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">