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

28 files changed, 101 insertions, 101 deletions

diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp
index 501fa98..901aecb 100644
--- a/src/libgui/breakpoint_view.cpp
+++ b/src/libgui/breakpoint_view.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "breakpoint_view.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqpopupmenu.h>
 
diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp
index e91a956..f20959b 100644
--- a/src/libgui/config_center.cpp
+++ b/src/libgui/config_center.cpp
@@ -10,7 +10,7 @@
 #include "config_center.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqgroupbox.h>
 #include <tqtabwidget.h>
diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp
index 01dc06b..68bd865 100644
--- a/src/libgui/config_gen.cpp
+++ b/src/libgui/config_gen.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "config_gen.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp
index b2e30d7..741fd3a 100644
--- a/src/libgui/console.cpp
+++ b/src/libgui/console.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "console.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqdir.h>
 #include <klibloader.h>
diff --git a/src/libgui/device_editor.cpp b/src/libgui/device_editor.cpp
index 9b3b852..c48ffb2 100644
--- a/src/libgui/device_editor.cpp
+++ b/src/libgui/device_editor.cpp
@@ -63,7 +63,7 @@ void DeviceEditor::setDevice(bool force)
     if ( name==Device::AUTO_DATA.name )
       _labelDevice->setText(i18n("The target device is not configured and cannot be guessed from source file. "
                                  "The source file either cannot be found or does not contain any processor directive."));
-    else _labelDevice->setText(i18n("Device guessed from file: %1").tqarg(name));
+    else _labelDevice->setText(i18n("Device guessed from file: %1").arg(name));
     _labelDevice->show();
   } else {
     if ( !force && Main::device()==_device ) return;
@@ -71,7 +71,7 @@ void DeviceEditor::setDevice(bool force)
     _labelDevice->hide();
   }
   if ( _view && isModified() ) {
-    if ( MessageBox::questionYesNo(i18n("File %1 not saved.").tqarg(filename()), KStdGuiItem::save(), KStdGuiItem::discard()) )
+    if ( MessageBox::questionYesNo(i18n("File %1 not saved.").arg(filename()), KStdGuiItem::save(), KStdGuiItem::discard()) )
       Editor::save();
   }
   _labelWarning->hide();
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index bb91cea..a064752 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "device_gui.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
@@ -147,7 +147,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
   shbox = new TQHBoxLayout(vbox);
 
   // status filter
-  _statusCombo = new EnumComboBox<Device::tqStatus>(i18n("<Status>"), "status", frame);
+  _statusCombo = new EnumComboBox<Device::Status>(i18n("<Status>"), "status", frame);
   connect(_statusCombo->combo(), TQT_SIGNAL(activated(int)), TQT_SLOT(updateList()));
   shbox->addWidget(_statusCombo->combo());
 
