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

33 files changed, 209 insertions, 209 deletions

diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp
index d60619f0..e30734e8 100644
--- a/src/generalinfowidget.cpp
+++ b/src/generalinfowidget.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 
 #include <klineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
@@ -92,7 +92,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
     TQFile configurein(configureinpath);
 
     if ( !configurein.open( IO_ReadOnly ) ){
-        KMessageBox::error(this, i18n("Could not open %1 for reading.").tqarg(configureinpath));
+        KMessageBox::error(this, i18n("Could not open %1 for reading.").arg(configureinpath));
         return;
     }
 
@@ -152,7 +152,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt
     // write our changes..
     TQFile configureout(configureinpath);
     if ( !configureout.open( IO_WriteOnly ) ){
-        KMessageBox::error(this, i18n("Could not open %1 for writing.").tqarg(configureinpath));
+        KMessageBox::error(this, i18n("Could not open %1 for writing.").arg(configureinpath));
         return ;
     }
     TQTextStream output( &configureout);
@@ -217,13 +217,13 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
     else if(isProjectDirectoryAbsolute() && text[0] != '/')
     {
        setProjectDirectoryError(
-           i18n("'%1' is not an absolute path.").tqarg(
+           i18n("'%1' is not an absolute path.").arg(
                project_directory_edit->text()));
     }
     else if(!isProjectDirectoryAbsolute() && text[0] == '/')
     {
        setProjectDirectoryError(
-           i18n("'%1' is not a relative path.").tqarg(
+           i18n("'%1' is not a relative path.").arg(
                project_directory_edit->text()));
     }
     else
@@ -231,11 +231,11 @@ void GeneralInfoWidget::slotProjectDirectoryChanged( const TQString& text ) {
         TQFileInfo info(projectDirectory());
         if(!info.exists())
            setProjectDirectoryError(
-               i18n("'%1' does not exist.").tqarg(
+               i18n("'%1' does not exist.").arg(
                    project_directory_edit->text()));
         else if(!info.isDir())
            setProjectDirectoryError(
-               i18n("'%1' is not a directory.").tqarg(
+               i18n("'%1' is not a directory.").arg(
                    project_directory_edit->text()));
         else
            setProjectDirectorySuccess();
@@ -261,10 +261,10 @@ void GeneralInfoWidget::setProjectDirectorySuccess() {
     project_directory_diagnostic_icon->setPixmap(SmallIcon("ok"));
     if(isProjectDirectoryAbsolute())
         project_directory_diagnostic_label->setText(
-            i18n("'%1' is a valid project directory.").tqarg(projectDirectory()));
+            i18n("'%1' is a valid project directory.").arg(projectDirectory()));
     else
         project_directory_diagnostic_label->setText(
-            i18n("'%1' is a valid project directory.").tqarg(projectDirectory()));
+            i18n("'%1' is a valid project directory.").arg(projectDirectory()));
 }
 
 TQString makeRelativePath(const TQString& fromPath, const TQString& toPath)
diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui
index f253e41a..42502e58 100644
--- a/src/generalinfowidgetbase.ui
+++ b/src/generalinfowidgetbase.ui
@@ -44,7 +44,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>408</width>
                     <height>20</height>
@@ -103,7 +103,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>100</width>
                     <height>32767</height>
@@ -145,13 +145,13 @@ Placed in the AUTHORS file</string>
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
diff --git a/src/kconf_update/kdev-gen-settings-kconf_update.cpp b/src/kconf_update/kdev-gen-settings-kconf_update.cpp
index 64c0b791..a2703163 100644
--- a/src/kconf_update/kdev-gen-settings-kconf_update.cpp
+++ b/src/kconf_update/kdev-gen-settings-kconf_update.cpp
@@ -16,7 +16,7 @@
 */
 
 #include <tqmap.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 static TQTextStream qcin ( stdin,  IO_ReadOnly );
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index fcf3414c..0f31d40e 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -79,7 +79,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
     gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" );
 
     config->setGroup("TerminalEmulator");
-    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole") ) );
+    gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) );
     bool useKDESetting = config->readBoolEntry( "UseKDESetting", true );
     gsw->useKDETerminal->setChecked( useKDESetting );
     gsw->useOtherTerminal->setChecked( !useKDESetting );
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index eb77fc44..4300fcfd 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -13,7 +13,7 @@
 #include <tqvariant.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqgroupbox.h>
 #include <tqhbox.h>
@@ -60,14 +60,14 @@ LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom,
 
 void LanguageSelectWidget::init()
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
 
     TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this );
     groupBox1->setColumnLayout(0, Qt::Vertical );
-    groupBox1->tqlayout()->setSpacing( 6 );
-    groupBox1->tqlayout()->setMargin( 11 );
-    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() );
-    groupBox1Layout->tqsetAlignment( TQt::AlignTop );
+    groupBox1->layout()->setSpacing( 6 );
+    groupBox1->layout()->setMargin( 11 );
+    TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() );
+    groupBox1Layout->setAlignment( TQt::AlignTop );
 
     _currentLanguage = new TQLabel( "", groupBox1 );
 
@@ -78,21 +78,21 @@ void LanguageSelectWidget::init()
 
     groupBox1Layout->addWidget(_currentLanguage);
     groupBox1Layout->addWidget( _pluginList );
