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

drkonqi/backtrace.cpp

@@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
         --len;
         }
       m_strBt.remove( pos, len );
-      m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
+      m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
       }
     }
 }

drkonqi/debugger.cpp

@@ -25,7 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 
@@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
   TQWidget *w = new TQWidget( this );
   ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
   m_status = new TQLabel( w );
-  m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+  m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
   //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
-  KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
+  KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
   m_copyButton = new KPushButton( item, w );
   connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
   m_copyButton->setEnabled( false );
@@ -109,7 +109,7 @@ void KrashDebugger :: slotSave()
   }
   else
   {
-    TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
+    TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
     if( defname.contains( '/' ))
         defname = defname.mid( defname.findRev( '/' ) + 1 );
     TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
@@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
 bool KrashDebugger::performChecks( TQString* msg )
 {
   bool ret = true;
-  KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
+  KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
   kdedcfg.setGroup( "General" );
   if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
   {

drkonqi/krashconf.cpp

@@ -93,12 +93,12 @@ void KrashConfig :: readConfig()
 
   // maybe we should check if it's relative?
   TQString configname = config->readEntry("ConfigName",
-                                         TQString::tqfromLatin1("enduser"));
+                                         TQString::fromLatin1("enduser"));
 
   TQString debuggername = config->readEntry("Debugger",
-                                           TQString::tqfromLatin1("gdb"));
+                                           TQString::fromLatin1("gdb"));
 
-  KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
+  KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
                     true, false, "appdata");
 
   debuggers.setGroup("General");
@@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
   m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
   m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
 
-  KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname),
+  KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
                  true, false, "appdata");
 
   preset.setGroup("ErrorDescription");
@@ -138,7 +138,7 @@ void KrashConfig :: readConfig()
   TQString str = TQString::number(m_signalnum);
   // use group unknown if signal not found
   if (!preset.hasGroup(str))
-    str = TQString::tqfromLatin1("unknown");
+    str = TQString::fromLatin1("unknown");
   preset.setGroup(str);
   m_signalName = preset.readEntry("Name");
   if (b)
@@ -149,13 +149,13 @@ void KrashConfig :: readConfig()
 void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
 {
   TQMap<TQString,TQString> map;
-  map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
-  map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("tdeinit") : m_execname;
-  map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
-  map[TQString::tqfromLatin1("signame")] = signalName();
-  map[TQString::tqfromLatin1("progname")] = programName();
-  map[TQString::tqfromLatin1("pid")] = TQString::number(pid());
-  map[TQString::tqfromLatin1("tempfile")] = tempFile;
+  map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
+  map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("tdeinit") : m_execname;
+  map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
+  map[TQString::fromLatin1("signame")] = signalName();
+  map[TQString::fromLatin1("progname")] = programName();
+  map[TQString::fromLatin1("pid")] = TQString::number(pid());
+  map[TQString::fromLatin1("tempfile")] = tempFile;
   if (shell)
     str = KMacroExpander::expandMacrosShellQuote( str, map );
   else

drkonqi/toplevel.cpp

@@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
   // picture of konqi
   TQLabel *lab = new TQLabel(page);
   lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
-  TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
+  TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
   lab->setPixmap(pix);
-  lab->setFixedSize( lab->tqsizeHint() );
+  lab->setFixedSize( lab->sizeHint() );
 
   TQLabel * info = new TQLabel(generateText(), page);
-  info->setMinimumSize(info->tqsizeHint());
+  info->setMinimumSize(info->sizeHint());
 
   if (m_krashconf->showBacktrace())
   {
@@ -196,7 +196,7 @@ void Toplevel :: slotUser3()
 void Toplevel :: slotBacktraceDone(const TQString &str)
 {
   // Do not translate.. This will be included in the _MAIL_.
-  TQString buf = TQString::tqfromLatin1
+  TQString buf = TQString::fromLatin1
     ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
 
   m_bugreport->setText(buf);

kappfinder/toplevel.cpp

@@ -37,7 +37,7 @@
 
 #include <tqaccel.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqdir.h>
 #include <tqregexp.h>
@@ -54,7 +54,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
                                     "applications on your system and adds "
                                     "them to the KDE menu system. "
                                     "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
-  label->tqsetAlignment( AlignAuto | WordBreak );
+  label->setAlignment( AlignAuto | WordBreak );
   layout->addWidget( label );
 
   layout->addSpacing( 5 );

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>

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();

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");
 

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();
   }
 }

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(

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();
 }
 

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() );

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);
 

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"

kate/app/katemain.cpp

@@ -31,7 +31,7 @@
 #include <dcopref.h>
 #include <kdebug.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <stdlib.h>
 

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;
     }
   }

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();

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;

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>

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;

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>

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 )

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();
+