@@ -260,12 +260,12 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
   TQListViewItem *selected = 0;
   const Programmer::Group *pgroup = programmerGroup();
   if ( pgroup && pgroup->supportedDevices().isEmpty() && pgroup->isSoftware() ) {
-    _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").tqarg(pgroup->label()));
+    _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").arg(pgroup->label()));
     return;
   }
   const Tool::Group *tgroup = toolGroup();
   if ( tgroup && tgroup->supportedDevices().isEmpty() ) {
-    _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").tqarg(tgroup->label()));
+    _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").arg(tgroup->label()));
     return;
   }
   for (int i=list.count()-1; i>=0; i--) {
@@ -274,7 +274,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
     const Device::Data *data = Device::lister().data(list[i]);
     Q_ASSERT(data);
     if ( _memoryCombo->value()!=Device::MemoryTechnology::Nb_Types && data->memoryTechnology()!=_memoryCombo->value() ) continue;
-    if ( _statusCombo->value()!=Device::tqStatus::Nb_Types && data->status()!=_statusCombo->value() ) continue;
+    if ( _statusCombo->value()!=Device::Status::Nb_Types && data->status()!=_statusCombo->value() ) continue;
     if ( _featureCombo->value()!=Pic::Feature::Nb_Types ) {
       if ( data->group().name()!="pic" ) continue;
       if ( !static_cast<const Pic::Data *>(data)->hasFeature(_featureCombo->value()) ) continue;
diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h
index de28bbf..ae63dfa 100644
--- a/src/libgui/device_gui.h
+++ b/src/libgui/device_gui.h
@@ -10,7 +10,7 @@
 #define DEVICE_GUI_H
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 class TQListViewItem;
 class TQCheckBox;
@@ -105,7 +105,7 @@ private:
   KeyComboBox<TQString> *_programmerCombo, *_toolCombo;
   EnumComboBox<ListType>                 *_listTypeCombo;
   EnumComboBox<Device::MemoryTechnology> *_memoryCombo;
-  EnumComboBox<Device::tqStatus>           *_statusCombo;
+  EnumComboBox<Device::Status>           *_statusCombo;
   EnumComboBox<Pic::Feature>             *_featureCombo;
   KListView   *_listView;
   View        *_deviceView;
diff --git a/src/libgui/editor.cpp b/src/libgui/editor.cpp
index 2999b1e..e5cea2e 100644
--- a/src/libgui/editor.cpp
+++ b/src/libgui/editor.cpp
@@ -77,7 +77,7 @@ TQString Editor::filename() const
 bool Editor::checkSaved()
 {
   if ( !isModified() ) return true;
-  MessageBox::Result res = MessageBox::questionYesNoCancel(i18n("File %1 not saved.").tqarg(filename()),
+  MessageBox::Result res = MessageBox::questionYesNoCancel(i18n("File %1 not saved.").arg(filename()),
                                                            KStdGuiItem::save(), KStdGuiItem::discard());
   if ( res==MessageBox::Cancel ) return false;
   if ( res==MessageBox::Yes ) save();
diff --git a/src/libgui/editor.h b/src/libgui/editor.h
index 0c80b07..a08d7a4 100644
--- a/src/libgui/editor.h
+++ b/src/libgui/editor.h
@@ -10,7 +10,7 @@
 #define EDITOR_H
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvaluevector.h>
 #include "common/common/qflags.h"
 #include <kstdaction.h>
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index 5c9c193..8713c9e 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -106,7 +106,7 @@ bool EditorManager::openFile(const PURL::Url &url)
   if ( url.isEmpty() ) return false;
   Editor *e = findEditor(url);
   if (e) { // document already loaded
-    if ( !MessageBox::askContinue(i18n("File \"%1\" already loaded. Reload?").tqarg(url.kurl().prettyURL()),
+    if ( !MessageBox::askContinue(i18n("File \"%1\" already loaded. Reload?").arg(url.kurl().prettyURL()),
                                  i18n("Warning"), i18n("Reload")) ) return true;
     if ( !e->slotLoad() ) {
       closeEditor(e, false);
@@ -439,7 +439,7 @@ void EditorManager::switchToEditor()
   SwitchToDialog dialog(names, this);
   if ( dialog.exec()!=TQDialog::Accepted ) return;
   for (uint i=0; i<names.count(); i++) {
-    if ( dialog.name()!=names[i] && dialog.name()!=TQString("%1").tqarg(i+1) ) continue;
+    if ( dialog.name()!=names[i] && dialog.name()!=TQString("%1").arg(i+1) ) continue;
     showEditor(_editors[i]);
     return;
   }
diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp
index 8d246fc..e8fa5ca 100644
--- a/src/libgui/global_config.cpp
+++ b/src/libgui/global_config.cpp
@@ -40,7 +40,7 @@ PURL::UrlList GlobalConfig::openedFiles()
   PURL::UrlList files;
   uint i = 0;
   for (;;) {
-    TQString file = config.readEntry(TQString("file%1").tqarg(i), TQString::null);
+    TQString file = config.readEntry(TQString("file%1").arg(i), TQString::null);
     if ( file.isEmpty() ) break;
     files += PURL::Url::fromPathOrUrl(file);
     i++;
@@ -52,7 +52,7 @@ void GlobalConfig::writeOpenedFiles(const PURL::UrlList &files)
   GenericConfig config(TQString::null);
   for (uint i=0; i<=files.count(); i++) {
     TQString s = (i==files.count() ? TQString::null : files[i].filepath());
-    config.writeEntry(TQString("file%1").tqarg(i), s);
+    config.writeEntry(TQString("file%1").arg(i), s);
   }
 }
 
diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp
index c8b2727..8275169 100644
--- a/src/libgui/hex_editor.cpp
+++ b/src/libgui/hex_editor.cpp
@@ -12,7 +12,7 @@
 #include <tqgroupbox.h>
 #include <tqhgroupbox.h>
 #include <tqregexp.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollview.h>
 #include <tqstringlist.h>
 #include <tqlabel.h>
@@ -99,7 +99,7 @@ bool HexEditor::simpleLoad()
     TQStringList warnings;
     if ( _memory->fromHexBuffer(_hexBuffer, warnings)!=Device::Memory::NoWarning ) {
       _labelWarning->setText(i18n("<b>Warning:</b> hex file seems to be incompatible with the selected device %1:<br>%2")
-                             .tqarg(_memory->device().name()).tqarg(warnings.join("<br>")));
+                             .arg(_memory->device().name()).arg(warnings.join("<br>")));
       _labelWarning->show();
     } else _labelWarning->hide();
     display();
@@ -139,7 +139,7 @@ bool HexEditor::open(const PURL::Url &url)
 
 bool HexEditor::save(const PURL::Url &url)
 {
-  return save(url, i18n("File URL: \"%1\".").tqarg(url.pretty()));
+  return save(url, i18n("File URL: \"%1\".").arg(url.pretty()));
 }
 
 bool HexEditor::save(const PURL::Url &url, const TQString &fileErrorString)
@@ -147,7 +147,7 @@ bool HexEditor::save(const PURL::Url &url, const TQString &fileErrorString)
   PURL::File file(url, Main::compileLog());
   if ( !file.openForWrite() ) return false;
   if ( !_memory->save(file.stream(), HexBuffer::IHX32) ) {
-    MessageBox::detailedSorry(i18n("Error while writing file \"%1\".").tqarg(url.pretty()), fileErrorString, Log::Show);
+    MessageBox::detailedSorry(i18n("Error while writing file \"%1\".").arg(url.pretty()), fileErrorString, Log::Show);
     return false;
   }
   _originalMemory->copyFrom(*_memory);
@@ -186,7 +186,7 @@ void HexEditor::statusChanged()
   TQString s;
   if (_memory) {
     BitValue cs = static_cast<Device::HexView *>(_view)->checksum();
-    s = i18n("Checksum: %1").tqarg(toHexLabel(cs, 4));
+    s = i18n("Checksum: %1").arg(toHexLabel(cs, 4));
   }
   emit statusTextChanged(s);
 }
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index 21ee759..b376c8e 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -26,12 +26,12 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
 #include <tqpopupmenu.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
 #include <tqhttp.h>
@@ -55,7 +55,7 @@ LikeBack::LikeBack(Button buttons)
  : TQWidget( 0, "LikeBack", TQt::WX11BypassWM | TQt::WStyle_NoBorder | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop | TQt::WStyle_NoBorder | TQt::TQt::WGroupLeader)
  , m_buttons(buttons)
 {
-        TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+        TQHBoxLayout *layout = new TQHBoxLayout(this);
 
         TQIconSet likeIconSet      = kapp->iconLoader()->loadIconSet("likeback_like",      KIcon::Small);
         TQIconSet dislikeIconSet   = kapp->iconLoader()->loadIconSet("likeback_dislike",   KIcon::Small);
@@ -67,21 +67,21 @@ LikeBack::LikeBack(Button buttons)
         m_likeButton->setTextLabel(i18n("I Like..."));
         m_likeButton->setAutoRaise(true);
         connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iLike()) );
-        tqlayout->add(m_likeButton);
+        layout->add(m_likeButton);
 
         TQToolButton *m_dislikeButton = new TQToolButton(this, "idonotlike");
         m_dislikeButton->setIconSet(dislikeIconSet);
         m_dislikeButton->setTextLabel(i18n("I Do not Like..."));
         m_dislikeButton->setAutoRaise(true);
         connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iDoNotLike()) );
-        tqlayout->add(m_dislikeButton);
+        layout->add(m_dislikeButton);
 
         TQToolButton *m_bugButton = new TQToolButton(this, "ifoundabug");
         m_bugButton->setIconSet(bugIconSet);
         m_bugButton->setTextLabel(i18n("I Found a Bug..."));
         m_bugButton->setAutoRaise(true);
         connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iFoundABug()) );
-        tqlayout->add(m_bugButton);
+        layout->add(m_bugButton);
 
         m_configureButton = new TQToolButton(this, "configure");
         TQIconSet helpIconSet = kapp->iconLoader()->loadIconSet("help", KIcon::Small);
@@ -89,7 +89,7 @@ LikeBack::LikeBack(Button buttons)
         m_configureButton->setTextLabel(i18n("Configure..."));
         m_configureButton->setAutoRaise(true);
         connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()) );