-    tqlayout->addWidget( groupBox1 );
+    layout->addWidget( groupBox1 );
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->tqlayout()->setSpacing( 6 );
-    groupBox2->tqlayout()->setMargin( 11 );
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
-    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
+    groupBox2->layout()->setSpacing( 6 );
+    groupBox2->layout()->setMargin( 11 );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
+    groupBox2Layout->setAlignment( TQt::AlignTop );
 
     _pluginDescription = new TQLabel( groupBox2 );
-    _pluginDescription->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    _pluginDescription->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
     groupBox2Layout->addWidget( _pluginDescription );
 
-    tqlayout->addWidget( groupBox2 );
+    layout->addWidget( groupBox2 );
 
     connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
 
@@ -106,13 +106,13 @@ LanguageSelectWidget::~LanguageSelectWidget()
 void LanguageSelectWidget::readProjectConfig()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
-                               TQString::tqfromLatin1("[X-KDevelop-Version] == %1"
-                               ).tqarg( KDEVELOP_PLUGIN_VERSION ));
+        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
+                               ).arg( KDEVELOP_PLUGIN_VERSION ));
 
     TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
     TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage");
-    _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").tqarg(language));
+    _currentLanguage->setText(i18n("Primary language is '%1'. Please select additional languages the project might contain.").arg(language));
 
     for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 6eda3c46..922ccd26 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -127,30 +127,30 @@ void MainWindowShare::createActions()
                 this, TQT_SLOT(slotShowMenuBar()),
                 m_pMainWnd->actionCollection(), "settings_show_menubar" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you switch the menubar on/off.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off.")));
 
   action = KStdAction::keyBindings(
                 this, TQT_SLOT(slotKeyBindings()),
                 m_pMainWnd->actionCollection(), "settings_configure_shortcuts" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure shortcut keys.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys.")));
 
   action = KStdAction::configureToolbars(
                 this, TQT_SLOT(slotConfigureToolbars()),
                 m_pMainWnd->actionCollection(), "settings_configure_toolbars" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure toolbars.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars.")));
 
   action = KStdAction::configureNotifications(
                 this, TQT_SLOT(slotConfigureNotifications()),
                 m_pMainWnd->actionCollection(), "settings_configure_notifications" );
   action->setToolTip(beautifyToolTip(action->text()));
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(action->text())).tqarg(i18n("Lets you configure system notifications.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications.")));
 
   action = KStdAction::preferences(this, TQT_SLOT(slotSettings()),
                 m_pMainWnd->actionCollection(), "settings_configure" );
   action->setToolTip( i18n( "Configure KDevelop" ) );
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(i18n( "Configure KDevelop" )).tqarg(i18n("Lets you customize KDevelop.")));
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop.")));
 
   m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar");
   m_toggleStatusbar->setText(i18n("Show &Statusbar"));
diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui
index 87b92349..3891110a 100644
--- a/src/mimewarningdialog.ui
+++ b/src/mimewarningdialog.ui
@@ -124,7 +124,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -140,7 +140,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>24</width>
                                     <height>20</height>
@@ -168,7 +168,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -181,7 +181,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -197,7 +197,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 3b483cd4..0d7cf9aa 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -49,8 +49,8 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     setToggleButton(true);
     setFocusPolicy(TQ_NoFocus);
     setDescription(m_description);
-    tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-    resize(tqsizeHint());
+    setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    resize(sizeHint());
     fixDimensions(Ideal::Bottom);
 
     TQToolTip::add(this, m_realText);
@@ -62,9 +62,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
 
     KConfig *config = kapp->config();
     config->setGroup("UI");
-    TQString accel = config->readEntry(TQString("button_%1").tqarg(text), "");
+    TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
     if (!accel.isEmpty())
-        setRealText(TQString("&%1 %2").tqarg(accel).tqarg(m_realText));
+        setRealText(TQString("&%1 %2").arg(accel).arg(m_realText));
 }
 
 Button::~Button()
@@ -80,11 +80,11 @@ Button::~Button()
         TQString text = m_realText;
         if (text.contains(r2))
             text.remove(r2);
-        config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1));
+        config->writeEntry(TQString("button_%1").arg(text), r.cap(1));
     }
     else
     {
-        config->writeEntry(TQString("button_%1").tqarg(m_realText), "");
+        config->writeEntry(TQString("button_%1").arg(m_realText), "");
     }
 }
 
@@ -131,11 +131,11 @@ void Button::drawButton(TQPainter *p)
     pm.fill(eraseColor());
     TQPainter p2(&pm);
 
-    tqstyle().tqdrawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), tqcolorGroup(),flags);
+    tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
 
-    tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel, &p2, this,
+    tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
                         TQRect(0,0,pm.width(),pm.height()),
-                        tqcolorGroup(), flags, TQStyleOption());
+                        colorGroup(), flags, TQStyleOption());
 
     switch (m_place)
     {
@@ -178,7 +178,7 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Bottom) || (oldPlace == Ideal::Top))
             {
                 setFixedWidth(height());
-                setMinimumHeight(tqsizeHint().width());
+                setMinimumHeight(sizeHint().width());
                 setMaximumHeight(32767);
             }
             break;
@@ -187,19 +187,19 @@ void Button::fixDimensions(Place oldPlace)
             if ((oldPlace == Ideal::Left) || (oldPlace == Ideal::Right))
             {
                 setFixedHeight(width());
-                setMinimumWidth(tqsizeHint().height());
+                setMinimumWidth(sizeHint().height());
                 setMaximumWidth(32767);
             }
             break;
     }
 }
 
