Rename old tq methods that no longer need a unique name

9 files changed, 31 insertions, 31 deletions

diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui
index 7eff82a8..a5926ad1 100644
--- a/keduca/keduca/configdialogbase.ui
+++ b/keduca/keduca/configdialogbase.ui
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>51</height>
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index 1fd7465e..edeb42fd 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().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0);
+    indicator_width = tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
 
     y = 0;
     x = indicator_width + extra_width; //###
@@ -61,14 +61,14 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
     yo = (cr.height()-rh)/2;
 
     if ( !isEnabled() ) {
-        TQColorGroup cg = tqcolorGroup();
+        TQColorGroup cg = colorGroup();
         cg.setColor( TQColorGroup::Text, cg.light() );
         _doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0);
     }
-    _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0);
+    _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
 
     if ( hasFocus() ) {
-//	TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
+//	TQRect br = tqstyle().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, tqcolorGroup());
+        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
     }
 }
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 5c39c0ed..508a137a 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -53,7 +53,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
 		kdFatal() << "The library \"libkeducapart\" could not be found. Aborting." << endl;
 	}
 	if (!initialGeometrySet())
-		resize( TQSize(550, 450).expandedTo(tqminimumSizeHint()));
+		resize( TQSize(550, 450).expandedTo(minimumSizeHint()));
 }
 
 Keduca::~Keduca()
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index f118f3ad..dbf130dc 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -48,7 +48,7 @@ void KEducaPrefs::setPageGeneral()
     buttonGroup1->tqlayout()->setSpacing( 0 );
     buttonGroup1->tqlayout()->setMargin( 0 );
     TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
-    buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup1Layout->setAlignment( TQt::AlignTop );
     buttonGroup1Layout->setSpacing( 6 );
     buttonGroup1Layout->setMargin( 11 );
 
@@ -66,7 +66,7 @@ void KEducaPrefs::setPageGeneral()
     GroupBox1->tqlayout()->setSpacing( 0 );
     GroupBox1->tqlayout()->setMargin( 0 );
     TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
-    GroupBox1Layout->tqsetAlignment( TQt::AlignTop );
+    GroupBox1Layout->setAlignment( TQt::AlignTop );
     GroupBox1Layout->setSpacing( 6 );
     GroupBox1Layout->setMargin( 11 );
     
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index f7871e5c..97a46e35 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -60,7 +60,7 @@ void KEducaView::init()
     // Intro Screen
     _introWidget = new TQLabel( this, "introScreen" );
     _introWidget->setBackgroundColor( TQt::white );
-    _introWidget->tqsetAlignment( AlignCenter );
+    _introWidget->setAlignment( AlignCenter );
     _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) );
     addWidget( _introWidget, 0 );
 
@@ -121,7 +121,7 @@ void KEducaView::slotButtonNext()
       _questionText->countdown(0);
     }
 
-    if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus )
+    if( ( visibleWidget() == _questionWidget ) && !_isInitStatus )
       setResults();
 
     _buttonGroup->clearAnswers();
@@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url)
     if ( !_keducaFile->openFile( url ) )
         return false;
 
-    _isInittqStatus = true;
+    _isInitStatus = true;
     _results = "<HTML>";
     _correctAnswer = 0;
     _correctPoints = 0;
@@ -436,12 +436,12 @@ void KEducaView::configWrite()
     Settings::writeConfig();
 }
 
-/** current tqStatus Points */
+/** current Status Points */
 TQString KEducaView::currentStatusPoints()
 {
-  TQString temptqStatus;
+  TQString tempStatus;
  
-  temptqStatus = insertTable()
+  tempStatus = insertTable()
               + insertRow( i18n("Statistics"), true, 4)
               + insertRow( i18n("Correct questions"),
                            TQString().setNum( _correctAnswer ),
@@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints()
                            TQString().setNum( _incorrectAnswer ), true);
 
   if( _keducaFile->getTotalPoints() > 0 )
-    temptqStatus += insertRow( i18n("Total points"), true, 4 )
+    tempStatus += insertRow( i18n("Total points"), true, 4 )
                 + insertRow( i18n("Correct points"),
                              TQString().setNum( _correctPoints ),
                              i18n("Incorrect points"),
                              TQString().setNum( _incorrectPoints ), true );
 
   if( _keducaFile->getTotalTime() > 0 )
-    temptqStatus += insertRow( i18n("Time"), true, 4 )
+    tempStatus += insertRow( i18n("Time"), true, 4 )
                 + insertRow( i18n("Total time"),
                              TQString().setNum( _keducaFile->getTotalTime() ),
                              i18n("Time in tests"),
                              TQString().setNum( _currentTime ), true );
-  temptqStatus += insertTableClose();
-  return temptqStatus;
+  tempStatus += insertTableClose();
+  return tempStatus;
 }
 
 /** Set HTML table view with correct and incorrect answers */
@@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
 /** Define the next questions (random, secuencial) */
 bool KEducaView::questionNext()
 {
-  if( !Settings::randomQuestions() && !_isInittqStatus )
+  if( !Settings::randomQuestions() && !_isInitStatus )
     {
     _keducaFile->recordNext();
     return _keducaFile->recordEOF() ? false : true;
     }
 
-  if( _isInittqStatus )
+  if( _isInitStatus )
     {
-    _isInittqStatus = false;
+    _isInitStatus = false;
     if( !Settings::randomQuestions() ) return true;
     }
  
diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h
index 45387f0f..ed226f1b 100644
--- a/keduca/keduca/keducaview.h
+++ b/keduca/keduca/keducaview.h
@@ -115,7 +115,7 @@ private:
     /** Current results */
     TQString _currentResults;
     /** If is init window */
-    bool _isInittqStatus;
+    bool _isInitStatus;
     TQTimer *_timeoutTimer;
     /** Num of correct answers */
     int _correctAnswer;
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index 747b65da..9f7a2413 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -54,7 +54,7 @@ void KGroupEduca::insertAnswer( const TQString& text)
         answer = new KCheckEduca( _vbox2 );
         break;
     }
-    answer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
+    answer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
     answer->setText( text );
     answer->show();
     insert(answer);
diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp
index fee2abc7..7b549168 100644
--- a/keduca/keduca/kquestion.cpp
+++ b/keduca/keduca/kquestion.cpp
@@ -51,7 +51,7 @@ void KQuestion::initGUI()
   _picture->setPalette( TQPalette( TQt::white ) );
 
   _countdownWidget = new KProgress( picBox );
-  _countdownWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
+  _countdownWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
                                                 TQSizePolicy::Preferred ) );
   _countdownWidget->setFormat( i18n( "%v seconds left" ) );
 
@@ -60,7 +60,7 @@ void KQuestion::initGUI()
     _view->setFrameShape( TQTextEdit::NoFrame );
     _view->setHScrollBarMode( TQTextEdit::AlwaysOff );
     _view->setTextFormat( TQTextEdit::RichText );
-    _view->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
+    _view->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
 }
 
 /** Set text */
diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp
index 9b8ffe4f..4cf0185f 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().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
+    indicator_width = tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
 
     y = 0;
     x = indicator_width + extra_width; //###
@@ -60,14 +60,14 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
     yo = (cr.height()-rh)/2;
 
     if (!isEnabled() ) {
-        TQColorGroup cg = tqcolorGroup();
+        TQColorGroup cg = colorGroup();
         cg.setColor( TQColorGroup::Text, cg.light() );
         _doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0);
     }
-    _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0);
+    _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
 
     if ( hasFocus() ) {
-//	TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
+//	TQRect br = tqstyle().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, tqcolorGroup());
+        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
     }
 }