Rename a number of old tq methods that are no longer tq specific

21 files changed, 156 insertions, 156 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..a3252210 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kconfig.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 
@@ -45,10 +45,10 @@ 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() );
-    buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+    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,10 +63,10 @@ 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() );
-    GroupBox1Layout->tqsetAlignment( TQt::AlignTop );
+    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/keducaview.cpp b/keduca/keduca/keducaview.cpp
index f7871e5c..a369c112 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -33,9 +33,9 @@
 #include <kio/netaccess.h>
 
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 KEducaView::KEducaView( TQWidget *parent, const char *name )
     : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
@@ -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();
@@ -209,7 +209,7 @@ void KEducaView::showRecord()
     // SHOW QUESTION *******************************************************************
     _questionText->setPixmap( _keducaFile->getPicturePixmap() );
     questionTextTemp =  "<table width=100%><tr><td><b>"
-                        + i18n("Question %1").tqarg(_keducaFileIndex) + "</b>";
+                        + i18n("Question %1").arg(_keducaFileIndex) + "</b>";
 
     if( _keducaFile->getTotalPoints() > 0 )
       questionTextTemp  += "</td><td align=center bgColor=#336699><font color=#ffffff><b>"
@@ -266,7 +266,7 @@ void KEducaView::showRecord()
         KMessageBox::information( this,
                                   i18n( "You have %1 seconds to complete this question.\n\n"
                                         "Press OK when you are ready." )
-                                  .tqarg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) );
+                                  .arg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) );
      }
 
     int timeout = _keducaFile->getQuestionInt(FileRead::TQF_TIME);
@@ -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..fd91dea3 100644
--- a/keduca/keduca/keducaview.h
+++ b/keduca/keduca/keducaview.h
@@ -20,7 +20,7 @@
 
 #include <kurl.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplitter.h>
 #include <tqwidgetstack.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..6caea7f2 100644
--- a/keduca/keduca/kquestion.cpp
+++ b/keduca/keduca/kquestion.cpp
@@ -19,7 +19,7 @@
 #include "kquestion.h"
 #include "kquestion.moc"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqvbox.h>
 #include <tqtimer.h>
@@ -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/kquestion.h b/keduca/keduca/kquestion.h
index 23998da9..5364e800 100644
--- a/keduca/keduca/kquestion.h
+++ b/keduca/keduca/kquestion.h
@@ -20,7 +20,7 @@
 #define KQUESTION_H
 
 #include <tqhbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlabel.h>
 
 class TQTimer;
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());
     }
 }
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index eb023a79..6462f67d 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -29,7 +29,7 @@
 
 // TQt includes
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 KControlAddEdit::KControlAddEdit(TQWidget *parent, const char *name, bool modal, WFlags f)
     : KControlAddEditBase(parent, name, modal, f),
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index b7e042b4..c5736e3d 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -30,13 +30,13 @@
                 <property name="name">
                     <cstring>frame3</cstring>
                 </property>
-                <property name="tqminimumSize">
+                <property name="minimumSize">
                     <size>
                         <width>125</width>
                         <height>0</height>
                     </size>
                 </property>
-                <property name="tqmaximumSize">
+                <property name="maximumSize">
                     <size>
                         <width>125</width>
                         <height>32767</height>
@@ -59,13 +59,13 @@
                         <property name="name">
                             <cstring>_questionPreview</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>100</width>
                                 <height>100</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>100</width>
                                 <height>100</height>
@@ -101,7 +101,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -130,7 +130,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>41</height>
@@ -160,7 +160,7 @@
                         <property name="text">
                             <string>&amp;Question:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignTop|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -174,7 +174,7 @@
                         <property name="text">
                             <string>&amp;Type:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -188,7 +188,7 @@
                         <property name="text">
                             <string>&amp;Picture:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -227,7 +227,7 @@
                         <property name="text">
                             <string>P&amp;oint:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -241,7 +241,7 @@
                         <property name="text">
                             <string>Ti&amp;me:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -255,7 +255,7 @@
                         <property name="text">
                             <string>T&amp;ip:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -274,7 +274,7 @@
                         <property name="text">
                             <string>&amp;Explain:</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignTop|AlignRight</set>
                         </property>
                         <property name="buddy" stdset="0">
@@ -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">
@@ -314,7 +314,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>81</width>
                                         <height>20</height>
@@ -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">
@@ -346,7 +346,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>131</width>
                                         <height>20</height>
@@ -377,13 +377,13 @@
                 <property name="name">
                     <cstring>frame3_2</cstring>
                 </property>
-                <property name="tqminimumSize">
+                <property name="minimumSize">
                     <size>
                         <width>125</width>
                         <height>0</height>
                     </size>
                 </property>
-                <property name="tqmaximumSize">
+                <property name="maximumSize">
                     <size>
                         <width>125</width>
                         <height>32767</height>
@@ -406,13 +406,13 @@
                         <property name="name">
                             <cstring>_answerPreview</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>100</width>
                                 <height>100</height>
                             </size>
                         </property>
-                        <property name="tqmaximumSize">
+                        <property name="maximumSize">
                             <size>
                                 <width>100</width>
                                 <height>100</height>
@@ -448,7 +448,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -477,7 +477,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>41</height>
@@ -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">
@@ -531,7 +531,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>20</height>
@@ -552,7 +552,7 @@
                                 <property name="text">
                                     <string>&amp;Answer:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -566,7 +566,7 @@
                                 <property name="text">
                                     <string>&amp;Value:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -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">
@@ -605,7 +605,7 @@
                                 <property name="text">
                                     <string>&amp;Points:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -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">
@@ -717,7 +717,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>10</height>
@@ -756,7 +756,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>21</height>
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index 49075f59..98167c3c 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *parent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, parent, name, true, true)
@@ -82,10 +82,10 @@ 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() );
-    GroupBox7Layout->tqsetAlignment( TQt::AlignTop );
+    GroupBox7->layout()->setSpacing( 0 );
+    GroupBox7->layout()->setMargin( 0 );
+    TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() );
+    GroupBox7Layout->setAlignment( TQt::AlignTop );
     GroupBox7Layout->setSpacing( 6 );
     GroupBox7Layout->setMargin( 11 );
 
@@ -95,7 +95,7 @@ void KControlHeader::init()
 
     TQLabel *TextLabel10 = new TQLabel( GroupBox7, "TextLabel10" );
     TextLabel10->setText( i18n( "Type:" ));
-    TextLabel10->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel10->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     Layout13->addWidget( TextLabel10, 2, 0 );
 
@@ -108,7 +108,7 @@ void KControlHeader::init()
 
     TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" );
     TextLabel11->setText( i18n( "Level:" ));
-    TextLabel11->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
     Layout12->addWidget( TextLabel11 );
 
     _headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" );
@@ -117,7 +117,7 @@ void KControlHeader::init()
 
     TQLabel *TextLabel12 = new TQLabel( GroupBox7, "TextLabel12" );
     TextLabel12->setText( i18n( "Language:" ));
-    TextLabel12->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel12->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
     Layout13->addWidget( TextLabel12, 3, 0 );
 
     _headerLang = new KLanguageCombo( GroupBox7, "_headerLang" );
@@ -126,7 +126,7 @@ void KControlHeader::init()
 
     TQLabel *TextLabel9 = new TQLabel( GroupBox7, "TextLabel9" );
     TextLabel9->setText( i18n( "Category:" ));
-    TextLabel9->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel9->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     Layout13->addWidget( TextLabel9, 1, 0 );
 
@@ -138,7 +138,7 @@ void KControlHeader::init()
 
     TQLabel *TextLabel8 = new TQLabel( GroupBox7, "TextLabel8" );
     TextLabel8->setText( i18n( "Title:" ));
-    TextLabel8->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel8->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     Layout13->addWidget( TextLabel8, 0, 0 );
     GroupBox7Layout->addLayout( Layout13 );
@@ -147,10 +147,10 @@ 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() );
-    GroupBox8Layout->tqsetAlignment( TQt::AlignTop );
+    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,10 +165,10 @@ 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() );
-    GroupBox6Layout->tqsetAlignment( TQt::AlignTop );
+    GroupBox6->layout()->setSpacing( 0 );
+    GroupBox6->layout()->setMargin( 0 );
+    TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() );
+    GroupBox6Layout->setAlignment( TQt::AlignTop );
     GroupBox6Layout->setSpacing( 6 );
     GroupBox6Layout->setMargin( 11 );
 
@@ -182,19 +182,19 @@ void KControlHeader::init()
 
     TQLabel *TextLabel7 = new TQLabel( GroupBox6, "TextLabel7" );
     TextLabel7->setText( i18n( "Web page:" ));
-    TextLabel7->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel7->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     GroupBox6Layout->addWidget( TextLabel7, 2, 0 );
 
     TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" );
     TextLabel6->setText( i18n( "Email:" ));
-    TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     GroupBox6Layout->addWidget( TextLabel6, 1, 0 );
 
     TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" );
     TextLabel5->setText( i18n( "Name:" ));
-    TextLabel5->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+    TextLabel5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
     GroupBox6Layout->addWidget( TextLabel5, 0, 0 );
 
@@ -246,12 +246,12 @@ void KControlHeader::insertHeader()
 /** Load country list */
 void KControlHeader::loadCountryList(KLanguageCombo *combo)
 {
-    TQString sub = TQString::tqfromLatin1("l10n/");
+    TQString sub = TQString::fromLatin1("l10n/");
 
     // clear the list
     combo->clear();
 
-    TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
+    TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
     regionlist.sort();
 
     for ( TQStringList::ConstIterator it = regionlist.begin();
@@ -268,23 +268,23 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
         if (index != -1) tag.truncate(index);
 
         KSimpleConfig entry(*it);
-        entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-        TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
+        entry.setGroup(TQString::fromLatin1("KCM Locale"));
+        TQString name = entry.readEntry(TQString::fromLatin1("Name"));
 
         combo->insertSubmenu( name, '-' + tag, sub );
     }
 
     // add all languages to the list
-    TQStringList countrylist = KGlobal::dirs()->findAllResources("locale",  sub + TQString::tqfromLatin1("*/entry.desktop"));
+    TQStringList countrylist = KGlobal::dirs()->findAllResources("locale",  sub + TQString::fromLatin1("*/entry.desktop"));
     countrylist.sort();
 
     for ( TQStringList::ConstIterator it = countrylist.begin();
           it != countrylist.end(); ++it )
     {
         KSimpleConfig entry(*it);
-        entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-        TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
-        TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region"));
+        entry.setGroup(TQString::fromLatin1("KCM Locale"));
+        TQString name = entry.readEntry(TQString::fromLatin1("Name"));
+        TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region"));
 
         TQString tag = *it;
         int index = tag.findRev('/');
diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui
index 24dbbf09..1c94005d 100644
--- a/keduca/keducabuilder/kcontrolheaderbase.ui
+++ b/keduca/keducabuilder/kcontrolheaderbase.ui
@@ -23,13 +23,13 @@
             <property name="name">
                 <cstring>frame3</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>50</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>50</height>
@@ -59,13 +59,13 @@
                     <property name="name">
                         <cstring>frame4</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>125</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>125</width>
                             <height>32767</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>21</height>
@@ -139,7 +139,7 @@
                     <property name="text">
                         <string>Title:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -150,7 +150,7 @@
                     <property name="text">
                         <string>Language:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -161,7 +161,7 @@
                     <property name="text">
                         <string>Category:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -172,7 +172,7 @@
                     <property name="text">
                         <string>Type:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -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">
@@ -209,7 +209,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>61</width>
                                     <height>21</height>
@@ -223,7 +223,7 @@
                             <property name="text">
                                 <string>Level:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -262,7 +262,7 @@
                     <property name="text">
                         <string>Default picture:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignJustify|AlignVCenter</set>
                     </property>
                 </widget>
@@ -291,7 +291,7 @@
                     <property name="text">
                         <string>Name:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -317,7 +317,7 @@
                     <property name="text">
                         <string>Web page:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -328,7 +328,7 @@
                     <property name="text">
                         <string>Email:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -344,7 +344,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>40</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 6af778b8..d0832d29 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -32,7 +32,7 @@
 #include <kmessagebox.h>
 #include <kprinter.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
@@ -91,7 +91,7 @@ void KEducaBuilder::init()
     _split->setOrientation( Qt::Vertical );
 
     _listAnswer = new KListBox( _split, "_listAnswer" );
-    _listAnswer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
+    _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
     connect( _listAnswer,  TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
     connect( _listAnswer,  TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
 
@@ -103,7 +103,7 @@ void KEducaBuilder::init()
 
     setCentralWidget( mainView );
     if (!initialGeometrySet())
-       resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()));
+       resize( TQSize(500, 400).expandedTo(minimumSizeHint()));
     setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" );
     setAutoSaveSettings();
 }
@@ -284,7 +284,7 @@ bool KEducaBuilder::currentFileMayBeReplaced()
         int res = KMessageBox::warningYesNoCancel( widget(),
             // ask the user to save
             i18n( "The document \"%1\" has been modified.\n"
-                  "Do you want to save it?" ).tqarg( _keducaFile->getCurrentURL().fileName() ),
+                  "Do you want to save it?" ).arg( _keducaFile->getCurrentURL().fileName() ),
             i18n( "Save Document?" ), KStdGuiItem::save(), KStdGuiItem::discard() );
         switch (res)
         {
@@ -485,7 +485,7 @@ void KEducaBuilder::slotFilePrint()
     TQString file = _keducaFile->getCurrentURL().fileName();
     if (file.isEmpty())
 	file = i18n("Test");
-    if(printer->setup(this, i18n("Print %1").tqarg(file)))
+    if(printer->setup(this, i18n("Print %1").arg(file)))
     {
         TQPaintDeviceMetrics metrics(printer);
         TQPainter p;
diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h
index feb9ec8c..f69e5019 100644
--- a/keduca/keducabuilder/keducabuilder.h
+++ b/keduca/keducabuilder/keducabuilder.h
@@ -25,7 +25,7 @@
 #include <klistbox.h>
 #include <kaction.h>
 
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqsplitter.h>
 
 /**Main control documents
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 01bbc260..22e196e7 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -62,7 +62,7 @@ void KEducaEditorStartDialog::buildRecentFilesList()
     // read file list
     for( unsigned int i = 1 ; i <= _maxRecentDocumentItems ; i++ )
     {
-        key = TQString( "File%1" ).tqarg( i );
+        key = TQString( "File%1" ).arg( i );
         value = config->readEntry( key, TQString() );
 
         if (!value.isNull())
diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
index c873a844..e7686ff9 100644
--- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui
+++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
@@ -100,7 +100,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -154,7 +154,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>21</height>
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp
index 66f77e45..05a36669 100644
--- a/keduca/keducabuilder/klangcombo.cpp
+++ b/keduca/keducabuilder/klangcombo.cpp
@@ -38,14 +38,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
 
 void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu)
 {
-    TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
-    TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
+    TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+    TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
     insertItem(TQIconSet(flag), output, path, submenu);
 }
 
 void KLanguageCombo::changeLanguage(const TQString& name, int i)
 {
     if (i < 0 || i >= count()) return;
-    TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
+    TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
     changeItem(output, i);
 }
diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp
index e6d0e617..081d4254 100644
--- a/keduca/keducabuilder/ktagcombobox.cpp
+++ b/keduca/keducabuilder/ktagcombobox.cpp
@@ -84,7 +84,7 @@ void KTagComboBox::internalActivate( int index )
     if (_current == index) return;
     _current = index;
     emit activated( index );
-    tqrepaint();
+    repaint();
 }
 
 void KTagComboBox::internalHighlight( int index )
@@ -158,7 +158,7 @@ void KTagComboBox::changeItem( const TQString &text, int index )
 {
     _popup->changeItem( text, index);
     if (index == _current)
-        tqrepaint();
+        repaint();
 }
 
 void KTagComboBox::paintEvent( TQPaintEvent * ev)
@@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
     // Text
     TQRect clip(2, 2, width() - 4, height() - 4);
     if ( hasFocus())
-        p.setPen( tqcolorGroup().highlightedText() );
+        p.setPen( colorGroup().highlightedText() );
     p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current ));
 
     // Icon
@@ -210,7 +210,7 @@ void KTagComboBox::setCurrentItem(int i)
 {
     if (i < 0 || i >= count()) return;
     _current = i;
-    tqrepaint();
+    repaint();
 }
 
 void KTagComboBox::setCurrentItem(const TQString &code)
diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui
index 9a11d8b4..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">
@@ -45,7 +45,7 @@
                             <property name="text">
                                 <string>Name:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter</set>
                             </property>
                         </widget>
@@ -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">
@@ -97,7 +97,7 @@
                             <property name="sizeType">
                                 <enum>Preferred</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>10</height>
@@ -108,7 +108,7 @@
                             <property name="name">
                                 <cstring>buttonAdd</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>0</height>
@@ -264,7 +264,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -274,7 +274,7 @@
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -294,7 +294,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -305,7 +305,7 @@
                     <property name="name">
                         <cstring>buttonOpen</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -322,7 +322,7 @@
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>