-TQSize Button::tqsizeHint() const
+TQSize Button::sizeHint() const
 {
-    return tqsizeHint(text());
+    return sizeHint(text());
 }
 
-TQSize Button::tqsizeHint(const TQString &text) const
+TQSize Button::sizeHint(const TQString &text) const
 {
     constPolish();
     int w = 0, h = 0;
@@ -211,7 +211,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
         h = TQMAX( h, ih );
     }
     if ( isMenuButton() )
-        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
         w += pm->width();
@@ -220,7 +220,7 @@ TQSize Button::tqsizeHint(const TQString &text) const
         TQString s( text );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::tqfromLatin1("XXXX");
+            s = TQString::fromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
@@ -239,12 +239,12 @@ void Button::updateSize()
     {
         case Ideal::Left:
         case Ideal::Right:
-             setMinimumHeight(tqsizeHint().width());
-             resize(tqsizeHint().height(), tqsizeHint().width());
+             setMinimumHeight(sizeHint().width());
+             resize(sizeHint().height(), sizeHint().width());
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            resize(tqsizeHint().width(), tqsizeHint().height());
+            resize(sizeHint().width(), sizeHint().height());
             break;
     }
 }
@@ -319,7 +319,7 @@ void Button::assignAccel()
     if (ok)
     {
         TQString text = realTextWithoutAccel();
-        text = TQString("&%1 %2").tqarg(num).tqarg(text);
+        text = TQString("&%1 %2").arg(num).arg(text);
         setRealText(text);
     }
 }
diff --git a/src/newui/button.h b/src/newui/button.h
index 34ce4e3a..96948267 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -54,8 +54,8 @@ public:
     /**Sets the mode of a button.*/
     void setMode(Ideal::ButtonMode mode);
 
-    TQSize tqsizeHint() const;
-    TQSize tqsizeHint(const TQString &text) const;
+    TQSize sizeHint() const;
+    TQSize sizeHint(const TQString &text) const;
 
     /**Updates size of a widget. Used after squeezing button's text.*/
     void updateSize();
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index ddd4249b..2f193ad8 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "buttonbar.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
@@ -37,9 +37,9 @@ ButtonLayout::ButtonLayout(ButtonBar *parent, Direction d, int margin, int spaci
 {
 }
 
-TQSize ButtonLayout::tqminimumSize() const
+TQSize ButtonLayout::minimumSize() const
 {
-    TQSize size = TQBoxLayout::tqminimumSize();
+    TQSize size = TQBoxLayout::minimumSize();
 
     if (!m_buttonBar->autoResize())
         return size;
@@ -54,7 +54,7 @@ TQSize ButtonLayout::tqminimumSize() const
         case Ideal::Bottom:
             return TQSize(0,size.height());
     }
-    return TQBoxLayout::tqminimumSize();
+    return TQBoxLayout::minimumSize();
 }
 
 
@@ -128,14 +128,14 @@ void ButtonBar::fixDimensions()
     {
         case Ideal::Left:
         case Ideal::Right:
-            setFixedWidth(tqsizeHint().width());
-            setMinimumHeight(tqsizeHint().height());
+            setFixedWidth(sizeHint().width());
+            setMinimumHeight(sizeHint().height());
             setMaximumHeight(32767);
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            setFixedHeight(tqsizeHint().height());
-            setMinimumWidth(tqsizeHint().width());
+            setFixedHeight(sizeHint().height());
+            setMinimumWidth(sizeHint().width());
             setMaximumWidth(32767);
             break;
     }
@@ -156,13 +156,13 @@ void ButtonBar::resizeEvent(TQResizeEvent *ev)
     {
         case Ideal::Left:
         case Ideal::Right:
-            preferredDimension = l->TQBoxLayout::tqminimumSize().height();
+            preferredDimension = l->TQBoxLayout::minimumSize().height();
             actualDimension = size().height();
             oldDimension = ev->oldSize().height();
             break;
         case Ideal::Top:
         case Ideal::Bottom:
-            preferredDimension = l->TQBoxLayout::tqminimumSize().width();
+            preferredDimension = l->TQBoxLayout::minimumSize().width();
             actualDimension = size().width();
             oldDimension = ev->oldSize().width();
             break;
@@ -285,7 +285,7 @@ int ButtonBar::originalDimension()
     int size = 0;
     for (ButtonList::const_iterator it = m_buttons.constBegin(); it != m_buttons.constEnd(); ++it)
     {
-        size += (*it)->tqsizeHint((*it)->realText()).width();
+        size += (*it)->sizeHint((*it)->realText()).width();
     }
     return size;
 }
diff --git a/src/newui/buttonbar.h b/src/newui/buttonbar.h
index ce4ad23b..9eb18e30 100644
--- a/src/newui/buttonbar.h
+++ b/src/newui/buttonbar.h
@@ -25,21 +25,21 @@
 
 #include "comdefs.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 namespace Ideal {
 
 class Button;
 class ButtonBar;
 