-        tqlayout->add(m_configureButton);
+        layout->add(m_configureButton);
 
         TQPopupMenu *configureMenu = new TQPopupMenu(this);
         configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) );
@@ -110,7 +110,7 @@ LikeBack::LikeBack(Button buttons)
 //                KMessageBox::saveDontShowAgainContinue(messageShown);
 //        }
 
-        resize(tqsizeHint());
+        resize(sizeHint());
 
         connect( &m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoMove()) );
         m_timer.start(10);
@@ -171,7 +171,7 @@ void LikeBack::showInformationMessage()
         TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
         TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug",     bugIcon);
         KMessageBox::information(0,
-                "<p><b>" + i18n("This is a quick feedback system for %1.").tqarg(s_about->programName()) + "</b></p>"
+                "<p><b>" + i18n("This is a quick feedback system for %1.").arg(s_about->programName()) + "</b></p>"
                 "<p>" + i18n("To help us improve it, your comments are important.") + "</p>"
                 "<p>" + i18n("Each time you have a great or frustrating experience, "
                              "please click the appropriate hand below the window title-bar, "
@@ -452,7 +452,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons)
         if (m_process)
                 return;
         m_process = new KProcess();
-        *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
+        *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
         connect( m_process, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(endFetchingEmailFrom()) );
         if (!m_process->start()) {
                 kdDebug() << "Couldn't start kcmshell.." << endl;
@@ -473,23 +473,23 @@ void LikeBack::endFetchingEmailFrom()
 //      m_configureEmail->setEnabled(true);
 
         // ### KDE4: why oh why is KEmailSettings in kio?
-        KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
+        KConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
         // find out the default profile
-        emailConf.setGroup(TQString::tqfromLatin1("Defaults"));
-        TQString profile = TQString::tqfromLatin1("PROFILE_");
-        profile += emailConf.readEntry(TQString::tqfromLatin1("Profile"), TQString::tqfromLatin1("Default"));
+        emailConf.setGroup(TQString::fromLatin1("Defaults"));
+        TQString profile = TQString::fromLatin1("PROFILE_");
+        profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
 
         emailConf.setGroup(profile);
-        TQString fromaddr = emailConf.readEntry(TQString::tqfromLatin1("EmailAddress"));
+        TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress"));
         if (fromaddr.isEmpty()) {
                 struct passwd *p;
                 p = getpwuid(getuid());
-                m_fetchedEmail = TQString::tqfromLatin1(p->pw_name);
+                m_fetchedEmail = TQString::fromLatin1(p->pw_name);
         } else {
-                TQString name = emailConf.readEntry(TQString::tqfromLatin1("FullName"));
+                TQString name = emailConf.readEntry(TQString::fromLatin1("FullName"));
                 if (!name.isEmpty())
-                        m_fetchedEmail = /*name + TQString::tqfromLatin1(" <") +*/ fromaddr /*+ TQString::tqfromLatin1(">")*/;
+                        m_fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/;
         }
 //      m_from->setText( fromaddr );
 }
@@ -580,7 +580,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         m_comment = new TQTextEdit(coloredWidget);
         TQIconSet sendIconSet = kapp->iconLoader()->loadIconSet("mail_send", KIcon::Toolbar);
         m_sendButton = new TQPushButton(sendIconSet, i18n("Send"), coloredWidget);
-        m_sendButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
+        m_sendButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
         m_sendButton->setEnabled(false);
         connect( m_sendButton, TQT_SIGNAL(clicked()),     this, TQT_SLOT(send())           );
         connect( m_comment,    TQT_SIGNAL(textChanged()), this, TQT_SLOT(commentChanged()) );
@@ -607,7 +607,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, TQString windowName, TQS
         resize(kapp->desktop()->width() / 2, kapp->desktop()->height() / 3);
 
         setCaption(kapp->makeStdCaption(i18n("Send a Comment")));
-        //      setMinimumSize(mainLayout->tqsizeHint()); // FIXME: Doesn't work!
+        //      setMinimumSize(mainLayout->sizeHint()); // FIXME: Doesn't work!
 }
 
 LikeBackDialog::~LikeBackDialog()
diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp
index 2442bc3..cdb92f2 100644
--- a/src/libgui/log_view.cpp
+++ b/src/libgui/log_view.cpp
@@ -48,7 +48,7 @@ void Log::Widget::doLog(DebugLevel level, const TQString &text, Action action)
 void Log::Widget::doLog(const TQString &text, const TQString &color, bool bold, Action action)
 {
   logExtra(text + "\n");
-  TQString s = TQString("<font color=%1>").tqarg(color);
+  TQString s = TQString("<font color=%1>").arg(color);
   if (bold) s += "<b>";
   s += escapeXml(text);
   if (bold) s += "</b>";
diff --git a/src/libgui/log_view.h b/src/libgui/log_view.h
index 5f0fa44..963649b 100644
--- a/src/libgui/log_view.h
+++ b/src/libgui/log_view.h
@@ -9,7 +9,7 @@
 #ifndef LOG_VIEW_H
 #define LOG_VIEW_H
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include "common/global/log.h"
 
 namespace Log
diff --git a/src/libgui/new_dialogs.h b/src/libgui/new_dialogs.h
index dd71f67..494f915 100644
--- a/src/libgui/new_dialogs.h
+++ b/src/libgui/new_dialogs.h
@@ -14,7 +14,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kcombobox.h>
 
 #include "common/global/purl.h"
diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp
index fa5239d..1854b8a 100644
--- a/src/libgui/object_view.cpp
+++ b/src/libgui/object_view.cpp
@@ -123,7 +123,7 @@ bool DisassemblyEditor::open(const PURL::Url &url)
 
   Device::Memory *memory = 0;
   if ( _editor==0 ) {
-    log(Log::LineType::Information, i18n("Disassembling hex file: %1").tqarg(_source.pretty()));
+    log(Log::LineType::Information, i18n("Disassembling hex file: %1").arg(_source.pretty()));
     PURL::File file(_source, Main::compileLog());
     if ( !file.openForRead() ) return false;
     memory = _device.group().createMemory(_device);
diff --git a/src/libgui/project.cpp b/src/libgui/project.cpp
index 8ece518..c7a043f 100644
--- a/src/libgui/project.cpp
+++ b/src/libgui/project.cpp
@@ -21,7 +21,7 @@ bool Project::load(TQString &error)
   if ( _url.fileType()==PURL::Project ) return XmlDataFile::load(error);
 
   if ( !_url.exists() ) {
-    error = i18n("Project file %1 does not exist.").tqarg(_url.pretty());
+    error = i18n("Project file %1 does not exist.").arg(_url.pretty());
     return false;
   }
   PURL::Url tmp = _url;
diff --git a/src/libgui/project_editor.cpp b/src/libgui/project_editor.cpp
index 331bb55..a4d5649 100644
--- a/src/libgui/project_editor.cpp
+++ b/src/libgui/project_editor.cpp
@@ -10,7 +10,7 @@
 #include "project_editor.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 
 #include "project.h"
diff --git a/src/libgui/project_editor.h b/src/libgui/project_editor.h
index ce08aca..9526b5d 100644
--- a/src/libgui/project_editor.h
+++ b/src/libgui/project_editor.h
@@ -17,7 +17,7 @@
 #ifndef PROJECT_EDITOR_H
 #define PROJECT_EDITOR_H
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqwidgetstack.h>
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index ce58146..c9eabc1 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -242,7 +242,7 @@ void ProjectManager::View::closeProject()
     _project->setWatchedRegisters(Register::list().watched());
     TQString error;
     if ( !_project->save(error) )
-      MessageBox::detailedSorry(i18n("Could not save project file \"%1\".").tqarg(_project->url().pretty()), error, Log::Show);
+      MessageBox::detailedSorry(i18n("Could not save project file \"%1\".").arg(_project->url().pretty()), error, Log::Show);
     delete _project;
     _project = 0;
   }
@@ -304,25 +304,25 @@ void ProjectManager::View::insertObjectFiles()
 void ProjectManager::View::insertFile(const PURL::Url &url)
 {
   if ( !url.exists() ) {
-    MessageBox::detailedSorry(i18n("Could not find file."), i18n("File: %1").tqarg(url.pretty()), Log::Show);
+    MessageBox::detailedSorry(i18n("Could not find file."), i18n("File: %1").arg(url.pretty()), Log::Show);
     return;
   }
   PURL::Url purl = url;
   MessageBox::Result copy = MessageBox::No;
   if ( !url.isInto(_project->directory()) ) {
-    copy = MessageBox::questionYesNoCancel(i18n("File \"%1\" is not inside the project directory. Do you want to copy the file to your project directory?").tqarg(url.pretty()),
+    copy = MessageBox::questionYesNoCancel(i18n("File \"%1\" is not inside the project directory. Do you want to copy the file to your project directory?").arg(url.pretty()),
                                           i18n("Copy and Add"), i18n("Add only"));
     if ( copy==MessageBox::Cancel ) return;
     if ( copy==MessageBox::Yes ) purl = PURL::Url(_project->directory(), url.filename());
   }
   if ( _project->absoluteFiles().contains(purl) ) {
-    MessageBox::detailedSorry(i18n("File is already in the project."), i18n("File: %1").tqarg(purl.pretty()), Log::Show);
+    MessageBox::detailedSorry(i18n("File is already in the project."), i18n("File: %1").arg(purl.pretty()), Log::Show);
     return;
   }
   if ( copy==MessageBox::Yes ) {
     Log::StringView sview;
     if ( !url.copyTo(purl, sview) ) {
-      MessageBox::detailedSorry(i18n("Copying file to project directory failed."), i18n("File: %1\n").tqarg(url.pretty()) + sview.string(), Log::Show);
+      MessageBox::detailedSorry(i18n("Copying file to project directory failed."), i18n("File: %1\n").arg(url.pretty()) + sview.string(), Log::Show);
       return;
     }
   }
diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp
index 78fcd49..15fe174 100644
--- a/src/libgui/project_wizard.cpp
+++ b/src/libgui/project_wizard.cpp
@@ -36,7 +36,7 @@ FileListItem::FileListItem(KListView *view)
 void FileListItem::toggle()
 {
   _copy = !_copy;
-  tqrepaint();
+  repaint();
 }
 
 PURL::FileGroup FileListItem::fileGroup() const
@@ -76,7 +76,7 @@ FileListBox::FileListBox(TQWidget *parent)
   _listView->header()->setResizeEnabled(false);
   _listView->header()->setMovingEnabled(false);
   _listView->setColumnText(0, i18n("Copy"));
-  int spacing = tqstyle().tqpixelMetric(TQStyle::PM_HeaderMargin);
+  int spacing = tqstyle().pixelMetric(TQStyle::PM_HeaderMargin);
   TQFontMetrics fm(font());
   _listView->header()->resizeSection(0, fm.width(i18n("Copy")) + 2*spacing); // hack
   _listView->setColumnText(1, i18n("Filename"));
@@ -184,7 +184,7 @@ void ProjectWizard::next()
         return;
       }
     } else if ( url().exists() ) {
-      if ( !MessageBox::askContinue(i18n("Project \"%1\"already exists. Overwrite it?").tqarg(url().filename())) ) return;
+      if ( !MessageBox::askContinue(i18n("Project \"%1\"already exists. Overwrite it?").arg(url().filename())) ) return;
     }
     if ( !toolchain().check(device(), &Main::compileLog()) ) return;
     _files->setDirectory(_directory->directory());
@@ -203,7 +203,7 @@ void ProjectWizard::next()
     for (uint i=0; i<_files->count(); i++)
       if ( static_cast<const FileListItem *>(_files->item(i))->fileGroup()==PURL::Source ) nb++;
     if ( toolchain().compileType()==Tool::SingleFile && nb>1 ) {
-      if ( !MessageBox::askContinue(i18n("The selected toolchain can only compile a single source file and you have selected %1 source files. Continue anyway? ").tqarg(nb)) ) return;
+      if ( !MessageBox::askContinue(i18n("The selected toolchain can only compile a single source file and you have selected %1 source files. Continue anyway? ").arg(nb)) ) return;
     }
   }
   KWizard::next();
