Rename old tq methods that no longer need a unique name

37 files changed, 111 insertions, 111 deletions

diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp
index c93807a3..49749f91 100644
--- a/lib/kotext/DateFormatWidget.cpp
+++ b/lib/kotext/DateFormatWidget.cpp
@@ -147,7 +147,7 @@ void DateFormatWidget::updateLabel()
 {
     KoVariableDateFormat format;
     format.setFormatProperties( resultString() );
-    TQDateTime ct = TQDateTime::tqcurrentDateTime().addDays( correctValue() );
+    TQDateTime ct = TQDateTime::currentDateTime().addDays( correctValue() );
     label->setText( format.convert( ct ) );
 }
 
diff --git a/lib/kotext/IsoDuration.h b/lib/kotext/IsoDuration.h
index 6ccb2891..c0f8fd6f 100644
--- a/lib/kotext/IsoDuration.h
+++ b/lib/kotext/IsoDuration.h
@@ -31,7 +31,7 @@ static TQString minutesToISODuration( int mn )
 {
     bool neg = mn < 0;
     // PT == period of time - see ISO8601
-    TQString str = TQString::tqfromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) );
+    TQString str = TQString::fromLatin1( "PT00H%1M00S" ).tqarg( TQABS( mn ) );
     if ( neg )
         str.prepend( '-' );
     return str;
@@ -41,7 +41,7 @@ static TQString daysToISODuration( int days )
 {
     bool neg = days < 0;
     // P == period, time is ommitted - see ISO8601
-    TQString str = TQString::tqfromLatin1( "P%1D" ).tqarg( TQABS( days ) );
+    TQString str = TQString::fromLatin1( "P%1D" ).tqarg( TQABS( days ) );
     if ( neg )
         str.prepend( '-' );
     return str;
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index beaeb9f9..edefb8e5 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -69,7 +69,7 @@ static int minimumListWidth( const TQListBox *list )
   }
   if( w == 0 ) { w = 40; }
   w += list->frameWidth() * 2;
-  w += list->verticalScrollBar()->tqsizeHint().width();
+  w += list->verticalScrollBar()->sizeHint().width();
   return w;
 }
 
@@ -297,7 +297,7 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
   sampleEdit->setFont(tmpFont);
   sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
   sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
-  sampleEdit->tqsetAlignment(TQt::AlignCenter);
+  sampleEdit->setAlignment(TQt::AlignCenter);
   gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2);
   TQString sampleEditWhatsThisText =
     i18n("This sample text illustrates the current settings. "
@@ -333,8 +333,8 @@ KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name,
     setSizeIsRelative( *sizeIsRelativeState );
 
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
-  showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
+  KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+  showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
 }
 
 KFontChooser_local::~KFontChooser_local()
@@ -405,9 +405,9 @@ TQButton::ToggleState KFontChooser_local::sizeIsRelative() const
        : TQButton::NoChange;
 }
 
