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

22 files changed, 110 insertions, 110 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index c6515dc12..8c4d90ea1 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -45,7 +45,7 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqdir.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index d78b89dd8..b54c1cfc3 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
@@ -332,12 +332,12 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
 
   for (uint i=0; i<pluginPages.count(); i++)
   {
-    if  ( pluginPages.tqat(i)->plugin == plugin )
+    if  ( pluginPages.at(i)->plugin == plugin )
     {
-      TQWidget *w = pluginPages.tqat(i)->page->parentWidget();
-      delete pluginPages.tqat(i)->page;
+      TQWidget *w = pluginPages.at(i)->page->parentWidget();
+      delete pluginPages.at(i)->page;
       delete w;
-      pluginPages.remove(pluginPages.tqat(i));
+      pluginPages.remove(pluginPages.at(i));
       i--;
     }
   }
@@ -415,7 +415,7 @@ void KateConfigDialog::slotApply()
   //
   for (uint i=0; i<editorPages.count(); i++)
   {
-    editorPages.tqat(i)->apply();
+    editorPages.at(i)->apply();
   }
 
   v->getDoc()->writeConfig(config);
@@ -425,7 +425,7 @@ void KateConfigDialog::slotApply()
   //
   for (uint i=0; i<pluginPages.count(); i++)
   {
-    pluginPages.tqat(i)->page->apply();
+    pluginPages.at(i)->page->apply();
   }
 
   config->sync();
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index 13d883eab..1e7dcb3ef 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
 {
   if (m_part) return;
 
-  if (!tqtopLevelWidget() || !parentWidget()) return;
-  if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
+  if (!topLevelWidget() || !parentWidget()) return;
+  if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
 
   KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
 
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index abcf05d15..de944e71d 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -43,7 +43,7 @@
 #include <twin.h>
 
 #include <tqdatetime.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqprogressdialog.h>
 
 KateDocManager::KateDocManager (TQObject *parent)
@@ -69,7 +69,7 @@ KateDocManager::~KateDocManager ()
 {
   // save config
   if (!m_docList.isEmpty())
-    m_docList.tqat(0)->writeConfig(KateApp::self()->config());
+    m_docList.at(0)->writeConfig(KateApp::self()->config());
 
   if (m_saveMetaInfos)
   {
@@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
       {
         m_metaInfos->setGroup(*it);
         TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
-        if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
+        if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
           m_metaInfos->deleteGroup(*it);
       }
       delete def;
@@ -150,7 +150,7 @@ void KateDocManager::deleteDoc (Kate::Document *doc)
 
 Kate::Document *KateDocManager::document (uint n)
 {
-  return m_docList.tqat(n);
+  return m_docList.at(n);
 }
 
 Kate::Document *KateDocManager::activeDocument ()
@@ -234,7 +234,7 @@ bool KateDocManager::isOpen(KURL url)
 Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encoding, uint *id, bool isTempFile)
 {
   // special handling if still only the first initial doc is there
-  if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().tqat(0)->isModified() && documentList().tqat(0)->url().isEmpty()))
+  if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().at(0)->isModified() && documentList().at(0)->url().isEmpty()))
   {
     Kate::Document* doc = documentList().getFirst();
 
@@ -354,7 +354,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
   }
 
   while (!docs.isEmpty() && res)
-    if (! closeDocument(docs.tqat(0),closeURL) )
+    if (! closeDocument(docs.at(0),closeURL) )
       res = false;
     else
       docs.remove ((uint)0);
@@ -364,7 +364,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
     KateApp::self()->mainWindow(i)->viewManager()->setViewActivationBlocked(false);
 
     for (uint s=0; s < KateApp::self()->mainWindow(i)->viewManager()->containers()->count(); s++)
-      KateApp::self()->mainWindow(i)->viewManager()->containers()->tqat(s)->activateView (m_docList.tqat(0)->documentNumber());
+      KateApp::self()->mainWindow(i)->viewManager()->containers()->at(s)->activateView (m_docList.at(0)->documentNumber());
   }
 
   return res;
@@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc)
     m_metaInfos->setGroup(doc->url().prettyURL());
     doc->writeSessionConfig(m_metaInfos);
     m_metaInfos->writeEntry("MD5", (const char *)md5);
-    m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
+    m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
     m_metaInfos->sync();
   }
 }
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 4ed9c3d95..2ed108ed2 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -49,12 +49,12 @@
 #include <tqfile.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqmap.h>
 #include <tqregexp.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 