@@ -243,7 +243,7 @@ void ProjectWizard::done(int r)
       }
       Log::StringView sview;
       if ( turl.write(text, sview) ) files += turl;
-      else MessageBox::detailedSorry(i18n("Error creating template file."), i18n("File: %1\n").tqarg(turl.pretty()) + sview.string(), Log::Show);
+      else MessageBox::detailedSorry(i18n("Error creating template file."), i18n("File: %1\n").arg(turl.pretty()) + sview.string(), Log::Show);
       _project->setOpenedFiles(files);
     } else {
       Log::StringView sview;
diff --git a/src/libgui/register_view.cpp b/src/libgui/register_view.cpp
index 4f2aaff..4c96b0b 100644
--- a/src/libgui/register_view.cpp
+++ b/src/libgui/register_view.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "register_view.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index e7f0382..bd2c026 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -10,8 +10,8 @@
 #include "text_editor.h"
 
 #include <tqfile.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 
 #include <klibloader.h>
 #include <kpopupmenu.h>
@@ -96,7 +96,7 @@ void TextEditor::addView()
     connect(v, TQT_SIGNAL(gotFocus(Kate::View *)), TQT_SLOT(gotFocus(Kate::View *)));
     connect(v, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(statusChanged()));
     connect(v, TQT_SIGNAL(dropEventPass(TQDropEvent *)), TQT_SIGNAL(dropEventPass(TQDropEvent *)));
-    connect(v, TQT_SIGNAL(newtqStatus()), TQT_SLOT(statusChanged()));
+    connect(v, TQT_SIGNAL(newStatus()), TQT_SLOT(statusChanged()));
     v->show();
     v->setFocus();
     v->child(0, "KateViewInternal")->installEventFilter(this);
@@ -167,7 +167,7 @@ void TextEditor::statusChanged()
 {
   uint line, col;
   _view->cursorPosition(&line, &col) ;
-  TQString text = i18n("Line: %1  Col: %2").tqarg(line+1).tqarg(col+1);
+  TQString text = i18n("Line: %1  Col: %2").arg(line+1).arg(col+1);
   if( isReadOnly() ) text += "  " + i18n("R/O");
   emit statusTextChanged(" " + text + " ");
   if ( isReadOnly()!=_oldReadOnly || isModified()!=_oldModified ) emit guiChanged();
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index f087a4a..7a8522b 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -11,7 +11,7 @@
 
 #include <tqpixmap.h>
 #include <tqiconset.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplitter.h>
 #include <tqstringlist.h>
 #include <tqtimer.h>
@@ -91,23 +91,23 @@ MainWindow::MainWindow()
   Main::_toplevel = this;
 
 // status bar
-    _actiontqStatus = new TQLabel(statusBar());
-    statusBar()->addWidget(_actiontqStatus);
+    _actionStatus = new TQLabel(statusBar());
+    statusBar()->addWidget(_actionStatus);
     _actionProgress = new TQProgressBar(statusBar());
     statusBar()->addWidget(_actionProgress);
-    _debugtqStatus = new TQLabel(statusBar());
-    statusBar()->addWidget(_debugtqStatus, 0, true);
-    _editortqStatus = new TQLabel(statusBar());
-    statusBar()->addWidget(_editortqStatus, 0, true);
-    _programmertqStatus = new ProgrammerStatusWidget(statusBar());
-    connect(_programmertqStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer()));
-    connect(_programmertqStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &)));
-    statusBar()->addWidget(_programmertqStatus->widget(), 0, true);
-    _tooltqStatus = new ToolStatusWidget(statusBar());
-    connect(_tooltqStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains()));
-    connect(_tooltqStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject()));
-    connect(_tooltqStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &)));
-    statusBar()->addWidget(_tooltqStatus->widget(), 0, true);
+    _debugStatus = new TQLabel(statusBar());
+    statusBar()->addWidget(_debugStatus, 0, true);
+    _editorStatus = new TQLabel(statusBar());
+    statusBar()->addWidget(_editorStatus, 0, true);
+    _programmerStatus = new ProgrammerStatusWidget(statusBar());
+    connect(_programmerStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProgrammer()));
+    connect(_programmerStatus, TQT_SIGNAL(selected(const Programmer::Group &)), TQT_SLOT(selectProgrammer(const Programmer::Group &)));
+    statusBar()->addWidget(_programmerStatus->widget(), 0, true);
+    _toolStatus = new ToolStatusWidget(statusBar());
+    connect(_toolStatus, TQT_SIGNAL(configureToolchain()), TQT_SLOT(configureToolchains()));
+    connect(_toolStatus, TQT_SIGNAL(configure()), TQT_SLOT(configureProject()));
+    connect(_toolStatus, TQT_SIGNAL(selected(const Tool::Group &)), TQT_SLOT(selectTool(const Tool::Group &)));
+    statusBar()->addWidget(_toolStatus->widget(), 0, true);
 
 // interface
     _mainDock = createDockWidget("main_dock_widget", TQPixmap());