-TQSize KFontChooser_local::tqsizeHint( void ) const
+TQSize KFontChooser_local::sizeHint( void ) const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 
@@ -539,7 +539,7 @@ void KFontChooser_local::style_chosen_slot(const TQString& style)
         fillSizeList();
     } else {                                // is bitmap font.
         //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO
-        TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
+        TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
         if(sizes.count() > 0) {
             TQValueList<int>::iterator it;
             diff=1000;
@@ -694,13 +694,13 @@ void KFontChooser_local::addFont( TQStringList &list, const char *xfont )
   if ( !ptr )
     return;
 
-  TQString font = TQString::tqfromLatin1(ptr + 1);
+  TQString font = TQString::fromLatin1(ptr + 1);
 
   int pos;
   if ( ( pos = font.find( '-' ) ) > 0 ) {
     font.truncate( pos );
 
-    if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
+    if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
       return;
 
     TQStringList::Iterator it = list.begin();
diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h
index b9d4853c..943ce724 100644
--- a/lib/kotext/KFontDialog_local.h
+++ b/lib/kotext/KFontDialog_local.h
@@ -263,7 +263,7 @@ public:
   /**
    * Reimplemented for internal reasons.
    */
-  virtual TQSize tqsizeHint( void ) const;
+  virtual TQSize sizeHint( void ) const;
 
 signals:
   /**
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index c859d26c..f2c88bcc 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -932,7 +932,7 @@ bool KoAutoFormat::doCompletion( KoTextCursor* textEditCursor, KoTextParag *para
                 uint maxlength = 0;
                 for ( TQStringList::ConstIterator it = wordlist.begin(); it != wordlist.end(); ++it ) // several completion words were found
                 {
-                  if ( (*it).tqstartsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord
+                  if ( (*it).startsWith( lastWord, false ) && new_wordlist.find(*it) == new_wordlist.end() ) //the completion words that begin with lastWord
                   {
                     if ( (*it).length() > maxlength )
                       maxlength = (*it).length();
@@ -1063,7 +1063,7 @@ void KoAutoFormat::showToolTipBox(KoTextParag *parag,  int index, TQWidget *widg
             m_completionBox->setText(word);
             m_completionBox->setLastWord(lastWord);
             m_completionBox->adjustSize();
-            int const height = m_completionBox->tqsizeHint().height();
+            int const height = m_completionBox->sizeHint().height();
             m_completionBox->move( show_pos.x(), show_pos.y() - height );
 
             if (!m_completionBox->isShown() )
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index e6dce371..ddcfb1ae 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -331,11 +331,11 @@ void KoAutoFormatDia::setupTab1()
     hbox->addSpacing( 20 );
     hbox->setSpacing(KDialog::spacingHint());
     pbBulletStyle = new TQPushButton( tab1 );
-    pbBulletStyle->setFixedSize( pbBulletStyle->tqsizeHint() );
+    pbBulletStyle->setFixedSize( pbBulletStyle->sizeHint() );
     hbox->addWidget( pbBulletStyle );
     pbDefaultBulletStyle = new TQPushButton( tab1 );
     pbDefaultBulletStyle->setText(i18n("Default"));
-    pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->tqsizeHint() );
+    pbDefaultBulletStyle->setFixedSize( pbDefaultBulletStyle->sizeHint() );
     hbox->addWidget( pbDefaultBulletStyle );
 
     hbox->addStretch( 1 );
@@ -393,10 +393,10 @@ void KoAutoFormatDia::setupTab2()
     hbox->addSpacing( 20 );
 
     pbDoubleQuote1 = new TQPushButton( tab2 );
-    pbDoubleQuote1->setFixedSize( pbDoubleQuote1->tqsizeHint() );
+    pbDoubleQuote1->setFixedSize( pbDoubleQuote1->sizeHint() );
 
     pbDoubleQuote2 = new TQPushButton( tab2 );
-    pbDoubleQuote2->setFixedSize( pbDoubleQuote2->tqsizeHint() );
+    pbDoubleQuote2->setFixedSize( pbDoubleQuote2->sizeHint() );
 
     if (TQApplication::reverseLayout()) {
         hbox->addWidget( pbDoubleQuote2 );
@@ -410,7 +410,7 @@ void KoAutoFormatDia::setupTab2()
 
     pbDoubleDefault = new TQPushButton( tab2 );
     pbDoubleDefault->setText(i18n("Default"));
-    pbDoubleDefault->setFixedSize( pbDoubleDefault->tqsizeHint() );
+    pbDoubleDefault->setFixedSize( pbDoubleDefault->sizeHint() );
     hbox->addWidget( pbDoubleDefault );
 
     hbox->addStretch( 1 );
@@ -434,10 +434,10 @@ void KoAutoFormatDia::setupTab2()
     hbox->addSpacing( 20 );
 
     pbSimpleQuote1 = new TQPushButton( tab2 );
-    pbSimpleQuote1->setFixedSize( pbSimpleQuote1->tqsizeHint() );
+    pbSimpleQuote1->setFixedSize( pbSimpleQuote1->sizeHint() );
 
     pbSimpleQuote2 = new TQPushButton( tab2 );
-    pbSimpleQuote2->setFixedSize( pbSimpleQuote2->tqsizeHint() );
+    pbSimpleQuote2->setFixedSize( pbSimpleQuote2->sizeHint() );
 
     if (TQApplication::reverseLayout()) {
         hbox->addWidget( pbSimpleQuote2 );
@@ -451,7 +451,7 @@ void KoAutoFormatDia::setupTab2()
 
     pbSimpleDefault = new TQPushButton( tab2 );
     pbSimpleDefault->setText(i18n("Default"));
-    pbSimpleDefault->setFixedSize( pbSimpleDefault->tqsizeHint() );
+    pbSimpleDefault->setFixedSize( pbSimpleDefault->sizeHint() );
     hbox->addWidget( pbSimpleDefault );
 
     hbox->addStretch( 1 );
diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp
index a6c8b2bb..be5278e1 100644
--- a/lib/kotext/KoCommentDia.cpp
+++ b/lib/kotext/KoCommentDia.cpp
@@ -64,7 +64,7 @@ TQString KoCommentDia::commentText()
 
 void KoCommentDia::slotAddAuthorName()
 {
-    TQString date = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
+    TQString date = KGlobal::locale()->formatDate( TQDate::currentDate() );
     TQString time = KGlobal::locale()->formatTime( TQTime::currentTime() );
     TQString result = TQString("--------%1 ,%2, %3------\n").tqarg(authorName).tqarg(date).tqarg(time);
     m_multiLine->insertLine( result, m_multiLine->numLines() );
diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui
index 12ae9d5d..3156e078 100644
--- a/lib/kotext/KoCompletionBase.ui
+++ b/lib/kotext/KoCompletionBase.ui
@@ -83,7 +83,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>
@@ -289,7 +289,7 @@ This option is most important when Automatically add words to completion list is
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>101</width>
                                     <height>20</height>
@@ -329,7 +329,7 @@ This option is most important when Automatically add words to completion list is
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 66d8d374..abe89b56 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl
       m_autoFormat( *autoFormat ),
       m_docAutoFormat( autoFormat )
 {
-    connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtontqStatus()));
+    connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus()));
     TQStringList lst;
     lst << i18n( "Enter" );
     lst << i18n( "Tab" );
@@ -74,10 +74,10 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl
     connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry()));
 
     slotResetConf(); // aka load config
-    changeButtontqStatus();
+    changeButtonStatus();
 }
 
-void KoCompletion::changeButtontqStatus() {
+void KoCompletion::changeButtonStatus() {
     bool state = cbAllowCompletion->isChecked();
 
     completionBox->setEnabled( state);
@@ -122,7 +122,7 @@ void KoCompletion::slotResetConf() {
     default:
         m_completionKeyAction->setCurrentItem( 0 );
     }
-    changeButtontqStatus();
+    changeButtonStatus();
 }
 
 void KoCompletion::slotAddCompletionEntry() {
diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h
index 1aefb39a..98927e0b 100644
--- a/lib/kotext/KoCompletionDia.h
+++ b/lib/kotext/KoCompletionDia.h
@@ -35,7 +35,7 @@ public:
     void saveSettings();
 
 protected slots:
-    void changeButtontqStatus();
+    void changeButtonStatus();
     void slotResetConf();
     void slotAddCompletionEntry();
     void slotRemoveCompletionEntry();
diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp
index 54599d07..981ec506 100644
--- a/lib/kotext/KoComplexText.cpp
+++ b/lib/kotext/KoComplexText.cpp
@@ -913,7 +913,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co
 	}
     }
 
-    KoBiditqStatus status = control->status;
+    KoBidiStatus status = control->status;
     TQChar::Direction dir = TQChar::DirON;
 
     int sor = start;
diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h
index 72abfbed..7f75d730 100644
--- a/lib/kotext/KoComplexText.h
+++ b/lib/kotext/KoComplexText.h
@@ -62,8 +62,8 @@
 #ifndef TQT_NO_COMPLEXTEXT
 
 // bidi helper classes. Internal to TQt
-struct TQ_EXPORT KoBiditqStatus {
-    KoBiditqStatus() {
+struct TQ_EXPORT KoBidiStatus {
+    KoBidiStatus() {
 	eor = TQChar::DirON;
 	lastStrong = TQChar::DirON;
 	last = TQChar:: DirON;
@@ -87,12 +87,12 @@ struct TQ_EXPORT KoBidiContext : public TQShared {
 
 struct TQ_EXPORT KoBidiControl {
     KoBidiControl() { context = 0; }
-    KoBidiControl( KoBidiContext *c, KoBiditqStatus s)
+    KoBidiControl( KoBidiContext *c, KoBidiStatus s)
     { context = c; if( context ) context->ref(); status = s; }
     ~KoBidiControl() { if ( context && context->deref() ) delete context; }
     void setContext( KoBidiContext *c ) { if ( context == c ) return; if ( context && context->deref() ) delete context; context = c; context->ref(); }
     KoBidiContext *context;
-    KoBiditqStatus status;
+    KoBidiStatus status;
 };
 
 struct TQ_EXPORT KoTextRun {
diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp
index e4b9f339..fb7d9b9d 100644
--- a/lib/kotext/KoCreateStyleDia.cpp
+++ b/lib/kotext/KoCreateStyleDia.cpp
@@ -33,7 +33,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent
     TQVBox *page = makeVBoxMainWidget();
     new TQLabel(i18n("Please specify a new style name:"), page);
     m_styleName = new TQLineEdit( page );
-    m_styleName->setMinimumWidth( m_styleName->tqsizeHint().width() * 3 );
+    m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 );
 
     connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &)));
     m_styleName->setFocus();
diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp
index aa74d133..f3b84121 100644
--- a/lib/kotext/KoCustomVariablesDia.cpp
+++ b/lib/kotext/KoCustomVariablesDia.cpp
@@ -67,7 +67,7 @@ void KoVariableNameDia::init()
     row1->setSpacing( KDialog::spacingHint() );
 
     TQLabel *l = new TQLabel( i18n( "Name:" ), row1 );
-    l->setFixedSize( l->tqsizeHint() );
+    l->setFixedSize( l->sizeHint() );
     names = new TQComboBox( TRUE, row1 );
     names->setFocus();
 
@@ -108,9 +108,9 @@ void KoCustomVariablesListItem::setup()
 {
     TQListViewItem::setup();
     setHeight( TQMAX( listView()->fontMetrics().height(),
-                     editWidget->tqsizeHint().height() ) );
-    //if ( listView()->columnWidth( 1 ) < editWidget->tqsizeHint().width() )
-    //    listView()->setColumnWidth( 1, editWidget->tqsizeHint().width() );
+                     editWidget->sizeHint().height() ) );
+    //if ( listView()->columnWidth( 1 ) < editWidget->sizeHint().width() )
+    //    listView()->setColumnWidth( 1, editWidget->sizeHint().width() );
 }
 
 void KoCustomVariablesListItem::update()
@@ -297,13 +297,13 @@ void KoCustomVarDialog::init()
     TQHBox *row1 = new TQHBox( back );
     row1->setSpacing( KDialog::spacingHint() );
     TQLabel *ln = new TQLabel( i18n( "Name:" ), row1 );
-    ln->setFixedSize( ln->tqsizeHint() );
+    ln->setFixedSize( ln->sizeHint() );
     m_name = new KLineEdit( row1 );
 
     TQHBox *row2 = new TQHBox( back );
     row2->setSpacing( KDialog::spacingHint() );
     TQLabel *lv = new TQLabel( i18n( "Value:" ), row2 );
-    lv->setFixedSize( lv->tqsizeHint() );
+    lv->setFixedSize( lv->sizeHint() );
     m_value = new KLineEdit( row2 );
 }
 
diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index 6126d6c5..0de6ee87 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -575,7 +575,7 @@ void KoParagCounter::setDisplayLevels( int l )
     tqinvalidate();
 }
 
-void KoParagCounter::tqsetAlignment( int a )
+void KoParagCounter::setAlignment( int a )
 {
     m_align = a;
     tqinvalidate();
@@ -839,7 +839,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"};
 TQString KoParagCounter::makeRomanNumber( int n )
 {
     if ( n >= 0 )
-        return TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] +
+        return TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] +
                                     RNHundreds[ ( n / 100 ) % 10 ] +
                                     RNTens[ ( n / 10 ) % 10 ] +
                                     RNUnits[ ( n ) % 10 ] );
diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h
index dbedb3e8..6758d952 100644
--- a/lib/kotext/KoParagCounter.h
+++ b/lib/kotext/KoParagCounter.h
@@ -175,7 +175,7 @@ public:
     /** Counter tqalignment
      */
     int tqalignment() const;
-    void tqsetAlignment( int a );
+    void setAlignment( int a );
 
     /**
      * Return the format to use for the counter.
diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui
index 4c93c261..131e1b0c 100644
--- a/lib/kotext/KoParagDecorationTab.ui
+++ b/lib/kotext/KoParagDecorationTab.ui
@@ -131,7 +131,7 @@ modified in the preview.&lt;/p&gt;</string>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>200</height>
@@ -361,7 +361,7 @@ regardless of the style of the preceeding and subsequent paragraphs.&lt;/p&gt;</
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>250</width>
                             <height>21</height>
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 2bc0262d..13c48350 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -205,7 +205,7 @@ void KoCounterStyleWidget::alignmentChanged(const TQString& s)
         kdError()<<"Not Implemented"<<endl;
         return;
     }
-    m_counter.tqsetAlignment(a);
+    m_counter.setAlignment(a);
     emit sig_alignmentChanged(a);
 }
 
@@ -890,12 +890,12 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     TQLabel * lLimit = new TQLabel(length , indentFrame );
     if(frameWidth!=-1)
     {
-        lLimit->tqsetAlignment( AlignRight );
+        lLimit->setAlignment( AlignRight );
         indentGrid->addWidget( lLimit, 1,0 );
     }
 
     TQLabel * lLeft = new TQLabel( i18n("&Left:"), indentFrame );
-    lLeft->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lLeft->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     indentGrid->addWidget( lLeft, 1, 0 );
 
     eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit );
@@ -904,7 +904,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) );
 
     TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame );
-    lRight->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     indentGrid->addWidget( lRight, 2, 0 );
 
     eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit );
@@ -913,7 +913,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) );
 
     TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame );
-    lFirstLine->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     indentGrid->addWidget( lFirstLine, 3, 0 );
 
     eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, m_unit );
@@ -974,7 +974,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
                                                 KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel * lBefore = new TQLabel( i18n("Before:"), pSpaceFrame );
-    lBefore->tqsetAlignment( AlignRight );
+    lBefore->setAlignment( AlignRight );
     pSpaceGrid->addWidget( lBefore, 1, 0 );
 
     eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit );
@@ -983,7 +983,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     pSpaceGrid->addWidget( eBefore, 1, 1 );
 
     TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame );
-    lAfter->tqsetAlignment( AlignRight );
+    lAfter->setAlignment( AlignRight );
     pSpaceGrid->addWidget( lAfter, 2, 0 );
 
     eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit );
@@ -1608,7 +1608,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent,
     gNumbering->tqlayout()->setSpacing( 0 );
     gNumbering->tqlayout()->setMargin( 0 );
     TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() );
-    numberingGroupLayout->tqsetAlignment( TQt::AlignTop );
+    numberingGroupLayout->setAlignment( TQt::AlignTop );
     numberingGroupLayout->setSpacing( KDialog::spacingHint() );
     numberingGroupLayout->setMargin( KDialog::marginHint() );
 
@@ -1773,7 +1773,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     gPosition->tqlayout()->setSpacing( 0 );
     gPosition->tqlayout()->setMargin( 0 );
     TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() );
-    GroupBox2Layout->tqsetAlignment( TQt::AlignTop );
+    GroupBox2Layout->setAlignment( TQt::AlignTop );
     GroupBox2Layout->setSpacing( KDialog::spacingHint() );
     GroupBox2Layout->setMargin( KDialog::marginHint() );
 
@@ -1801,7 +1801,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     bgAlign->tqlayout()->setSpacing( 0 );
     bgAlign->tqlayout()->setMargin( 0 );
     TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() );
-    ButtonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+    ButtonGroup1Layout->setAlignment( TQt::AlignTop );
     ButtonGroup1Layout->setSpacing( KDialog::spacingHint() );
     ButtonGroup1Layout->setMargin( KDialog::marginHint() );
 
@@ -1837,7 +1837,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     gTabLeader = new TQGroupBox( this, "gTabLeader" );
     gTabLeader->setTitle( i18n( "Tab Leader" ) );
     TQVBoxLayout* GroupBox5Layout = new TQVBoxLayout( gTabLeader );
-    GroupBox5Layout->tqsetAlignment( TQt::AlignTop );
+    GroupBox5Layout->setAlignment( TQt::AlignTop );
     GroupBox5Layout->setSpacing( KDialog::spacingHint() );
     GroupBox5Layout->setMargin( KDialog::marginHint() );
     GroupBox5Layout->addSpacing( fontMetrics().height() / 2 ); // groupbox title
@@ -1850,7 +1850,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
 
     TQLabel* TextLabel2 = new TQLabel( gTabLeader);
     TextLabel2->setText( i18n( "&Filling:" ) );
-    TextLabel2->tqsetAlignment( AlignRight );
+    TextLabel2->setAlignment( AlignRight );
     fillingGrid->addWidget( TextLabel2, 0, 0 );
 
     cFilling = new TQComboBox( FALSE, gTabLeader);
@@ -1864,7 +1864,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     fillingGrid->addWidget( cFilling, 0, 1 );
 
     TQLabel * TextLabel3 = new TQLabel( i18n("&Width:"), gTabLeader );
-    TextLabel3->tqsetAlignment( AlignRight );
+    TextLabel3->setAlignment( AlignRight );
     fillingGrid->addWidget( TextLabel3, 1, 0 );
 
     eWidth = new KoUnitDoubleSpinBox( gTabLeader );
diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h
index c4bbed92..26f68e0b 100644
--- a/lib/kotext/KoParagDia.h
+++ b/lib/kotext/KoParagDia.h
@@ -369,7 +369,7 @@ protected slots:
     void restartChanged(bool b) {m_counter.setRestartCounter(b); }
     void depthChanged(int i) {m_counter.setDepth(i); updatePreview();}
     void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();}
-    void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();}
+    void alignmentChanged(int i) {m_counter.setAlignment(i); updatePreview();}
     void slotChangeCustomBullet( const TQString & f, TQChar c);
     void styleChanged (KoParagCounter::Style st );
 
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index 42e8d2b0..374184b3 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -310,7 +310,7 @@ KoTextCursor *KoTextAlignmentCommand::execute( KoTextCursor *c )
     if ( !p )
 	return c;
     while ( p ) {
-	p->tqsetAlignment( newAlign );
+	p->setAlignment( newAlign );
 	if ( p->paragId() == lastParag )
 	    break;
 	p = p->next();
@@ -326,7 +326,7 @@ KoTextCursor *KoTextAlignmentCommand::unexecute( KoTextCursor *c )
     int i = 0;
     while ( p ) {
 	if ( i < (int)oldAligns.size() )
-	    p->tqsetAlignment( oldAligns.at( i ) );
+	    p->setAlignment( oldAligns.at( i ) );
 	if ( p->paragId() == lastParag )
 	    break;
 	p = p->next();
diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h
index 44c360d5..a5fd6b1a 100644
--- a/lib/kotext/KoRichText.h
+++ b/lib/kotext/KoRichText.h
@@ -477,9 +477,9 @@ public:
     KoTextTableCell( KoTextTable* table, int row, int column );
     virtual ~KoTextTableCell();
 
-    TQSize tqsizeHint() const ;
-    TQSize tqminimumSize() const ;
-    TQSize tqmaximumSize() const ;
+    TQSize sizeHint() const ;
+    TQSize minimumSize() const ;
+    TQSize maximumSize() const ;
     TQSizePolicy::ExpandData expanding() const;
     bool isEmpty() const;
     void setGeometry( const TQRect& ) ;
@@ -564,8 +564,8 @@ public:
 
     TQString richText() const;
 
-    int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; }
-    int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; }
+    int minimumWidth() const { return tqlayout ? tqlayout->minimumSize().width() : 0; }
+    int widthHint() const { return ( tqlayout ? tqlayout->sizeHint().width() : 0 ) + 2 * outerborder; }
 
     TQPtrList<KoTextTableCell> tableCells() const { return cells; }
 
@@ -697,7 +697,7 @@ struct KoTextParagLineStart
 #endif
     {  }
 #ifndef TQT_NO_COMPLEXTEXT
-    KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0),
+    KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0),
                                                                lineSpacing( 0 ), hyphenated( false ),
 	status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); }
 #endif
@@ -728,7 +728,7 @@ public:
     short lineSpacing;
     bool hyphenated;
 #ifndef TQT_NO_COMPLEXTEXT
-    KoBiditqStatus status;
+    KoBidiStatus status;
 #endif
     int w;
 
diff --git a/lib/kotext/KoStyleCollection.h b/lib/kotext/KoStyleCollection.h
index 66a244e5..811bbaea 100644
--- a/lib/kotext/KoStyleCollection.h
+++ b/lib/kotext/KoStyleCollection.h
@@ -68,7 +68,7 @@ public:
      * Overloaded for convenience.
      */
     KoParagStyle* findStyle( const TQString & name ) const {
-        return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::tqfromLatin1( "Standard" ) ) );
+        return static_cast<KoParagStyle*>( KoUserStyleCollection::findStyle( name, TQString::fromLatin1( "Standard" ) ) );
     }
 
     /**
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index e5a7dbfa..19840621 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -185,15 +185,15 @@ void KoStyleManager::addGeneralTab( int flags ) {
     tabLayout->setMargin( KDialog::marginHint() );
 
     m_nameString = new TQLineEdit( tab );
-    m_nameString->resize(m_nameString->tqsizeHint() );
+    m_nameString->resize(m_nameString->sizeHint() );
     connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) );
 
     tabLayout->addWidget( m_nameString, 0, 1 );
 
     TQLabel *nameLabel = new TQLabel( tab );
     nameLabel->setText( i18n( "Name:" ) );
-    nameLabel->resize(nameLabel->tqsizeHint());
-    nameLabel->tqsetAlignment( AlignRight | AlignVCenter );
+    nameLabel->resize(nameLabel->sizeHint());
+    nameLabel->setAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( nameLabel, 0, 0 );
 
@@ -203,7 +203,7 @@ void KoStyleManager::addGeneralTab( int flags ) {
 
     TQLabel *nextStyleLabel = new TQLabel( tab );
     nextStyleLabel->setText( i18n( "Next style:" ) );
-    nextStyleLabel->tqsetAlignment( AlignRight | AlignVCenter );
+    nextStyleLabel->setAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( nextStyleLabel, 1, 0 );
 
@@ -212,7 +212,7 @@ void KoStyleManager::addGeneralTab( int flags ) {
 
     TQLabel *inheritStyleLabel = new TQLabel( tab );
     inheritStyleLabel->setText( i18n( "Inherit style:" ) );
-    inheritStyleLabel->tqsetAlignment( AlignRight | AlignVCenter );
+    inheritStyleLabel->setAlignment( AlignRight | AlignVCenter );
 
     tabLayout->addWidget( inheritStyleLabel, 2, 0 );
 
diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp
index b3f24708..126568ef 100644
--- a/lib/kotext/KoTextDocument.cpp
+++ b/lib/kotext/KoTextDocument.cpp
@@ -155,11 +155,11 @@ int KoTextDocument::widthUsed() const
     int w = 0;
     while ( p ) {
 	int a = p->tqalignment();
-	p->tqsetAlignment( TQt::AlignLeft );
+	p->setAlignment( TQt::AlignLeft );
 	p->tqinvalidate( 0 );
 	p->format();
 	w = TQMAX( w, p->rect().width() );
-	p->tqsetAlignment( a );
+	p->setAlignment( a );
 	p->tqinvalidate( 0 );
 	p = p->next();
     }
@@ -1295,7 +1295,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
     // The test on mat is almost like isIdentity(), but allows for translation.
     //// ##### The way to fix this: initialize the pixmap to be fully transparent instead
     // of being white.
-    TQWMatrix mat = p->tqworldMatrix();
+    TQWMatrix mat = p->worldMatrix();
     if ( ( mat.m11() != 1.0 || mat.m22() != 1.0 || mat.m12() != 0.0 || mat.m21() != 0.0 )
          && brush.style() != TQt::SolidPattern )
         useDoubleBuffer = FALSE;
diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h
index 8cdc1b52..5f2a0665 100644
--- a/lib/kotext/KoTextDocument.h
+++ b/lib/kotext/KoTextDocument.h
@@ -190,7 +190,7 @@ public:
     //bool focusNextPrevChild( bool next );
 
     int tqalignment() const;
-    void tqsetAlignment( int a );
+    void setAlignment( int a );
 
     int *tabArray() const;
     int tabStopWidth() const;
@@ -540,7 +540,7 @@ inline int KoTextDocument::tqalignment() const
     return align;
 }
 
-inline void KoTextDocument::tqsetAlignment( int a )
+inline void KoTextDocument::setAlignment( int a )
 {
     align = a;
 }
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index 30bf6dd3..8732d71d 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -748,7 +748,7 @@ void KoTextObject::pasteText( KoTextCursor * cursor, const TQString & text, KoTe
     kdDebug(32500) << "KoTextObject::pasteText cursor parag=" << cursor->parag()->paragId() << endl;
     TQString t = text;
     // Need to convert CRLF to NL
-    TQRegExp crlf( TQString::tqfromLatin1("\r\n") );
+    TQRegExp crlf( TQString::fromLatin1("\r\n") );
     t.replace( crlf, TQChar('\n') );
     // Convert non-printable chars
     for ( int i=0; (uint) i<t.length(); i++ ) {
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index 23754c28..a081dfda 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -961,7 +961,7 @@ void KoTextParag::setAlign( int align )
 {
     Q_ASSERT( align <= TQt::AlignJustify );
     align &= TQt::AlignHorizontal_Mask;
-    tqsetAlignment( align );
+    setAlignment( align );
     m_layout.tqalignment = align;
 }
 
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index e27a9afc..591242a2 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -130,8 +130,8 @@ public:
 
     void setFormat( int index, int len, const KoTextFormat *f, bool useCollection = TRUE, int flags = -1 );
 
-    void tqsetAlignment( uint a );
-    void tqsetAlignmentDirect( uint a ) { align = a; }
+    void setAlignment( uint a );
+    void setAlignmentDirect( uint a ) { align = a; }
     uint tqalignment() const;
 
     virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
@@ -235,7 +235,7 @@ public:
     void setLineSpacingType( KoParagLayout::SpacingType _type );
 
 
-    /** Use this to change the paragraph tqalignment, not KoTextParag::tqsetAlignment ! */
+    /** Use this to change the paragraph tqalignment, not KoTextParag::setAlignment ! */
     void setAlign( int align );
     /** Return the real tqalignment: Auto is resolved to either Left or Right */
     int resolveAlignment() const;
@@ -520,7 +520,7 @@ inline KoTextDocument *KoTextParag::document() const
     return doc;
 }
 
-inline void KoTextParag::tqsetAlignment( uint a )
+inline void KoTextParag::setAlignment( uint a )
 {
     if ( a == align )
 	return;
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index 32e82b73..e272422d 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -901,7 +901,7 @@ bool KoTextView::insertParagraph(const TQPoint &pos)
         {
             //FIXME me bidi.
             //change parag tqalignment => right tqalignment
-            last->tqsetAlignment( TQt::AlignRight );
+            last->setAlignment( TQt::AlignRight );
         }
         else
         {
@@ -1500,7 +1500,7 @@ void KoTextView::updateStyleFromSelection( KoParagStyle* style )
 
 void KoTextView::addBookmarks(const TQString &url)
 {
-    TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
+    TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
     KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename,false );
     KBookmarkGroup group = bookManager->root();
     group.addBookmark( bookManager, url, KURL( url));
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index fa1b03fe..4b744faf 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -1211,7 +1211,7 @@ void KoDateVariable::resize()
 void KoDateVariable::recalc()
 {
     if ( m_subtype == VST_DATE_CURRENT )
-        m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate));
+        m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate));
     else if ( m_subtype == VST_DATE_LAST_PRINTING )
         m_varValue = m_varColl->variableSetting()->lastPrintingDate();
     else if ( m_subtype == VST_DATE_CREATE_FILE )