-/**@short A tqlayout for a ButtonBar class.
+/**@short A layout for a ButtonBar class.
 
-Overrides tqminimumSize method to allow shrinking button bar buttons.*/
+Overrides minimumSize method to allow shrinking button bar buttons.*/
 class ButtonLayout: public TQBoxLayout{
 public:
     ButtonLayout(ButtonBar *parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0);
 
-    virtual TQSize tqminimumSize() const;
+    virtual TQSize minimumSize() const;
 
 private:
     ButtonBar *m_buttonBar;
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 9ce444eb..07d3da2a 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -20,7 +20,7 @@
 #include "ddockwindow.h"
 
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 #include <tqwidgetstack.h>
 #include <tqimage.h>
@@ -104,7 +104,7 @@ void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
     KConfig *config = kapp->config();
-    TQString group = TQString("%1").tqarg(m_name);
+    TQString group = TQString("%1").arg(m_name);
     config->setGroup(group);
 
     if (m_visible)
@@ -115,13 +115,13 @@ void DDockWindow::setVisible(bool v)
     v ? m_widgetStack->show() : m_widgetStack->hide();
     m_visible = v;
 
-    m_internalLayout->tqinvalidate();
+    m_internalLayout->invalidate();
     if (!m_visible)
     {
         if (m_position == DDockWindow::Bottom)
-            setFixedExtentHeight(m_internalLayout->tqsizeHint().height());
+            setFixedExtentHeight(m_internalLayout->sizeHint().height());
         else
-            setFixedExtentWidth(m_internalLayout->tqsizeHint().width());
+            setFixedExtentWidth(m_internalLayout->sizeHint().width());
         emit hidden();
     }
     else
@@ -130,12 +130,12 @@ void DDockWindow::setVisible(bool v)
         int size = 0;
         if (m_position == DDockWindow::Bottom)
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().height());
             setFixedExtentHeight(size);
         }
         else
         {
-            size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width());
+            size = config->readNumEntry("ViewWidth", m_internalLayout->sizeHint().width());
             setFixedExtentWidth(size);
         }
     }