@@ -132,7 +132,7 @@ MainWindow::MainWindow()
     _mainDock->setWidget(Main::_editorManager);
     connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(guiChanged()), TQT_SLOT(updateGUI()));
     connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(modified(const PURL::Url &)), TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(modified(const PURL::Url &)));
-    connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editortqStatus, TQT_SLOT(setText(const TQString &)));
+    connect(TQT_TQOBJECT(Main::_editorManager), TQT_SIGNAL(statusChanged(const TQString &)), _editorStatus, TQT_SLOT(setText(const TQString &)));
 
     dock = createDock("compile_log_dock_widget", loader.loadIcon("piklab_compile", KIcon::Small),
                       i18n("Compile Log"), DockPosition(KDockWidget::DockBottom, 80));
@@ -160,15 +160,15 @@ MainWindow::MainWindow()
 // managers
     Programmer::manager = new Programmer::GuiManager(TQT_TQOBJECT(this));
     Programmer::manager->setView(_programLog);
-    connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actiontqStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Programmer::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &)));
     connect(Programmer::manager, TQT_SIGNAL(showProgress(bool)), TQT_SLOT(showProgress(bool)));
     connect(Programmer::manager, TQT_SIGNAL(setTotalProgress(uint)), TQT_SLOT(setTotalProgress(uint)));
     connect(Programmer::manager, TQT_SIGNAL(setProgress(uint)), TQT_SLOT(setProgress(uint)));
 
     Debugger::manager = new Debugger::GuiManager;
     connect(Debugger::manager, TQT_SIGNAL(targetStateChanged()), TQT_SLOT(updateGUI()));
-    connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugtqStatus, TQT_SLOT(setText(const TQString &)));
-    connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actiontqStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Debugger::manager, TQT_SIGNAL(statusChanged(const TQString &)), _debugStatus, TQT_SLOT(setText(const TQString &)));
+    connect(Debugger::manager, TQT_SIGNAL(actionMessage(const TQString &)), _actionStatus, TQT_SLOT(setText(const TQString &)));
 
     Main::_compileManager = new Compile::Manager(TQT_TQOBJECT(this));
     Main::_compileManager->setView(Main::_compileLog);
@@ -570,7 +570,7 @@ void MainWindow::updateGUI()
     showProgress(false);
     break;
   case Main::Compiling:
-    _actiontqStatus->setText(Main::_compileManager->label());
+    _actionStatus->setText(Main::_compileManager->label());
     showProgress(true);
     makeWidgetDockVisible(Main::_compileLog);
     break;
@@ -618,7 +618,7 @@ void MainWindow::updateGUI()
   Main::action("project_add_current_file")->setEnabled(Main::project() && !inProject && idle && isSource);
 
   // update build actions
-  static_cast<PopupButton *>(_tooltqStatus->widget())->setText(" " + Main::toolGroup().label() + " ");
+  static_cast<PopupButton *>(_toolStatus->widget())->setText(" " + Main::toolGroup().label() + " ");
   bool hexProject = ( Main::_projectManager->projectUrl().fileType()==PURL::Hex );
   bool customTool = Main::toolGroup().isCustom();
   Main::action("build_build_project")->setEnabled((Main::project() || (inProject && !hexProject) ) && idle);
