Rename obsolete tq methods to standard names

3 files changed, 12 insertions, 12 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());
     }
 }