@@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
 		return false;
 	}
-  KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
+  KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
 	if (!dmw) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
 		return false;
@@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leName = new TQLineEdit( w );
   lo->addWidget( leName, 1, 2 );
   l = new TQLabel( leName, i18n("&Label:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
   lo->addWidget( l, 1, 1 );
   if ( tool ) leName->setText( tool->name );
   TQWhatsThis::add( leName, i18n(
@@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   teCommand = new TQTextEdit( w );
   lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
   l = new TQLabel( teCommand, i18n("S&cript:"), w );
-  l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
+  l->setAlignment( Qt::AlignTop|Qt::AlignRight );
   lo->addWidget( l, 2, 1 );
   if ( tool ) teCommand->setText( tool->command );
   TQWhatsThis::add( teCommand, i18n(
@@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leExecutable = new TQLineEdit( w );
   lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
   l = new TQLabel( leExecutable, i18n("&Executable:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
   lo->addWidget( l, 3, 1 );
   if ( tool ) leExecutable->setText( tool->tryexec );
   TQWhatsThis::add( leExecutable, i18n(
@@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leMimetypes = new TQLineEdit( w );
   lo->addWidget( leMimetypes, 4, 2 );
   l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
   lo->addWidget( l, 4, 1 );
   if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
   TQWhatsThis::add( leMimetypes, i18n(
@@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   cmbSave = new TQComboBox(w);
   lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
   l = new TQLabel( cmbSave, i18n("&Save:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
   lo->addWidget( l, 5, 1 );
   TQStringList sl;
   sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leCmdLine = new TQLineEdit( w );
   lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
   l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
   lo->addWidget( l, 6, 1 );
   if ( tool ) leCmdLine->setText( tool->cmdname );
   TQWhatsThis::add( leCmdLine, i18n(
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index c29bdd1e1..1792274ac 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -33,7 +33,7 @@
 #include <tqcolor.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -69,7 +69,7 @@ class ToolTip : public TQToolTip
       KateFileListItem *item = ((KateFileListItem*)i);
       if ( ! item ) return;
 
-      tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
+      tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
 
     }
 
@@ -272,8 +272,8 @@ void KateFileList::slotModChanged (Kate::Document *doc)
 
     for ( uint i=0; i <  m_editHistory.count(); i++ )
     {
-      m_editHistory.tqat( i )->setEditHistPos( i+1 );
-      repaintItem(  m_editHistory.tqat( i ) );
+      m_editHistory.at( i )->setEditHistPos( i+1 );
+      repaintItem(  m_editHistory.at( i ) );
     }
   }
   else
@@ -334,7 +334,7 @@ void KateFileList::slotViewChanged ()
 //   int p = 0;
 //   if (  m_viewHistory.count() )
 //   {
-//     int p =  m_viewHistory.findRef( item ); // only tqrepaint items that needs it
+//     int p =  m_viewHistory.findRef( item ); // only repaint items that needs it
 //   }
 
   m_viewHistory.removeRef( item );
@@ -342,8 +342,8 @@ void KateFileList::slotViewChanged ()
 
   for ( uint i=0; i <  m_viewHistory.count(); i++ )
   {
-    m_viewHistory.tqat( i )->setViewHistPos( i+1 );
-    repaintItem(  m_viewHistory.tqat( i ) );
+    m_viewHistory.at( i )->setViewHistPos( i+1 );
+    repaintItem(  m_viewHistory.at( i ) );
   }
 
 }
@@ -616,7 +616,7 @@ void KFLConfigPage::apply()
   m_filelist->m_editShade = kcbEditShade->color();
   m_filelist->m_enableBgShading = cbEnableShading->isChecked();
   m_filelist->setSortType( cmbSort->currentItem() );
-  // tqrepaint the affected items
+  // repaint the affected items
   m_filelist->triggerUpdate();
 }
 
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 3a01cda28..deec5231f 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -28,7 +28,7 @@
 
 #include "kactionselector.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
@@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
 	if (m_tb)
 	{
-		setMinimumHeight(m_tb->tqsizeHint().height());
+		setMinimumHeight(m_tb->sizeHint().height());
 		m_tb->resize(width(),height());
 	}
 }
@@ -123,7 +123,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   tqInstallMsgHandler( oldHandler );
 
   cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-  cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
   cmbPath->setCompletionObject( cmpl );
   cmbPath->setAutoDeleteCompletionObject( true );
@@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
   btnFilter->setIconSet( SmallIconSet("filter" ) );
   btnFilter->setToggleButton( true );
   filter = new KHistoryCombo( true, filterBox, "filter");
-  filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   filterBox->setStretchFactor(filter, 2);
   connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
 
@@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u )
   newurl.setPath(pathstr);
 
   if ( !kateFileSelectorIsReadable ( newurl ) )
-    newurl.cd(TQString::tqfromLatin1(".."));
+    newurl.cd(TQString::fromLatin1(".."));
 
   if ( !kateFileSelectorIsReadable (newurl) )
      newurl.setPath( TQDir::homeDirPath() );
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index ebc461618..f7436766a 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -22,7 +22,7 @@
 #include "katemainwindow.h"
 
 #include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqevent.h>
@@ -100,7 +100,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   loInput->setColStretch(1, 20);
 
   TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
-  lPattern->setFixedSize(lPattern->tqsizeHint());
+  lPattern->setFixedSize(lPattern->sizeHint());
   loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
 
   TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
@@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
   lPattern->setBuddy(cmbPattern);
   cmbPattern->setFocus();
-  cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
+  cmbPattern->setMinimumSize(cmbPattern->sizeHint());
   loPattern->addWidget( cmbPattern );
 
   cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
-  cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
+  cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
   cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
   loPattern->addWidget(cbCasesensitive);
 
   cbRegex = new TQCheckBox( i18n("Regular expression"), this );
-  cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
+  cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
   cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
   loPattern->addWidget( cbRegex );
   loPattern->setStretchFactor( cmbPattern, 100 );
 
   TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
-  lTemplate->setFixedSize(lTemplate->tqsizeHint());
+  lTemplate->setFixedSize(lTemplate->sizeHint());
   loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
 
   TQBoxLayout *loTemplate = new TQHBoxLayout(4);
@@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   leTemplate = new KLineEdit(this);
   lTemplate->setBuddy(leTemplate);
   leTemplate->setText(strTemplate[0]);
-  leTemplate->setMinimumSize(leTemplate->tqsizeHint());
+  leTemplate->setMinimumSize(leTemplate->sizeHint());
   loTemplate->addWidget(leTemplate);
 
   KComboBox *cmbTemplate = new KComboBox(false, this);
@@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   loTemplate->addWidget(cmbTemplate);
 
   TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
-  lFiles->setFixedSize(lFiles->tqsizeHint());
+  lFiles->setFixedSize(lFiles->sizeHint());
   loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
 
   cmbFiles = new KComboBox(true, this);
   lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
-  cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
+  cmbFiles->setMinimumSize(cmbFiles->sizeHint());
   cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
   cmbFiles->setDuplicatesEnabled(false);
   cmbFiles->insertStringList(lastSearchFiles);
   loInput->addWidget(cmbFiles, 2, 1);
 
   TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
-  lDir->setFixedSize(lDir->tqsizeHint());
+  lDir->setFixedSize(lDir->sizeHint());
   loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
 
   TQBoxLayout *loDir = new TQHBoxLayout(3);
@@ -176,7 +176,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   lDir->setBuddy(cmbDir);
 
   cbRecursive = new TQCheckBox(i18n("Recursive"), this);
-  cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
+  cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
   cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
   loDir->addWidget(cbRecursive);
 
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 52bf1f243..79a1e19c6 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow  *mainwin )
   }
   list->hide();
   connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
-  mw->setMinimumSize( lInfo->tqsizeHint() );
+  mw->setMinimumSize( lInfo->sizeHint() );
 }
 
 TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
@@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton()
     lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );
 
   }
-  mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
-  setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
+  mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
+  setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
   resize( width(), minimumHeight() );
 }
 #include "katemailfilesdialog.moc"
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index fedb89b7c..f3f1dc2aa 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -31,7 +31,7 @@
 #include <dcopref.h>
 #include <kdebug.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <stdlib.h>
 
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 369eb0b78..9a06893f6 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -77,7 +77,7 @@
 #include <ktip.h>
 #include <kmenubar.h>
 #include <kstringhandler.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrvector.h>
 
 #include <assert.h>
@@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
     if (sconfig)
     {
       sconfig->setGroup (sgroup);
-      size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
-      size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
+      size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
+      size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
     }
 
     // if thats fails, try to reuse size
@@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
       {
         // first try global app config
         KateApp::self()->config()->setGroup ("MainWindow");
-        size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
-        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
+        size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
+        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
 
         if (size.isEmpty())
           size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -544,10 +544,10 @@ void KateMainWindow::editKeys()
   TQPtrList<Kate::Document>  l=KateDocManager::self()->documentList();
   for (uint i=0;i<l.count();i++) {
 //     kdDebug(13001)<<"reloading Keysettings for document "<<i<<endl;
-    l.tqat(i)->reloadXML();
-    TQPtrList<class KTextEditor::View> l1=l.tqat(i)->views ();//KTextEditor::Document
+    l.at(i)->reloadXML();
+    TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document
     for (uint i1=0;i1<l1.count();i1++) {
-      l1.tqat(i1)->reloadXML();
+      l1.at(i1)->reloadXML();
 //       kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl;
     }
   }
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 9a809c374..1991816af 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw )
 
   if ( domDocument().documentElement().isNull() )
   {
-    TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+    TQString completeDescription = TQString::fromLatin1( guiDescription )
           .arg( actionListName );
 
     setXML( completeDescription, false /*merge*/ );
@@ -239,7 +239,7 @@ ToolView::~ToolView ()
   m_mainWin->toolViewDeleted (this);
 }
 
-void ToolView::tqsetVisible (bool vis)
+void ToolView::setVisible (bool vis)
 {
   if (m_visible == vis)
     return;
@@ -380,7 +380,7 @@ bool Sidebar::showWidget (ToolView *widget)
     {
       it.current()->hide();
       setTab (it.currentKey(), false);
-      it.current()->tqsetVisible(false);
+      it.current()->setVisible(false);
     }
 
   setTab (m_widgetToId[widget], true);
@@ -388,7 +388,7 @@ bool Sidebar::showWidget (ToolView *widget)
   m_ownSplit->show ();
   widget->show ();
 
-  widget->tqsetVisible (true);
+  widget->setVisible (true);
 
   return true;
 }
@@ -420,7 +420,7 @@ bool Sidebar::hideWidget (ToolView *widget)
   if (!anyVis)
     m_ownSplit->hide ();
 
-  widget->tqsetVisible (false);
+  widget->setVisible (false);
 
   return true;
 }
@@ -618,7 +618,7 @@ void Sidebar::restoreSession (KConfig *config)
     ToolView *tv = m_toolviews[i];
 
     tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false);
-    tv->tqsetVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
+    tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
 
     if (!anyVis)
       anyVis = tv->visible();
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 3588f4ecc..8096433b7 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -146,7 +146,7 @@ class ToolView : public TQVBox
 
     Sidebar *sidebar () { return m_sidebar; }
 
-    void tqsetVisible (bool vis);
+    void setVisible (bool vis);
 
   public:
     bool visible () const;
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 0ea7cdc71..944665d91 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -35,7 +35,7 @@
 
 #include <tqlabel.h>
 #include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 6e0d28a1d..09257300c 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -152,7 +152,7 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate:
 		m_documentRoot=new TQListViewItem(m_list,i18n("Documents"));
 		const uint docCnt=documents.count();
 		for (uint i=0;i<docCnt;i++) {
-			new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.tqat(i));
+			new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.at(i));
 		}
 		m_documentRoot->setOpen(true);
 	} else m_documentRoot=0;
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index a62924b92..d1dcd0173 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -38,7 +38,7 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqcheckbox.h>
diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp
index 13a099730..e2ac7e8b3 100644
--- a/kate/app/katetabwidget.cpp
+++ b/kate/app/katetabwidget.cpp
@@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in
   KTabWidget::insertTab(child,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con
   KTabWidget::insertTab(child,iconset,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
   KTabWidget::insertTab(child,tab,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void KateTabWidget::removePage ( TQWidget * w )
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 6d95efbb0..75cc4b15c 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -316,7 +316,7 @@ uint KateViewManager::viewCount ()
 {
   uint viewCount=0;
   for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-    viewCount+=m_viewSpaceContainerList.tqat(i)->viewCount();
+    viewCount+=m_viewSpaceContainerList.at(i)->viewCount();
   }
   return viewCount;
 
@@ -326,7 +326,7 @@ uint KateViewManager::viewSpaceCount ()
 {
   uint viewSpaceCount=0;
   for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-    viewSpaceCount+=m_viewSpaceContainerList.tqat(i)->viewSpaceCount();
+    viewSpaceCount+=m_viewSpaceContainerList.at(i)->viewSpaceCount();
   }
   return viewSpaceCount;
 }
@@ -334,7 +334,7 @@ uint KateViewManager::viewSpaceCount ()
 void KateViewManager::setViewActivationBlocked (bool block)
 {
   for (uint i=0;i<m_viewSpaceContainerList.count();i++)
-    m_viewSpaceContainerList.tqat(i)->m_blockViewCreationAndActivation=block;
+    m_viewSpaceContainerList.at(i)->m_blockViewCreationAndActivation=block;
 }
 
 void KateViewManager::activateNextView()
@@ -354,7 +354,7 @@ void KateViewManager::activatePrevView()
 void KateViewManager::closeViews(uint documentNumber)
 {
   for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-    m_viewSpaceContainerList.tqat(i)->closeViews(documentNumber);
+    m_viewSpaceContainerList.at(i)->closeViews(documentNumber);
   }
   tabChanged(m_currentContainer);
 }
@@ -454,7 +454,7 @@ void KateViewManager::setShowFullPath( bool enable )
 {
   showFullPath=enable;
   for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-    m_viewSpaceContainerList.tqat(i)->setShowFullPath(enable);
+    m_viewSpaceContainerList.at(i)->setShowFullPath(enable);
   }
   m_mainWindow->slotWindowActivated ();
  }