@@ -630,11 +630,11 @@ void MainWindow::updateGUI()
 
   // update programmer status
   PortType ptype = Programmer::GroupConfig::portType(Main::programmerGroup());
-  static_cast<PopupButton *>(_programmertqStatus->widget())->setText(" " + Main::programmerGroup().statusLabel(ptype) + " ");
+  static_cast<PopupButton *>(_programmerStatus->widget())->setText(" " + Main::programmerGroup().statusLabel(ptype) + " ");
   TQFont f = font();
   bool supported = (Main::deviceData() ? Main::programmerGroup().isSupported(Main::deviceData()->name()) : false);
   f.setItalic(!supported);
-  _programmertqStatus->widget()->setFont(f);
+  _programmerStatus->widget()->setFont(f);
   bool isProgrammer = ( Main::programmerGroup().properties() & ::Programmer::Programmer );
   PURL::Url purl = Main::_projectManager->projectUrl();
   bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->contains(purl.toFileType(PURL::Hex)) );
@@ -728,7 +728,7 @@ void MainWindow::runPikloops()
   _pikloopsProcess->setup("pikloops", TQStringList(), false);
   connect(_pikloopsProcess, TQT_SIGNAL(done(int)), TQT_SLOT(pikloopsDone()));
   if ( !_pikloopsProcess->start(0) )
-    MessageBox::detailedSorry(i18n("Could not run \"pikloops\""), i18n("The Pikloops utility (%1) is not installed in your system.").tqarg("http://pikloops.sourceforge.net"), Log::Show);
+    MessageBox::detailedSorry(i18n("Could not run \"pikloops\""), i18n("The Pikloops utility (%1) is not installed in your system.").arg("http://pikloops.sourceforge.net"), Log::Show);
 }
 
 void MainWindow::pikloopsDone()
@@ -965,11 +965,11 @@ void MainWindow::showProgress(bool show)
 {
   if (show) {
     PBusyCursor::start();
-    _actiontqStatus->show();
+    _actionStatus->show();
     _actionProgress->show();
   } else {
     PBusyCursor::stop();
-    _actiontqStatus->hide();
+    _actionStatus->hide();
     _actionProgress->hide();
   }
 }
diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h
index f7ef383..a3c6306 100644
--- a/src/libgui/toplevel.h
+++ b/src/libgui/toplevel.h
@@ -93,9 +93,9 @@ signals:
 
 private:
   Log::Widget            *_programLog;
-  TQLabel                 *_actiontqStatus, *_debugtqStatus, *_editortqStatus;
-  ProgrammerStatusWidget *_programmertqStatus;
-  ToolStatusWidget       *_tooltqStatus;
+  TQLabel                 *_actionStatus, *_debugStatus, *_editorStatus;
+  ProgrammerStatusWidget *_programmerStatus;
+  ToolStatusWidget       *_toolStatus;
   TQProgressBar           *_actionProgress;
   ConfigGenerator        *_configGenerator;
   ::Process::Base        *_pikloopsProcess, *_kfindProcess;
diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp
index 51abeab..83a92c4 100644
--- a/src/libgui/toplevel_ui.cpp
+++ b/src/libgui/toplevel_ui.cpp
@@ -65,7 +65,7 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent)
   : TQToolButton(parent, "menu_bar_button")
 {
   TQFontMetrics fm(font());
-  int h = fm.height() + 2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this);
+  int h = fm.height() + 2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this);
   setFixedHeight(h);
   KIconLoader loader;
   setIconSet(loader.loadIconSet(icon, KIcon::Small, fm.height()-2));
@@ -73,7 +73,7 @@ MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent)
   setAutoRaise(true);
 }
 
-TQSize MenuBarButton::tqsizeHint() const
+TQSize MenuBarButton::sizeHint() const
 {
-  return TQSize(TQToolButton::tqsizeHint().width(), height());
+  return TQSize(TQToolButton::sizeHint().width(), height());
 }
diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h
index 651809c..77ae7fc 100644
--- a/src/libgui/toplevel_ui.h
+++ b/src/libgui/toplevel_ui.h
@@ -75,7 +75,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
   MenuBarButton(const TQString &icon, TQWidget *parent);
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 };
 
 #endif