@@ -148,7 +148,7 @@ void DDockWindow::loadSettings()
 void DDockWindow::saveSettings()
 {
     KConfig *config = kapp->config();
-    TQString group = TQString("%1").tqarg(m_name);
+    TQString group = TQString("%1").arg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
     if (config->hasKey("ViewWidth"))
@@ -200,7 +200,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
         //if the widget was selected last time the dock is deleted
         //we need to show it
         KConfig *config = kapp->config();
-        TQString group = TQString("%1").tqarg(m_name);
+        TQString group = TQString("%1").arg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
         {
@@ -338,7 +338,7 @@ bool DDockWindow::isActive()
 {
     if (m_toggledButton)
     {
-        TQWidget *w = tqApp->tqfocusWidget();
+        TQWidget *w = tqApp->focusWidget();
         if (!w)
             return false;
         TQWidget *toolWidget = m_widgets[m_toggledButton];
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 4c787886..45894178 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -184,8 +184,8 @@ DTabWidget *DMainWindow::splitVertical()
 
 void DMainWindow::invalidateActiveTabWidget()
 {
-/*    TQWidget *focused = m_central->tqfocusWidget();
-    kdDebug(9000) << "tqinvalidate: " << focused << endl;
+/*    TQWidget *focused = m_central->focusWidget();
+    kdDebug(9000) << "invalidate: " << focused << endl;
     if (focused == 0)
         return;
     if (!m_widgets.contains(focused))
diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp
index 8b382fb7..26fd4a71 100644
--- a/src/newui/docksplitter.cpp
+++ b/src/newui/docksplitter.cpp
@@ -113,7 +113,7 @@ void DockSplitter::removeDock(uint row, uint col, bool alsoDelete)
         w->hide();
     }
 
-    m_splitters[row]->setMinimumSize(m_splitters[row]->tqminimumSizeHint());
+    m_splitters[row]->setMinimumSize(m_splitters[row]->minimumSizeHint());
 
     if (isRowEmpty(row))
     {
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index 64b60ee7..c3a0c7d1 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -85,7 +85,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQString &label, int index)
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
     KTabWidget::insertTab(child, label, index);
-    if (index != -1) tabBar()->tqrepaint();
+    if (index != -1) tabBar()->repaint();
 }
 
 void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset, 
@@ -94,7 +94,7 @@ void DTabWidget::insertTab(TQWidget *child, const TQIconSet &iconset,
     if (m_closeButton && m_closeButtonShown)
         m_closeButton->show();
     KTabWidget::insertTab(child, iconset, label, index);
-    if (index != -1) tabBar()->tqrepaint();
+    if (index != -1) tabBar()->repaint();
 }
 
 /*void DTabWidget::updateHistory(TQWidget *w)
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 65257b1f..50659803 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -4,7 +4,7 @@
 
 #include <tqpopupmenu.h>
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
@@ -131,7 +131,7 @@ void PartController::setupActions()
   newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") );
 
   m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" );
-  m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_openRecentAction->text())).tqarg(i18n("Opens recently opened file.")));
+  m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file.")));
   m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" );
 
   m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all");
@@ -146,7 +146,7 @@ void PartController::setupActions()
 
   m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close");
   m_closeWindowAction->setToolTip( i18n("Close current file") );
-  m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").tqarg(beautifyToolTip(m_closeWindowAction->text())).tqarg(i18n("Closes current file.")));
+  m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file.")));
   m_closeWindowAction->setEnabled(false);
 
   m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all");
@@ -534,8 +534,8 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	else
 	{
 		MimeWarningDialog dlg;
-		dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).tqarg(url.path()));
-		dlg.text3->setText( dlg.text3->text().tqarg(MimeType->name()) );
+		dlg.text2->setText( TQString( "<qt><b>%1</b></qt>" ).arg(url.path()));
+		dlg.text3->setText( dlg.text3->text().arg(MimeType->name()) );
 
 		if ( dlg.exec() == TQDialog::Accepted )
 		{
@@ -593,7 +593,7 @@ void PartController::showDocument(const KURL &url, bool newWin)
 
 KParts::Factory *PartController::findPartFactory(const TQString &mimeType, const TQString &partType, const TQString &preferredName)
 {
-  KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").tqarg(partType));
+  KTrader::OfferList offers = KTrader::self()->query(mimeType, TQString("'%1' in ServiceTypes").arg(partType));
 
   if (offers.count() > 0)
   {
@@ -694,7 +694,7 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
   // Document object and our HTMLDocumentationPart
 //  connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged()));
 
-  // Connect to the document's views newtqStatus() signal in order to keep track of the
+  // Connect to the document's views newStatus() signal in order to keep track of the
   // modified-status of the document.
 
   if (isTextEditor)
@@ -718,8 +718,8 @@ void PartController::integratePart(KParts::Part *part, const KURL &url,
       connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )),
           API::getInstance()->languageSupport(),
           TQT_SLOT(openSource(DesignerType, const TQString& )));
-      connect(designerPart, TQT_SIGNAL(newtqStatus(const TQString &, int)),
-          this, TQT_SLOT(slotNewDesignertqStatus(const TQString &, int)));
+      connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)),
+          this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int)));
   }
 }
 
@@ -787,7 +787,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc)
   TQPtrListIterator<KTextEditor::View> it( list );
   while ( it.current() )
   {
-    connect( it, TQT_SIGNAL( newtqStatus() ), this, TQT_SLOT( slotNewtqStatus() ) );
+    connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) );
     ++it;
   }
 }
@@ -1005,7 +1005,7 @@ void PartController::reloadFile( const KURL & url )
 		if ( part->isModified() )
 		{
 			if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(),
-				i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).tqarg( url.path() ),
+				i18n( "The file \"%1\" is modified in memory. Are you sure you want to reload it? (Local changes will be lost.)" ).arg( url.path() ),
 				i18n( "File is Modified" ), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::Yes )
 			{
 				part->setModified( false );
@@ -1120,7 +1120,7 @@ bool PartController::saveFile( const KURL & url, bool force )
 		case DirtyAndModified:
 			{
 				int code = KMessageBox::warningYesNoCancel( TopLevel::getInstance()->main(),
-					i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").tqarg( url.path() ),
+					i18n("The file \"%1\" is modified on disk.\n\nAre you sure you want to overwrite it? (External changes will be lost.)").arg( url.path() ),
 					i18n("File Externally Modified"), i18n("Overwrite"), i18n("Do Not Overwrite") );
 				if ( code == KMessageBox::Yes )
 				{
@@ -1481,7 +1481,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	{
 		KMessageBox::sorry( TopLevel::getInstance()->main(),
 			i18n("Conflict: The file \"%1\" has changed on disk while being modified in memory.\n\n"
-					"You should investigate before saving to make sure you are not losing data.").tqarg( url.path() ),
+					"You should investigate before saving to make sure you are not losing data.").arg( url.path() ),
 			i18n("Conflict") );
 		return false;
 	}
@@ -1490,7 +1490,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	{
 		KMessageBox::sorry( TopLevel::getInstance()->main(),
 			i18n("Warning: The file \"%1\" has been deleted on disk.\n\n"
-					"If this was not your intention, make sure to save this file now.").tqarg( url.path() ),
+					"If this was not your intention, make sure to save this file now.").arg( url.path() ),
 			i18n("File Deleted") );
 		return false;
 	}
@@ -1498,7 +1498,7 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	if ( dirtyAction == "alert" )
 	{
 		if ( KMessageBox::warningYesNo( TopLevel::getInstance()->main(),
-	   		i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").tqarg( url.path() ),
+	   		i18n("The file \"%1\" has changed on disk.\n\nDo you want to reload it?").arg( url.path() ),
 			i18n("File Changed"), i18n("Reload"), i18n("Do Not Reload") ) == KMessageBox::No )
 		{
 			return false;
@@ -1511,14 +1511,14 @@ bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 	return true;
 }
 
-void PartController::slotNewDesignertqStatus(const TQString &formName, int status)
+void PartController::slotNewDesignerStatus(const TQString &formName, int status)
 {
 	kdDebug(9000) << k_funcinfo << endl;
 	kdDebug(9000) << " formName: " << formName << ", status: " << status << endl;
 	emit documentChangedState( KURL::fromPathOrURL(formName), DocumentState(status) );
 }
 
-void PartController::slotNewtqStatus( )
+void PartController::slotNewStatus( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
@@ -1628,7 +1628,7 @@ void PartController::slotBackAboutToShow()
 	TQValueList<HistoryEntry>::ConstIterator it = m_backHistory.begin();
 	while( i < 10 && it != m_backHistory.end() )
 	{
-		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id );
+		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
 		++i;
 		++it;
 	}
@@ -1645,7 +1645,7 @@ void PartController::slotForwardAboutToShow( )
 	TQValueList<HistoryEntry>::ConstIterator it = m_forwardHistory.begin();
 	while( i < 10 && it != m_forwardHistory.end() )
 	{
-		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").tqarg( (*it).line +1), (*it).id );
+		popup->insertItem( (*it).url.fileName() + TQString(" (%1)").arg( (*it).line +1), (*it).id );
 		++i;
 		++it;
 	}
diff --git a/src/partcontroller.h b/src/partcontroller.h
index 9e563914..c811df7a 100644
--- a/src/partcontroller.h
+++ b/src/partcontroller.h
@@ -141,8 +141,8 @@ private slots:
 
   void slotDocumentDirty( Kate::Document * doc, bool isModified, unsigned char reason );
   void slotDocumentDirtyStepTwo( void * );
-  void slotNewtqStatus();
-  void slotNewDesignertqStatus(const TQString &formName, int status);
+  void slotNewStatus();
+  void slotNewDesignerStatus(const TQString &formName, int status);
   void textChanged();
   void gotoLastEditPos();
 
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 5ec5a72c..6639375b 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -49,7 +49,7 @@ namespace
   template <class ComponentType>
   ComponentType *loadDefaultPart( const TQString &serviceType )
   {
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
     KTrader::OfferList::ConstIterator serviceIt = offers.begin();
     for ( ; serviceIt != offers.end(); ++serviceIt ) {
       KService::Ptr service = *serviceIt;
@@ -79,10 +79,10 @@ PluginController *PluginController::getInstance()
 PluginController::PluginController()
   : KDevPluginController()
 {
-/*  m_defaultProfile = TQString::tqfromLatin1( "FullIDE" );
+/*  m_defaultProfile = TQString::fromLatin1( "FullIDE" );
   m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" +
 			 KStandardDirs::kde_default( "data" ) +
-			 TQString::tqfromLatin1("/tdevelop/profiles/FullIDE");*/
+			 TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/
 
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     if( args->isSet("profile") ){
@@ -147,7 +147,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis
     if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) )
       continue;
 
-    emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName()));
+    emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName()));
 
     KDevPlugin *plugin = loadPlugin( *it );
     if ( plugin )