@@ -1222,7 +1222,7 @@ void KoDateVariable::recalc()
     {
         // Only if never set before (i.e. upon insertion)
         if ( m_varValue.isNull() )
-            m_varValue = TQDateTime(TQDateTime::tqcurrentDateTime().addDays(m_correctDate));
+            m_varValue = TQDateTime(TQDateTime::currentDateTime().addDays(m_correctDate));
     }
     resize();
 }
@@ -2505,7 +2505,7 @@ void KoLinkVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, int h
 /******************************************************************/
 KoNoteVariable::KoNoteVariable( KoTextDocument *textdoc, const TQString & _note,KoVariableFormat *varFormat,KoVariableCollection *_varColl )
     : KoVariable( textdoc, varFormat,_varColl )
-    , m_createdNoteDate( TQDate::tqcurrentDate() )
+    , m_createdNoteDate( TQDate::currentDate() )
 {
     m_varValue = TQVariant( _note );
 }
diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui
index cd8f17f2..7c8896b5 100644
--- a/lib/kotext/kodecorationtabbase.ui
+++ b/lib/kotext/kodecorationtabbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQGroupBox">
             <property name="name">
-                <cstring>tqcolorGroupBox</cstring>
+                <cstring>colorGroupBox</cstring>
             </property>
             <property name="title">
                 <string>Colors</string>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui
index 27be0702..b2b4ce26 100644
--- a/lib/kotext/kohighlightingtabbase.ui
+++ b/lib/kotext/kohighlightingtabbase.ui
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>41</height>
diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui
index a9073584..0fbd5442 100644
--- a/lib/kotext/kolanguagetabbase.ui
+++ b/lib/kotext/kolanguagetabbase.ui
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>171</height>
diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui
index 471607d4..e7e03d58 100644
--- a/lib/kotext/kolayouttabbase.ui
+++ b/lib/kotext/kolayouttabbase.ui
@@ -94,7 +94,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>61</width>
                             <height>20</height>
@@ -225,7 +225,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index 5d5fbe5e..356b0158 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -11,14 +11,14 @@ class MyWidget : public TQWidget
 public:
     MyWidget( KoZoomHandler* _zh, TQWidget* parent )
         : TQWidget( parent ), m_zh(_zh) {
-        tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+        setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
     }
 
-    TQSize tqsizeHint() const {
+    TQSize sizeHint() const {
         return TQSize( 150, 150 );
     }
-    TQSize tqminimumSizeHint() const {
-        return tqsizeHint();
+    TQSize minimumSizeHint() const {
+        return sizeHint();
     }
 
     KoBorder m_leftBorder;
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index b6138315..a13adddb 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -205,8 +205,8 @@ int main (int argc, char ** argv)
     KApplication app(argc, argv, "KoTextFormatter test");
 
     // Don't let locale settings lead to different hyphenation output
-    KGlobal::locale()->setLanguage( TQString::tqfromLatin1( "en_US" ) );
-    KGlobal::locale()->setCountry( TQString::tqfromLatin1( "C" ) );
+    KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
+    KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) );
 
     KoTextFormatterTest test;
     //test.speedTest();
diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui
index 830b3bdb..77a261ea 100644
--- a/lib/kotext/timedateformatwidget.ui
+++ b/lib/kotext/timedateformatwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -86,7 +86,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -137,7 +137,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -175,7 +175,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>10</height>