Rename obsolete tq methods to standard names

7 files changed, 34 insertions, 34 deletions

diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index edeb42fd..5a9a60dc 100644
--- a/keduca/keduca/kcheckeduca.cpp
+++ b/keduca/keduca/kcheckeduca.cpp
@@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
     int extra_width, indicator_width;
 
     extra_width = 8;
-    indicator_width = tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
+    indicator_width = style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
 
     y = 0;
     x = indicator_width + extra_width; //###
@@ -68,7 +68,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
     _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
 
     if ( hasFocus() ) {
-//	TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo,
+//	TQRect br = style().itemRect( p, x, y, rw, rh+yo,
 //				   AlignLeft|AlignVCenter|ShowPrefix,
 //				   isEnabled(),
 //				   pixmap(), text().visual() );
@@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
         br.setBottom( br.bottom()+2);
         br = br.intersect( TQRect(0,0,rw, rh+yo ) );
 
-        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
+        style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
     }
 }
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index dbf130dc..16eb6ff7 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -45,9 +45,9 @@ void KEducaPrefs::setPageGeneral()
     TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" );
     buttonGroup1->setTitle( i18n( "General" ) );
     buttonGroup1->setColumnLayout(0, Qt::Vertical );
-    buttonGroup1->tqlayout()->setSpacing( 0 );
-    buttonGroup1->tqlayout()->setMargin( 0 );
-    TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
+    buttonGroup1->layout()->setSpacing( 0 );
+    buttonGroup1->layout()->setMargin( 0 );
+    TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() );
     buttonGroup1Layout->setAlignment( TQt::AlignTop );
     buttonGroup1Layout->setSpacing( 6 );
     buttonGroup1Layout->setMargin( 11 );
@@ -63,9 +63,9 @@ void KEducaPrefs::setPageGeneral()
     TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" );
     GroupBox1->setTitle( i18n( "Order" ) );
     GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->tqlayout()->setSpacing( 0 );
-    GroupBox1->tqlayout()->setMargin( 0 );
-    TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
+    GroupBox1->layout()->setSpacing( 0 );
+    GroupBox1->layout()->setMargin( 0 );
+    TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
     GroupBox1Layout->setAlignment( TQt::AlignTop );
     GroupBox1Layout->setSpacing( 6 );
     GroupBox1Layout->setMargin( 11 );
diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp
index 4cf0185f..96792e24 100644
--- a/keduca/keduca/kradioeduca.cpp
+++ b/keduca/keduca/kradioeduca.cpp
@@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
     int x, y, w, h;
     int extra_width, indicator_width;
     extra_width = 8;
-    indicator_width = tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
+    indicator_width = style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
 
     y = 0;
     x = indicator_width + extra_width; //###
@@ -67,7 +67,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
     _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
 
     if ( hasFocus() ) {
-//	TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo,
+//	TQRect br = style().itemRect( p, x, y, rw, rh+yo,
 //				   AlignLeft|AlignVCenter|ShowPrefix,
 //				   isEnabled(),
 //				   pixmap(), text().visual() );
@@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
         br.setTop( br.top()-2 );
         br.setBottom( br.bottom()+2);
         br = br.intersect( TQRect(0,0,rw, rh+yo ) );
-        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
+        style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
     }
 }
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index da846f6c..c5736e3d 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -293,7 +293,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="4" column="1">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -325,7 +325,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>tqlayout2</cstring>
+                            <cstring>layout2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -502,7 +502,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -510,7 +510,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout3</cstring>
+                                    <cstring>layout3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -575,7 +575,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout7</cstring>
+                                    <cstring>layout7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -630,7 +630,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout17</cstring>
+                            <cstring>layout17</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -679,7 +679,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout16</cstring>
+                                    <cstring>layout16</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index f126d07d..5c323c3c 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -82,9 +82,9 @@ void KControlHeader::init()
     TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" );
     GroupBox7->setTitle( i18n( "Description" ) );
     GroupBox7->setColumnLayout(0, Qt::Vertical );
-    GroupBox7->tqlayout()->setSpacing( 0 );
-    GroupBox7->tqlayout()->setMargin( 0 );
-    TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() );
+    GroupBox7->layout()->setSpacing( 0 );
+    GroupBox7->layout()->setMargin( 0 );
+    TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() );
     GroupBox7Layout->setAlignment( TQt::AlignTop );
     GroupBox7Layout->setSpacing( 6 );
     GroupBox7Layout->setMargin( 11 );
@@ -147,9 +147,9 @@ void KControlHeader::init()
     TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" );
     GroupBox8->setTitle( i18n( "Picture" ) );
     GroupBox8->setColumnLayout(0, Qt::Vertical );
-    GroupBox8->tqlayout()->setSpacing( 0 );
-    GroupBox8->tqlayout()->setMargin( 0 );
-    TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() );
+    GroupBox8->layout()->setSpacing( 0 );
+    GroupBox8->layout()->setMargin( 0 );
+    TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() );
     GroupBox8Layout->setAlignment( TQt::AlignTop );
     GroupBox8Layout->setSpacing( 6 );
     GroupBox8Layout->setMargin( 11 );
@@ -165,9 +165,9 @@ void KControlHeader::init()
     TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" );
     GroupBox6->setTitle( i18n( "Author" ) );
     GroupBox6->setColumnLayout(0, Qt::Vertical );
-    GroupBox6->tqlayout()->setSpacing( 0 );
-    GroupBox6->tqlayout()->setMargin( 0 );
-    TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() );
+    GroupBox6->layout()->setSpacing( 0 );
+    GroupBox6->layout()->setMargin( 0 );
+    TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() );
     GroupBox6Layout->setAlignment( TQt::AlignTop );
     GroupBox6Layout->setSpacing( 6 );
     GroupBox6Layout->setMargin( 11 );
diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui
index 77b29513..1c94005d 100644
--- a/keduca/keducabuilder/kcontrolheaderbase.ui
+++ b/keduca/keducabuilder/kcontrolheaderbase.ui
@@ -188,7 +188,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui
index 3c23a6dd..5150ee42 100644
--- a/keduca/libkeduca/kgallerydialogbase.ui
+++ b/keduca/libkeduca/kgallerydialogbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -58,7 +58,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -81,7 +81,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -264,7 +264,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">