@@ -477,7 +477,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
   config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count());
   config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex());
   for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
-    m_viewSpaceContainerList.tqat(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
+    m_viewSpaceContainerList.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
   }
 }
 
@@ -495,10 +495,10 @@ void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString&
   uint tabCount=config->readNumEntry("ViewSpaceContainers",0);
   int activeOne=config->readNumEntry("Active ViewSpaceContainer",0);
   if (tabCount==0) return;
-  m_viewSpaceContainerList.tqat(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
+  m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
   for (uint i=1;i<tabCount;i++) {
     slotNewTab();
-    m_viewSpaceContainerList.tqat(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
+    m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
   }
 
   if (activeOne != m_mainWindow->tabWidget()->currentPageIndex())
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index c2caba114..4df741fdf 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -67,9 +67,9 @@ protected:
   void paintEvent( TQPaintEvent *e )
   {
     TQPainter p( this );
-    p.setPen( tqcolorGroup().shadow() );
+    p.setPen( colorGroup().shadow() );
     p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
-    p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
+    p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
     p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
   }
 };
@@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
 {
   m_lineColLabel = new TQLabel( this );
   addWidget( m_lineColLabel, 0, false );
-  m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
+  m_lineColLabel->setAlignment( Qt::AlignCenter );
   m_lineColLabel->installEventFilter( this );
 
   m_modifiedLabel = new TQLabel( TQString("   "), this );
   addWidget( m_modifiedLabel, 0, false );
-  m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
+  m_modifiedLabel->setAlignment( Qt::AlignCenter );
   m_modifiedLabel->installEventFilter( this );
 
   m_insertModeLabel = new TQLabel( i18n(" INS "), this );
   addWidget( m_insertModeLabel, 0, false );
-  m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
+  m_insertModeLabel->setAlignment( Qt::AlignCenter );
   m_insertModeLabel->installEventFilter( this );
 
   m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
   addWidget( m_selectModeLabel, 0, false );
-  m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
+  m_selectModeLabel->setAlignment( Qt::AlignCenter );
   m_selectModeLabel->installEventFilter( this );
 
   m_fileNameLabel=new KSqueezedTextLabel( this );
   addWidget( m_fileNameLabel, 1, true );
   m_fileNameLabel->setMinimumSize( 0, 0 );
-  m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-  m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+  m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+  m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
   m_fileNameLabel->installEventFilter( this );
 
   installEventFilter( this );
@@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()
 
 void KateVSStatusBar::showMenu()
 {
-   KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
+   KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
    TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
 
    if (menu)
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index d3a834629..d27a91cb3 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -48,7 +48,7 @@
 
 #include <ktexteditor/encodinginterface.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqstringlist.h>
 #include <tqvbox.h>
@@ -277,7 +277,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
     setActiveView (view);
     m_viewList.findRef (view);
 
-    mainWindow()->toolBar ()->tqsetUpdatesEnabled (false);
+    mainWindow()->toolBar ()->setUpdatesEnabled (false);
 
     if (m_viewManager->guiMergedView)
       mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView );
@@ -287,7 +287,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
     if (!m_blockViewCreationAndActivation)
       mainWindow()->guiFactory ()->addClient( view );
 
-    mainWindow()->toolBar ()->tqsetUpdatesEnabled (true);
+    mainWindow()->toolBar ()->setUpdatesEnabled (true);
 
     statusMsg();
 
@@ -342,8 +342,8 @@ void KateViewSpaceContainer::activateNextView()
   if (i >= m_viewSpaceList.count())
     i=0;
 
-  setActiveSpace (m_viewSpaceList.tqat(i));
-  activateView(m_viewSpaceList.tqat(i)->currentView());
+  setActiveSpace (m_viewSpaceList.at(i));
+  activateView(m_viewSpaceList.at(i)->currentView());
 }
 
 void KateViewSpaceContainer::activatePrevView()
@@ -353,8 +353,8 @@ void KateViewSpaceContainer::activatePrevView()
   if (i < 0)
     i=m_viewSpaceList.count()-1;
 
-  setActiveSpace (m_viewSpaceList.tqat(i));
-  activateView(m_viewSpaceList.tqat(i)->currentView());
+  setActiveSpace (m_viewSpaceList.at(i));
+  activateView(m_viewSpaceList.at(i)->currentView());
 }
 
 void KateViewSpaceContainer::closeViews(uint documentNumber)
@@ -363,7 +363,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber)
 
     for (uint z=0 ; z < m_viewList.count(); z++)
     {
-      Kate::View* current = m_viewList.tqat(z);
+      Kate::View* current = m_viewList.at(z);
       if ( current->getDoc()->documentNumber() == documentNumber )
       {
         closeList.append (current);
@@ -644,7 +644,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
   {
     // send all views + their gui to **** ;)
     for (uint i=0; i < m_viewList.count(); i++)
-      mainWindow()->guiFactory ()->removeClient (m_viewList.tqat(i));
+      mainWindow()->guiFactory ()->removeClient (m_viewList.at(i));
 
     m_viewList.clear ();
 
@@ -658,7 +658,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
   // finally, make the correct view active.
   config->setGroup (group);
 /*
-  KateViewSpace *vs = m_viewSpaceList.tqat( config->readNumEntry("Active ViewSpace") );
+  KateViewSpace *vs = m_viewSpaceList.at( config->readNumEntry("Active ViewSpace") );
   if ( vs )
     activateSpace( vs->currentView() );
   */
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index bdb85130b..2a3b700f7 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kbookmarkimporter.h>
 #include <kpopupmenu.h>
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index f47beb87f..5b299c1b9 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -60,8 +60,8 @@
 #include <tqdropsite.h>
 #include <tqdragobject.h>
 #include <tqvbox.h>
-#include <tqtextcodec.h>
-#include <tqlayout.h>
+#include <textcodec.h>
+#include <layout.h>
 
 // StatusBar field IDs
 #define KWRITE_ID_GEN 1
@@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
 
   // init with more usefull size, stolen from konq :)
   if (!initialGeometrySet())
-    resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
+    resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
 
   // call it as last thing, must be sure everything is already set up ;)
   setAutoSaveSettings ();
@@ -474,7 +474,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
      TQString buf = TQString("Document %1").arg(z);
      config->setGroup(buf);
 
-     KTextEditor::Document *doc = docList.tqat(z - 1);
+     KTextEditor::Document *doc = docList.at(z - 1);
 
      if (KTextEditor::configInterface(doc))
        KTextEditor::configInterface(doc)->writeSessionConfig(config);
@@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
      TQString buf = TQString("Window %1").arg(z);
      config->setGroup(buf);
 
-     config->writeEntry("DocumentNumber",docList.find(winList.tqat(z-1)->view()->document()) + 1);
+     config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1);
   }
 }
 
@@ -521,7 +521,7 @@ void KWrite::restore()
   {
     buf = TQString("Window %1").arg(z);
     config->setGroup(buf);
-    t = new KWrite(docList.tqat(config->readNumEntry("DocumentNumber") - 1));
+    t = new KWrite(docList.at(config->readNumEntry("DocumentNumber") - 1));
     t->restore(config,z);
   }
 }