@@ -218,7 +218,7 @@ KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service )
             0,
             i18n("<b>Could not load plugin</b><br>"
                  "Plugin %1 could not be loaded<br>"
-                 "Library loader error: %2").tqarg(service->name()).
+                 "Library loader error: %2").arg(service->name()).
             arg(KLibLoader::self()->lastErrorMessage()),
             i18n("Could not load plugin"));
     }
diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui
index 1f69a9ca..a773a155 100644
--- a/src/pluginselectdialogbase.ui
+++ b/src/pluginselectdialogbase.ui
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -81,7 +81,7 @@
                     <property name="name">
                         <cstring>plugin_description_label</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>40</height>
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -122,7 +122,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>191</width>
                             <height>21</height>
diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui
index a44765ab..78d20d17 100644
--- a/src/profileengine/editor/addprofilewidget.ui
+++ b/src/profileengine/editor/addprofilewidget.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -53,7 +53,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -85,7 +85,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index 99921768..93fe2850 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -18,10 +18,10 @@
  ***************************************************************************/
 #include "profileeditor.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klineedit.h>
-#include <tqtextedit.h>
-#include <tqpalette.h>
+#include <textedit.h>
+#include <palette.h>
 
 #include <kdebug.h>
 #include <kpushbutton.h>
@@ -69,12 +69,12 @@ public:
     
     bool isDerived() const { return m_derived; }
 
-    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
     {
         TQColorGroup cgNew = cg;
         if (m_derived)
             cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor());
-        KListViewItem::paintCell(p, cgNew, column, width, tqalignment);
+        KListViewItem::paintCell(p, cgNew, column, width, alignment);
     }
     
 private:
@@ -115,7 +115,7 @@ void ProfileEditor::refresh()
 
 void ProfileEditor::refreshPropertyCombo()
 {
-    KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"));
+    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"));
     TQStringList props;
     for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
     {
diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui
index d66c4e31..4c6af611 100644
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@@ -49,7 +49,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -73,7 +73,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>142</height>
@@ -192,7 +192,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout7</cstring>
+                                <cstring>layout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -221,7 +221,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -263,7 +263,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -303,7 +303,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -359,7 +359,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -376,7 +376,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -401,7 +401,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -410,7 +410,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -474,7 +474,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp
index ac30ff87..68666f3a 100644
--- a/src/profileengine/lib/profile.cpp
+++ b/src/profileengine/lib/profile.cpp
@@ -59,18 +59,18 @@ Profile::Profile(Profile *parent, const TQString &name, const TQString &genericN
 
 Profile::~Profile()
 {
-    for (TQValueList<Profile*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for (TQValueList<Profile*>::iterator it = m_children.begin(); it != m_children.end(); ++it)
         delete *it;
 }
 
 void Profile::addChildProfile(Profile *profile)
 {
-    m_tqchildren.append(profile);
+    m_children.append(profile);
 }
 
 void Profile::removeChildProfile(Profile *profile)
 {
-    m_tqchildren.remove(profile);
+    m_children.remove(profile);
 }
 
 TQString Profile::dirName() const
diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h
index 3cbfd6f5..857ddf39 100644
--- a/src/profileengine/lib/profile.h
+++ b/src/profileengine/lib/profile.h
@@ -49,7 +49,7 @@ public:
     Profile(Profile *parent, const TQString &name, const TQString &genericName, const TQString &description);
     ~Profile();
 
-    TQValueList<Profile*> tqchildren() const { return m_tqchildren; }
+    TQValueList<Profile*> children() const { return m_children; }
     Profile *parent() const { return m_parent; }
 
     void save();
@@ -81,7 +81,7 @@ protected:
 
 private:
     Profile *m_parent;
-    TQValueList<Profile*> m_tqchildren;
+    TQValueList<Profile*> m_children;
 
     TQString m_name;
 
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index d21a6b58..48a4e4e2 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -78,24 +78,24 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     if (!profile)
         return KTrader::OfferList();
 
-    TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
             break;
     }
     TQString constraint_add = "";
     Profile::EntryList properties = profile->list(Profile::Properties);
     int i = 0;
     for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it)
-        constraint_add += TQString::tqfromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
-            tqarg((i++)==0?"":"or").tqarg((*it).name);
+        constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
+            arg((i++)==0?"":"or").arg((*it).name);
     if (!constraint_add.isEmpty())
         constraint += " and ( " + constraint_add + " ) ";
 
@@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
         << "        " << constraint << endl << endl << endl;*/
 //END debug
 
-    KTrader::OfferList list = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
+    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
     TQStringList names;
 
 /* Wrong, this is not what we want to do.
@@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     {
         if (names.contains((*it).name))
             continue;
-        TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
-        constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name);
-        KTrader::OfferList enable = KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
+        TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+        constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name);
+        KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
         list += enable;
     }
 
@@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
 
 KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
 {
-    TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += TQString::tqfromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
             break;
     }
-    return KTrader::self()->query(TQString::tqfromLatin1("KDevelop/Plugin"), constraint);
+    return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
 }
 
 void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile,
diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h
index d34f9e02..6404e48f 100644
--- a/src/profileengine/lib/profileengine.h
+++ b/src/profileengine/lib/profileengine.h
@@ -177,8 +177,8 @@ public:
     template<class Operation>
     void walkProfiles(Operation &op, Profile *root)
     {
-        TQValueList<Profile*> tqchildren = root->tqchildren();
-        for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
+        TQValueList<Profile*> children = root->children();
+        for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it)
         {
             op(*it);
             walkProfiles<Operation>(op, *it);
@@ -244,8 +244,8 @@ public:
     template<class Operation, class Result>
     void walkProfiles(Operation &op, Result *result, Profile *root)
     {
-        TQValueList<Profile*> tqchildren = root->tqchildren();
-        for (TQValueList<Profile*>::iterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
+        TQValueList<Profile*> children = root->children();
+        for (TQValueList<Profile*>::iterator it = children.begin(); it != children.end(); ++it)
         {
             Result *newResult = op(result, *it);
             walkProfiles<Operation>(op, newResult, *it);
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index f7478e75..b0f44d90 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -355,7 +355,7 @@ bool ProjectManager::loadProjectFile()
   TQString path;
   if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
-        i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL()));
+        i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
     return false;
   }
 
@@ -363,7 +363,7 @@ bool ProjectManager::loadProjectFile()
   if (!fin.open(IO_ReadOnly))
   {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
-        i18n("Could not read project file: %1").tqarg(m_info->m_projectURL.prettyURL()));
+        i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
     return false;
   }
 
@@ -374,7 +374,7 @@ bool ProjectManager::loadProjectFile()
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("This is not a valid project file.\n"
              "XML error in line %1, column %2:\n%3")
-             .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
+             .arg(errorLine).arg(errorCol).arg(errorMsg));
     fin.close();
     KIO::NetAccess::removeTempFile(path);
     return false;
@@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile()
     API::getInstance()->projectDom()->save(stream, 2);
     fout.close();
   } else {
-    KTempFile fout(TQString::tqfromLatin1("tdevelop3"));
+    KTempFile fout(TQString::fromLatin1("tdevelop3"));
     fout.setAutoDelete(true);
     if (fout.status() != 0) {
       KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file."));
@@ -486,7 +486,7 @@ bool ProjectManager::loadProjectPart()
   if (!projectService) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("No project management plugin %1 found.")
-            .tqarg(m_info->m_projectPlugin));
+            .arg(m_info->m_projectPlugin));
     return false;
   }
 
@@ -496,7 +496,7 @@ bool ProjectManager::loadProjectPart()
   if ( !projectPart ) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("Could not create project management plugin %1.")
-            .tqarg(m_info->m_projectPlugin));
+            .arg(m_info->m_projectPlugin));
     return false;
   }
 
@@ -536,13 +536,13 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
   }
 
   KTrader::OfferList languageSupportOffers =
-    KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
-                           TQString::tqfromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").tqarg(lang).tqarg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+                           TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION));
 
   if (languageSupportOffers.isEmpty()) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("No language plugin for %1 found.")
-            .tqarg(lang));
+            .arg(lang));
     return false;
   }
 
@@ -556,7 +556,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
   if ( !langSupport ) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("Could not create language plugin for %1.")
-            .tqarg(lang));
+            .arg(lang));
     return false;
   }
 
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index f09967ef..ae7377e1 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -79,7 +79,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
     if (!ok) {
       KMessageBox::sorry(0L,
                          i18n("The file %1 does not contain valid XML.\n"
-                         "The loading of the session failed.").tqarg(sessionFileName));
+                         "The loading of the session failed.").arg(sessionFileName));
       initXMLTree(); // because it was now broken after failed setContent()
       return false;
     }
@@ -91,8 +91,8 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ
   // Check for proper document type.
   if (domdoc.doctype().name() != "KDevPrjSession") {
     KMessageBox::sorry(0L,
-    i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").tqarg(sessionFileName)
-    + i18n("The document type seems to be: '%1'.").tqarg(domdoc.doctype().name()));
+    i18n("The file %1 does not contain a valid KDevelop project session ('KDevPrjSession').\n").arg(sessionFileName)
+    + i18n("The document type seems to be: '%1'.").arg(domdoc.doctype().name()));
     return false;
   }
 
diff --git a/src/settingswidget.ui b/src/settingswidget.ui
index 92d4554e..e5d1ac1f 100644
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@@ -43,7 +43,7 @@
             <property name="text">
                 <string>&lt;qt&gt;&lt;h3&gt;Project Settings&lt;/h3&gt;&lt;/qt&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -63,7 +63,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -129,13 +129,13 @@
             <property name="textFormat">
                 <enum>AutoText</enum>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignBottom|AlignLeft</set>
             </property>
         </widget>
         <widget class="TQLayoutWidget" row="2" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -178,7 +178,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -187,7 +187,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -232,7 +232,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>60</height>
@@ -272,7 +272,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -319,7 +319,7 @@
             <property name="text">
                 <string>&lt;qt&gt;&lt;h3&gt;Terminal Emulation&lt;/h3&gt;&lt;/qt&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -333,7 +333,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -350,7 +350,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -364,7 +364,7 @@
             <property name="text">
                 <string>&lt;qt&gt;&lt;h3&gt;UI Designer Integration&lt;/h3&gt;This will only be used when no project is opened. For the project specific setting see Project Options/C++ Specific and open the Qt tab.&lt;/qt&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop</set>
             </property>
         </widget>
@@ -459,7 +459,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>150</height>
@@ -479,7 +479,7 @@
             <property name="title">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignAuto</set>
             </property>
             <vbox>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index e71e6b1d..5afa22df 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "simplemainwindow.h"
 
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <kaction.h>
 #include <kstdaction.h>
@@ -765,7 +765,7 @@ void SimpleMainWindow::fillWindowMenu()
 
     while (itt != list.end())
     {
-        temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").tqarg(i).tqarg((*itt).fileName()) : (*itt).fileName() );
+        temp = m_windowMenu->insertItem( i < 10 ? TQString("&%1 %2").arg(i).arg((*itt).fileName()) : (*itt).fileName() );
         m_windowList << tqMakePair(temp, *itt);
         ++i;
         ++itt;
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index ddfb8e62..22ffcf9d 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -29,7 +29,7 @@ KDevSplashScreen::~KDevSplashScreen()
 void KDevSplashScreen::animate()
 {
 	state = ((state + 1) % (2*progress_bar_size-1));
-	tqrepaint();
+	repaint();
 }
 
 
@@ -74,7 +74,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter)
 	// Draw version number
 	TQRect r = rect();
     r.setRect(r.x() + 5, r.y() + 5, r.width() - 10, r.height() - 10);
-    painter->drawText(r, TQt::AlignRight, i18n("Version %1").tqarg( VERSION ));
+    painter->drawText(r, TQt::AlignRight, i18n("Version %1").arg( VERSION ));
 
 	// Draw message at given position, limited to 43 chars
 	// If message is too long, string is truncated
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index b730d55a..be2f810d 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqtimer.h>
@@ -36,7 +36,7 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name)
 
 	_status = new TQLabel( this );
 	_status->setMinimumWidth(_status->fontMetrics().width("Line: XXXXX Col: XXX  OVR NORM * "));
-	_status->tqsetAlignment(TQWidget::AlignCenter);
+	_status->setAlignment(TQWidget::AlignCenter);
 	addWidget(_status, 0, true);
 
 	connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
@@ -61,7 +61,7 @@ void KDevStatusBar::activePartChanged(KParts::Part *part)
 		if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget())))
 		{
 			connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ),
-				this, TQT_SLOT( settqStatus( const TQString & ) ) );
+				this, TQT_SLOT( setStatus( const TQString & ) ) );
 	
 			_status->show();
 		}
@@ -90,7 +90,7 @@ void KDevStatusBar::cursorPositionChanged()
   }
 }
 
-void KDevStatusBar::settqStatus(const TQString &str)
+void KDevStatusBar::setStatus(const TQString &str)
 {
 	_status->setText(str);
 }
@@ -98,15 +98,15 @@ void KDevStatusBar::settqStatus(const TQString &str)
 
 void KDevStatusBar::setCursorPosition(int line, int col)
 {
-	_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col));
+	_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col));
 }
 
 void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent)
 {
 	KStatusBar::addWidget(widget,stretch,permanent);
 
-	if(widget->tqsizeHint().height() + 4 > height())
-		setFixedHeight(widget->tqsizeHint().height() + 4);
+	if(widget->sizeHint().height() + 4 > height())
+		setFixedHeight(widget->sizeHint().height() + 4);
 }
 
 #include "statusbar.moc"
diff --git a/src/statusbar.h b/src/statusbar.h
index c17392e8..a17ef3a9 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -22,7 +22,7 @@ namespace KTextEditor { class ViewCursorInterface; }
 namespace KParts { class Part; }
 
 /**
-tqStatus bar.
+Status bar.
 */
 class KDevStatusBar : public KStatusBar
 {
@@ -37,7 +37,7 @@ public:
 private slots:
     void cursorPositionChanged();
     void activePartChanged(KParts::Part *part);
-    void settqStatus(const TQString &str);
+    void setStatus(const TQString &str);
     void setCursorPosition(int line, int col);
 
 private: