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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

39 files changed, 273 insertions, 273 deletions

diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h
index 8715ed273..3c5b7c09b 100644
--- a/kio/kfile/config-kfile.h
+++ b/kio/kfile/config-kfile.h
@@ -3,7 +3,7 @@
 
 const int kfile_area = 250;
 
-#define DefaultViewStyle TQString::fromLatin1("SimpleView")
+#define DefaultViewStyle TQString::tqfromLatin1("SimpleView")
 #define DefaultPannerPosition 40
 #define DefaultMixDirsAndFiles false
 #define DefaultShowStatusLine false
@@ -14,19 +14,19 @@ const int kfile_area = 250;
 #define DefaultRecentURLsNumber 15
 #define DefaultDirectoryFollowing true
 #define DefaultAutoSelectExtChecked true
-#define ConfigGroup TQString::fromLatin1("KFileDialog Settings")
-#define RecentURLs TQString::fromLatin1("Recent URLs")
-#define RecentFiles TQString::fromLatin1("Recent Files")
-#define RecentURLsNumber TQString::fromLatin1("Maximum of recent URLs")
-#define RecentFilesNumber TQString::fromLatin1("Maximum of recent files")
-#define DialogWidth TQString::fromLatin1("Width (%1)")
-#define DialogHeight TQString::fromLatin1("Height (%1)")
-#define ConfigShowStatusLine TQString::fromLatin1("ShowStatusLine")
-#define AutoDirectoryFollowing TQString::fromLatin1("Automatic directory following")
-#define PathComboCompletionMode TQString::fromLatin1("PathCombo Completionmode")
-#define LocationComboCompletionMode TQString::fromLatin1("LocationCombo Completionmode")
-#define ShowSpeedbar TQString::fromLatin1("Show Speedbar")
-#define ShowBookmarks TQString::fromLatin1("Show Bookmarks")
-#define AutoSelectExtChecked TQString::fromLatin1("Automatically select filename extension")
+#define ConfigGroup TQString::tqfromLatin1("KFileDialog Settings")
+#define RecentURLs TQString::tqfromLatin1("Recent URLs")
+#define RecentFiles TQString::tqfromLatin1("Recent Files")
+#define RecentURLsNumber TQString::tqfromLatin1("Maximum of recent URLs")
+#define RecentFilesNumber TQString::tqfromLatin1("Maximum of recent files")
+#define DialogWidth TQString::tqfromLatin1("Width (%1)")
+#define DialogHeight TQString::tqfromLatin1("Height (%1)")
+#define ConfigShowStatusLine TQString::tqfromLatin1("ShowStatusLine")
+#define AutoDirectoryFollowing TQString::tqfromLatin1("Automatic directory following")
+#define PathComboCompletionMode TQString::tqfromLatin1("PathCombo Completionmode")
+#define LocationComboCompletionMode TQString::tqfromLatin1("LocationCombo Completionmode")
+#define ShowSpeedbar TQString::tqfromLatin1("Show Speedbar")
+#define ShowBookmarks TQString::tqfromLatin1("Show Bookmarks")
+#define AutoSelectExtChecked TQString::tqfromLatin1("Automatically select filename extension")
 
 #endif
diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp
index c791667f6..99fed814f 100644
--- a/kio/kfile/kacleditwidget.cpp
+++ b/kio/kfile/kacleditwidget.cpp
@@ -34,7 +34,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqheader.h>
 
@@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent,
    qualifier( _qualifier ), isPartial( false )
 {
     m_pACLListView = dynamic_cast<KACLListView*>( parent );
-    repaint();
+    tqrepaint();
 }
 
 
@@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const
 }
 
 void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
-                                  int column, int width, int alignment )
+                                  int column, int width, int tqalignment )
 {
     TQColorGroup mycg = cg;
     if ( isDefault ) {
@@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
         mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) );
         p->setFont( font );
     }
-    KListViewItem::paintCell( p, mycg, column, width, alignment );
+    KListViewItem::paintCell( p, mycg, column, width, tqalignment );
 
     KACLListViewItem *below =0;
     if ( itemBelow() )
@@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps()
         setPixmap( 4, TQPixmap() );
 }
 
-void KACLListViewItem::repaint()
+void KACLListViewItem::tqrepaint()
 {
     int idx = 0;
     switch ( type )
@@ -527,7 +527,7 @@ void EditACLEntryDialog::slotOk()
     }
     if ( m_defaultCB )
         m_item->isDefault = m_defaultCB->isChecked();
-    m_item->repaint();
+    m_item->tqrepaint();
 
     KDialogBase::slotOk();
 }
@@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name )
     struct passwd *user = 0;
     setpwent();
     while ( ( user = getpwent() ) != 0 ) {
-       m_allUsers << TQString::fromLatin1( user->pw_name );
+       m_allUsers << TQString::tqfromLatin1( user->pw_name );
     }
     endpwent();
 
     struct group *gr = 0;
     setgrent();
     while ( ( gr = getgrent() ) != 0 ) {
-       m_allGroups << TQString::fromLatin1( gr->gr_name );
+       m_allGroups << TQString::tqfromLatin1( gr->gr_name );
     }
     endgrent();
     m_allUsers.sort();
@@ -1019,7 +1019,7 @@ void KACLListView::slotRemoveEntry()
                 delete item;
             } else {
                 item->value = 0;
-                item->repaint();
+                item->tqrepaint();
             }
             if ( !itemWasDefault )
                 calculateEffectiveRights();
@@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry()
                       || item->type == Group
                       || item->type == Others ) ) {
                 item->value = 0;
-                item->repaint();
+                item->tqrepaint();
             } else {
                 delete item;
             }
diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h
index 1a0c85064..9b4d9d48e 100644
--- a/kio/kfile/kacleditwidget_p.h
+++ b/kio/kfile/kacleditwidget_p.h
@@ -186,10 +186,10 @@ public:
     void togglePerm( acl_perm_t perm );
 
     virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int alignment );
+                            int column, int width, int tqalignment );
 
     void updatePermPixmaps();
-    void repaint();
+    void tqrepaint();
 
     KACLListView::EntryType type;
     unsigned short value;
diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp
index 8ba9d29bb..41b4176fa 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/kio/kfile/kcombiview.cpp
@@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting )
 
 KFileView *KCombiView::focusView( KFileView *preferred ) const
 {
-    TQWidget *w = focusWidget();
+    TQWidget *w = tqfocusWidget();
     KFileView *other = (right == preferred) ? left : right;
     return (preferred && w == preferred->widget()) ? preferred : other;
 }
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index d2dc39da9..753ba1b3a 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -24,7 +24,7 @@
 #include <tqapplication.h>
 #include <tqdialog.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
@@ -111,13 +111,13 @@ KDirOperator::KDirOperator(const KURL& _url,
         TQString strPath = TQDir::currentDirPath();
         strPath.append('/');
         currUrl = KURL();
-        currUrl.setProtocol(TQString::fromLatin1("file"));
+        currUrl.setProtocol(TQString::tqfromLatin1("file"));
         currUrl.setPath(strPath);
     }
     else {
         currUrl = _url;
         if ( currUrl.protocol().isEmpty() )
-            currUrl.setProtocol(TQString::fromLatin1("file"));
+            currUrl.setProtocol(TQString::tqfromLatin1("file"));
 
         currUrl.addPath("/"); // make sure we have a trailing slash!
     }
@@ -414,7 +414,7 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
     {
         url.addPath( *it );
         exists = KIO::NetAccess::exists( url, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
+        writeOk = !exists && KIO::NetAccess::mkdir( url, tqtopLevelWidget() );
     }
 
     if ( exists ) // url was already existant
@@ -484,7 +484,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
 
     if ( doIt ) {
         KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
-        job->setWindow (topLevelWidget());
+        job->setWindow (tqtopLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
     }
@@ -547,7 +547,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
 
     if ( doIt ) {
         KIO::CopyJob *job = KIO::trash( urls, showProgress );
-        job->setWindow (topLevelWidget());
+        job->setWindow (tqtopLevelWidget());
         job->setAutoErrorHandlingEnabled( true, parent );
         return job;
     }
@@ -651,7 +651,7 @@ void KDirOperator::setURL(const KURL& _newurl, bool clearforward)
 
     if ( !isReadable( newurl ) ) {
         // maybe newurl is a file? check its parent directory
-        newurl.cd(TQString::fromLatin1(".."));
+        newurl.cd(TQString::tqfromLatin1(".."));
         if ( !isReadable( newurl ) ) {
             resetCursor();
             KMessageBox::error(viewWidget(),
@@ -777,7 +777,7 @@ KURL KDirOperator::url() const
 void KDirOperator::cdUp()
 {
     KURL tmp(currUrl);
-    tmp.cd(TQString::fromLatin1(".."));
+    tmp.cd(TQString::tqfromLatin1(".."));
     setURL(tmp, true);
 }
 
@@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister )
 
     dir->setAutoUpdate( true );
 
-    TQWidget* mainWidget = topLevelWidget();
+    TQWidget* mainWidget = tqtopLevelWidget();
     dir->setMainWindow (mainWidget);
     kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl;
 
@@ -1253,7 +1253,7 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
 
 void KDirOperator::setupActions()
 {
-    myActionCollection = new KActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+    myActionCollection = new KActionCollection( tqtopLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
 
     actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
     upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
@@ -1273,7 +1273,7 @@ void KDirOperator::setupActions()
 	     this, TQT_SLOT( trashSelected( KAction::ActivationReason, TQt::ButtonState ) ) );
     new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
-    mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
+    mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") );
     reloadAction->setText( i18n("Reload") );
     reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload ));
 
@@ -1293,7 +1293,7 @@ void KDirOperator::setupActions()
                                        TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
                                        myActionCollection, "reversed" );
 
-    TQString sortGroup = TQString::fromLatin1("sort");
+    TQString sortGroup = TQString::tqfromLatin1("sort");
     byNameAction->setExclusiveGroup( sortGroup );
     byDateAction->setExclusiveGroup( sortGroup );
     bySizeAction->setExclusiveGroup( sortGroup );
@@ -1337,7 +1337,7 @@ void KDirOperator::setupActions()
              TQT_SLOT( togglePreview( bool )));
 
 
-    TQString viewGroup = TQString::fromLatin1("view");
+    TQString viewGroup = TQString::tqfromLatin1("view");
     shortAction->setExclusiveGroup( viewGroup );
     detailedAction->setExclusiveGroup( viewGroup );
 
@@ -1386,7 +1386,7 @@ void KDirOperator::setupMenu(int whichActions)
         if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
             actionMenu->insert( myActionCollection->action( "trash" ) );
         KConfig *globalconfig = KGlobal::config();
-        KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
+        KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") );
         if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) ||
             globalconfig->readBoolEntry("ShowDeleteCommand", false))
             actionMenu->insert( myActionCollection->action( "delete" ) );
@@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
     defaultView = 0;
     int sorting = 0;
 
-    TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"),
-                                       TQString::fromLatin1("Simple") );
-    if ( viewStyle == TQString::fromLatin1("Detail") )
+    TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"),
+                                       TQString::tqfromLatin1("Simple") );
+    if ( viewStyle == TQString::tqfromLatin1("Detail") )
         defaultView |= KFile::Detail;
     else
         defaultView |= KFile::Simple;
-    if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"),
+    if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"),
                             DefaultMixDirsAndFiles ) )
         defaultView |= KFile::SeparateDirs;
-    if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false))
+    if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false))
         defaultView |= KFile::PreviewContents;
 
-    if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"),
+    if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"),
                             DefaultCaseInsensitive ) )
         sorting |= TQDir::IgnoreCase;
-    if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"),
+    if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"),
                             DefaultDirsFirst ) )
         sorting |= TQDir::DirsFirst;
 
 
-    TQString name = TQString::fromLatin1("Name");
-    TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name );
+    TQString name = TQString::tqfromLatin1("Name");
+    TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name );
     if ( sortBy == name )
         sorting |= TQDir::Name;
-    else if ( sortBy == TQString::fromLatin1("Size") )
+    else if ( sortBy == TQString::tqfromLatin1("Size") )
         sorting |= TQDir::Size;
-    else if ( sortBy == TQString::fromLatin1("Date") )
+    else if ( sortBy == TQString::tqfromLatin1("Date") )
         sorting |= TQDir::Time;
 
     mySorting = static_cast<TQDir::SortSpec>( sorting );
     setSorting( mySorting );
 
 
-    if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"),
+    if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"),
                             DefaultShowHidden ) ) {
          showHiddenAction->setChecked( true );
          dir->setShowingDotFiles( true );
     }
-    if ( kc->readBoolEntry( TQString::fromLatin1("Sort reversed"),
+    if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"),
                             DefaultSortReversed ) )
         reverseAction->setChecked( true );
 
@@ -1505,18 +1505,18 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
     if ( !group.isEmpty() )
         kc->setGroup( group );
 
-    TQString sortBy = TQString::fromLatin1("Name");
+    TQString sortBy = TQString::tqfromLatin1("Name");
     if ( KFile::isSortBySize( mySorting ) )
-        sortBy = TQString::fromLatin1("Size");
+        sortBy = TQString::tqfromLatin1("Size");
     else if ( KFile::isSortByDate( mySorting ) )
-        sortBy = TQString::fromLatin1("Date");
-    kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy );
+        sortBy = TQString::tqfromLatin1("Date");
+    kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy );
 
-    kc->writeEntry( TQString::fromLatin1("Sort reversed"),
+    kc->writeEntry( TQString::tqfromLatin1("Sort reversed"),
                     reverseAction->isChecked() );
-    kc->writeEntry( TQString::fromLatin1("Sort case insensitively"),
+    kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"),
                     caseInsensitiveAction->isChecked() );
-    kc->writeEntry( TQString::fromLatin1("Sort directories first"),
+    kc->writeEntry( TQString::tqfromLatin1("Sort directories first"),
                     dirsFirstAction->isChecked() );
 
     // don't save the separate dirs or preview when an application specific
@@ -1530,26 +1530,26 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
 
     if ( !appSpecificPreview ) {
         if ( separateDirsAction->isEnabled() )
-            kc->writeEntry( TQString::fromLatin1("Separate Directories"),
+            kc->writeEntry( TQString::tqfromLatin1("Separate Directories"),
                             separateDirsAction->isChecked() );
 
         KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview"));
         if ( previewAction->isEnabled() ) {
             bool hasPreview = previewAction->isChecked();
-            kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview );
+            kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview );
         }
     }
 
-    kc->writeEntry( TQString::fromLatin1("Show hidden files"),
+    kc->writeEntry( TQString::tqfromLatin1("Show hidden files"),
                     showHiddenAction->isChecked() );
 
     KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind );
     TQString style;
     if ( KFile::isDetailView( fv ) )
-        style = TQString::fromLatin1("Detail");
+        style = TQString::tqfromLatin1("Detail");
     else if ( KFile::isSimpleView( fv ) )
-        style = TQString::fromLatin1("Simple");
-    kc->writeEntry( TQString::fromLatin1("View Style"), style );
+        style = TQString::tqfromLatin1("Simple");
+    kc->writeEntry( TQString::tqfromLatin1("View Style"), style );
 
     kc->setGroup( oldGroup );
 }
diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp
index 2dcb89629..10238ad93 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/kio/kfile/kdirselectdialog.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <tqstringlist.h>
 #include <tqvaluestack.h>
@@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
 {
     // scroll to make item the topmost item
     view()->ensureItemVisible( item );
-    TQRect r = view()->itemRect( item );
+    TQRect r = view()->tqitemRect( item );
     if ( r.isValid() )
     {
         int x, y;
@@ -391,7 +391,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
     {
         item->setSelected( false );
         // 2002/12/27, deselected item is not repainted, so force it
-        item->repaint();
+        item->tqrepaint();
     }
 }
 
@@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir()
     {
         folderurl.addPath( *it );
         exists = KIO::NetAccess::exists( folderurl, false, 0 );
-        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
+        writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() );
     }
 
     if ( exists ) // url was already existant
diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp
index 8399d387a..2a2f6f0f2 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/kio/kfile/kdiskfreesp.cpp
@@ -24,7 +24,7 @@
 
 #include "kdiskfreesp.h"
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <kprocess.h>
@@ -100,7 +100,7 @@ void KDiskFreeSp::dfDone()
 
   TQTextStream t (dfStringErrOut, IO_ReadOnly);
   TQString s=t.readLine();
-  if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) )
+  if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) )
     kdError() << "Error running df command... got [" << s << "]" << endl;
   while ( !t.eof() ) {
     TQString u,v;
diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp
index d71df8680..bded7fb79 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/kio/kfile/kencodingfiledialog.cpp
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <kdiroperator.h>
 #include <krecentdocument.h>
 
@@ -54,7 +54,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
   d->encoding->clear ();
   TQString sEncoding = encoding;
   if (sEncoding.isEmpty())
-     sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+     sEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
   
   TQStringList encodings (KGlobal::charsets()->availableEncodingNames());
   int insert = 0;
@@ -170,7 +170,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(cons
                                      TQWidget *parent,
                                      const TQString& caption)
 {
-    bool specialDir = dir.at(0) == ':';
+    bool specialDir = dir.tqat(0) == ':';
     KEncodingFileDialog dlg(specialDir?dir:TQString::null, encoding,filter,caption.isNull() ? i18n("Save As") : caption,
 	Saving,parent, "filedialog", true);
 
@@ -193,7 +193,7 @@ KEncodingFileDialog::Result  KEncodingFileDialog::getSaveURLAndEncoding(const TQ
 			     const TQString& dir, const  TQString& filter,
                              TQWidget *parent, const TQString& caption)
 {
-    bool specialDir = dir.at(0) == ':';
+    bool specialDir = dir.tqat(0) == ':';
     KEncodingFileDialog dlg(specialDir?dir:TQString::null, encoding,filter,caption.isNull() ? i18n("Save As") : 
 	caption, Saving,parent, "filedialog", true);
 
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 823714396..a68aec53b 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i )
     item->init();
     setSortingKey( item, i );
 
-    //item->repaint(); // only repaints if visible
+    //item->tqrepaint(); // only repaints if visible
 }
 
 void KFileDetailView::setSortingKey( KFileListViewItem *item,
diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h
index 937c8f56c..7e0baff83 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/kio/kfile/kfiledetailview.h
@@ -78,7 +78,7 @@ public:
 
     TQRect rect() const
     {
-        TQRect r = listView()->itemRect(this);
+        TQRect r = listView()->tqitemRect(this);
         return TQRect( listView()->viewportToContents( r.topLeft() ),
                       TQSize( r.width(), r.height() ) );
     }
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 8f763c930..fbc6dd7ab 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -32,11 +32,11 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqptrlist.h>
 #include <tqpixmap.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
@@ -258,7 +258,7 @@ void KFileDialog::setMimeFilter( const TQStringList& mimeTypes,
     filterWidget->setMimeFilter( mimeTypes, defaultType );
 
     TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
-    types.append( TQString::fromLatin1( "inode/directory" ));
+    types.append( TQString::tqfromLatin1( "inode/directory" ));
     ops->clearFilter();
     ops->setMimeFilter( types );
     d->hasDefaultFilter = !defaultType.isEmpty();
@@ -357,7 +357,7 @@ void KFileDialog::slotOk()
 
                 bool multi = (mode() & KFile::Files) != 0;
                 KFileItemListIterator it( *items );
-                TQString endQuote = TQString::fromLatin1("\" ");
+                TQString endQuote = TQString::tqfromLatin1("\" ");
                 TQString name, files;
                 while ( it.current() ) {
                     name = (*it)->name();
@@ -402,7 +402,7 @@ void KFileDialog::slotOk()
             }
         }
 
-        KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+        KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget());
         if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
              !url.isLocalFile() ) {
 // ### after message freeze, add message for directories!
@@ -446,7 +446,7 @@ void KFileDialog::slotOk()
        return;
     }
 
-    KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
+    KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget());
     if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
          !url.isLocalFile() ) {
         KMessageBox::sorry( d->mainWidget,
@@ -555,7 +555,7 @@ void KFileDialog::slotOk()
               it != list.end(); ++it )
         {
             job = KIO::stat( *it, !(*it).isLocalFile() );
-            job->setWindow (topLevelWidget());
+            job->setWindow (tqtopLevelWidget());
             KIO::Scheduler::scheduleJob( job );
             d->statJobs.append( job );
             connect( job, TQT_SIGNAL( result(KIO::Job *) ),
@@ -565,7 +565,7 @@ void KFileDialog::slotOk()
     }
 
     job = KIO::stat(d->url,!d->url.isLocalFile());
-    job->setWindow (topLevelWidget());
+    job->setWindow (tqtopLevelWidget());
     d->statJobs.append( job );
     connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*)));
 }
@@ -1548,7 +1548,7 @@ TQString KFileDialog::selectedFile() const
 {
     if ( result() == TQDialog::Accepted )
     {
-      KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
+      KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget());
        if (url.isLocalFile())
            return url.path();
        else {
@@ -1570,7 +1570,7 @@ TQStringList KFileDialog::selectedFiles() const
             KURL::List urls = parseSelectedURLs();
             TQValueListConstIterator<KURL> it = urls.begin();
             while ( it != urls.end() ) {
-              url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
+              url = KIO::NetAccess::mostLocalURL(*it,tqtopLevelWidget());
                 if ( url.isLocalFile() )
                     list.append( url.path() );
                 ++it;
@@ -1595,7 +1595,7 @@ TQString KFileDialog::getSaveFileName(const TQString& dir, const TQString& filte
                                      TQWidget *parent,
                                      const TQString& caption)
 {
-    bool specialDir = dir.at(0) == ':';
+    bool specialDir = dir.tqat(0) == ':';
     KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
     if ( !specialDir )
         dlg.setSelection( dir ); // may also be a filename
@@ -1616,7 +1616,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
                                      WId parent_id,
                                      const TQString& caption)
 {
-    bool specialDir = dir.at(0) == ':';
+    bool specialDir = dir.tqat(0) == ':';
     TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
     KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
 #ifdef Q_WS_X11
@@ -1644,7 +1644,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
 KURL KFileDialog::getSaveURL(const TQString& dir, const TQString& filter,
                              TQWidget *parent, const TQString& caption)
 {
-    bool specialDir = dir.at(0) == ':';
+    bool specialDir = dir.tqat(0) == ':';
     KFileDialog dlg(specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
     if ( !specialDir )
     dlg.setSelection( dir ); // may also be a filename
@@ -1737,7 +1737,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
     d->autoSelectExtChecked = kc->readBoolEntry (AutoSelectExtChecked, DefaultAutoSelectExtChecked);
     updateAutoSelectExtension ();
 
-    int w1 = minimumSize().width();
+    int w1 = tqminimumSize().width();
     int w2 = toolbar->sizeHint().width() + 10;
     if (w1 < w2)
         setMinimumWidth(w2);
@@ -1950,7 +1950,7 @@ void KFileDialog::updateAutoSelectExtension (void)
 
                 // first try X-KDE-NativeExtension
                 TQString nativeExtension = mime->property ("X-KDE-NativeExtension").toString ();
-                if (nativeExtension.at (0) == '.')
+                if (nativeExtension.tqat (0) == '.')
                 {
                     d->extension = nativeExtension.lower ();
                     kdDebug (kfile_area) << "\tsetMimeFilter-style: native ext=\'"
@@ -2068,7 +2068,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
     {
         // exists?
         KIO::UDSEntry t;
-        if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+        if (KIO::NetAccess::stat (url, t, tqtopLevelWidget()))
         {
             kdDebug (kfile_area) << "\tfile exists" << endl;
 
@@ -2146,7 +2146,7 @@ void KFileDialog::appendExtension (KURL &url)
 
     // exists?
     KIO::UDSEntry t;
-    if (KIO::NetAccess::stat (url, t, topLevelWidget()))
+    if (KIO::NetAccess::stat (url, t, tqtopLevelWidget()))
     {
         kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
         return;
@@ -2265,7 +2265,7 @@ void KFileDialog::toggleBookmarks(bool show)
         connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
                     TQT_SLOT( enterURL( const TQString& )));
 
-        toolbar->insertButton(TQString::fromLatin1("bookmark"),
+        toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
                               (int)HOTLIST_BUTTON, true,
                               i18n("Bookmarks"), 5);
         toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(),
@@ -2361,7 +2361,7 @@ void KFileDialog::setNonExtSelection()
     TQString pattern, filename = locationEdit->currentText().stripWhiteSpace();
     KServiceTypeFactory::self()->findFromPattern( filename, &pattern );
 
-    if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 )
+    if ( !pattern.isEmpty() && pattern.tqat( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 )
        locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 );
     else
     {
diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp
index 12a51db8e..625321f1a 100644
--- a/kio/kfile/kfilefiltercombo.cpp
+++ b/kio/kfile/kfilefiltercombo.cpp
@@ -95,7 +95,7 @@ TQString KFileFilterCombo::currentFilter() const
 {
     TQString f = currentText();
     if (f == text(currentItem())) { // user didn't edit the text
-	f = *filters.at(currentItem());
+	f = *filters.tqat(currentItem());
         if ( d->isMimeFilter || (currentItem() == 0 && d->hasAllSupportedFiles) ) {
             return f; // we have a mimetype as filter
         }
@@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types,
 {
     clear();
     filters.clear();
-    TQString delim = TQString::fromLatin1(", ");
+    TQString delim = TQString::tqfromLatin1(", ");
     d->hasAllSupportedFiles = false;
 
     m_allTypes = defaultType.isEmpty() && (types.count() > 1);
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index fec9158de..90c8e82f2 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -70,8 +70,8 @@ public:
 				      parent->actionCollection(),
 				      "large rows" );
 
-	smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
-	largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
+	smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode"));
+	largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode"));
 
         previews = new KToggleAction( i18n("Thumbnail Previews"), 0,
                                       parent->actionCollection(),
@@ -191,7 +191,7 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group )
 {
     TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
     KConfigGroupSaver cs( kc, gr );
-    TQString small = TQString::fromLatin1("SmallColumns");
+    TQString small = TQString::tqfromLatin1("SmallColumns");
     d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE );
     d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) );
 
@@ -214,8 +214,8 @@ void KFileIconView::writeConfig( KConfig *kc, const TQString& group )
     KConfigGroupSaver cs( kc, gr );
 
     TQString viewMode =  d->smallColumns->isChecked() ?
-        TQString::fromLatin1("SmallColumns") :
-        TQString::fromLatin1("LargeRows");
+        TQString::tqfromLatin1("SmallColumns") :
+        TQString::tqfromLatin1("LargeRows");
     if(!kc->hasDefault( "ViewMode" ) && viewMode == DEFAULT_VIEW_MODE )
         kc->revertToDefault( "ViewMode" );
     else
@@ -251,7 +251,7 @@ void KFileIconView::showToolTip( TQIconViewItem *item )
     int w = maxItemWidth() - ( itemTextPos() == TQIconView::Bottom ? 0 :
 			       item->pixmapRect().width() ) - 4;
     if ( fontMetrics().width( item->text() ) >= w ) {
-	toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0,
+	toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").arg(item->text()), 0,
 			      "myToolTip",
 			      (WFlags)(WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM) );
 	toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@@ -268,7 +268,7 @@ void KFileIconView::showToolTip( TQIconViewItem *item )
 		toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y());
 	}
 	toolTip->setFont( TQToolTip::font() );
-	toolTip->setPalette( TQToolTip::palette(), true );
+	toolTip->tqsetPalette( TQToolTip::palette(), true );
 	toolTip->show();
     }
 }
@@ -338,12 +338,12 @@ void KFileIconView::insertItem( KFileItem *i )
     KFileView::insertItem( i );
 
     TQIconView* qview = static_cast<TQIconView*>( this );
-    // Since creating and initializing an item leads to a repaint,
+    // Since creating and initializing an item leads to a tqrepaint,
     // we disable updates on the IconView for a while.
-    qview->setUpdatesEnabled( false );
+    qview->tqsetUpdatesEnabled( false );
     KFileIconViewItem *item = new KFileIconViewItem( qview, i );
     initItem( item, i, true );
-    qview->setUpdatesEnabled( true );
+    qview->tqsetUpdatesEnabled( true );
 
     if ( !i->isMimeTypeKnown() )
         m_resolver->m_lstPendingMimeIconItems.append( item );
@@ -450,7 +450,7 @@ void KFileIconView::updateView( bool b )
                 if ( !item->pixmapSize().isNull() )
                     item->setPixmapSize( TQSize( 0, 0 ) );
             }
-            // recalculate item parameters but avoid an in-place repaint
+            // recalculate item parameters but avoid an in-place tqrepaint
             item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false );
             item = static_cast<KFileIconViewItem *>(item->nextItem());
         } while ( item != 0L );
@@ -632,7 +632,7 @@ bool KFileIconView::canPreview( const KFileItem *item ) const
     for ( ; it != d->previewMimeTypes.end(); ++it ) {
         TQString type = *it;
         // the "mimetype" can be "image/*"
-        if ( type.at( type.length() - 1 ) == '*' ) {
+        if ( type.tqat( type.length() - 1 ) == '*' ) {
             r.setPattern( type );
             if ( r.search( item->mimetype() ) != -1 )
                 return true;
@@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i,
 
     if ( updateTextAndPixmap )
     {
-        // this causes a repaint of the item, which we want to avoid during
+        // this causes a tqrepaint of the item, which we want to avoid during
         // directory listing, when all items are created. We want to paint all
         // items at once, not every single item in that case.
         item->setText( i->text() , false, false );
diff --git a/kio/kfile/kfilemetainfowidget.cpp b/kio/kfile/kfilemetainfowidget.cpp
index b6e7cf61f..c4df4a15d 100644
--- a/kio/kfile/kfilemetainfowidget.cpp
+++ b/kio/kfile/kfilemetainfowidget.cpp
@@ -34,7 +34,7 @@
 #include <tqdatetimeedit.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvalidator.h>
 
 /*
diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp
index 87da3aaee..c8b89b5d6 100644
--- a/kio/kfile/kfilemetapreview.cpp
+++ b/kio/kfile/kfilemetapreview.cpp
@@ -8,7 +8,7 @@
 
 #include "kfilemetapreview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kio/previewjob.h>
 #include <klibloader.h>
diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp
index b221a1ebb..877260a5f 100644
--- a/kio/kfile/kfilepreview.cpp
+++ b/kio/kfile/kfilepreview.cpp
@@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b)
 {
     left->updateView(b);
     if(preview)
-        preview->repaint(b);
+        preview->tqrepaint(b);
 }
 
 void KFilePreview::updateView(const KFileItem *i)
diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp
index 0506918c0..0a2798ae6 100644
--- a/kio/kfile/kfilesharedlg.cpp
+++ b/kio/kfile/kfilesharedlg.cpp
@@ -23,7 +23,7 @@
 #include <tqdir.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <kprocess.h>
 #include <kprocio.h>
diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp
index 82be902de..154009625 100644
--- a/kio/kfile/kfilespeedbar.cpp
+++ b/kio/kfile/kfilespeedbar.cpp
@@ -21,8 +21,8 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 
 #include <kconfig.h>
 #include <kglobal.h>
diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp
index e8451077d..06bce2881 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/kio/kfile/kfiletreeview.cpp
@@ -342,7 +342,7 @@ void KFileTreeView::slotAutoOpenFolder()
       return;
 
    m_dropItem->setOpen( true );
-   m_dropItem->repaint();
+   m_dropItem->tqrepaint();
 }
 
 
@@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation()
       }
          
       uint & iconNumber = it.data().iconNumber;
-      TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+      TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
       // kdDebug(250) << "Loading icon " << icon << endl;
       item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) );
 
@@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
     if ( item ) {
 	TQString text = static_cast<KFileViewItem*>( item )->toolTipText();
 	if ( !text.isEmpty() )
-	    tip ( m_view->itemRect( item ), text );
+	    tip ( m_view->tqitemRect( item ), text );
     }
 #endif
 }
diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp
index 165801652..eb12a9498 100644
--- a/kio/kfile/kfileview.cpp
+++ b/kio/kfile/kfileview.cpp
@@ -258,7 +258,7 @@ sort_by_name:
 
 void  KFileView::updateView(bool f)
 {
-    widget()->repaint(f);
+    widget()->tqrepaint(f);
 }
 
 void KFileView::updateView(const KFileItem *)
diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h
index bce408327..1a13e264e 100644
--- a/kio/kfile/kfileview.h
+++ b/kio/kfile/kfileview.h
@@ -146,11 +146,11 @@ public:
     virtual void clear();
 
     /**
-      * does a repaint of the view.
+      * does a tqrepaint of the view.
       *
       * The default implementation calls
       * \code
-      * widget()->repaint(f)
+      * widget()->tqrepaint(f)
       * \endcode
       **/
     virtual void updateView(bool f = true);
diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp
index f96cff795..150536a33 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/kio/kfile/kicondialog.cpp
@@ -29,7 +29,7 @@
 #include <kfiledialog.h>
 #include <kimagefilepreview.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqsortedlist.h>
@@ -122,7 +122,7 @@ void KIconCanvas::slotLoadFiles()
     TQApplication::setOverrideCursor(tqwaitCursor);
 
     // disable updates to not trigger paint events when adding child items
-    setUpdatesEnabled( false );
+    tqsetUpdatesEnabled( false );
 
 #ifdef HAVE_LIBART
     KSVGIconEngine *svgEngine = new KSVGIconEngine();
@@ -137,7 +137,7 @@ void KIconCanvas::slotLoadFiles()
     {
 	// Calling kapp->processEvents() makes the iconview flicker like hell
 	// (it's being repainted once for every new item), so we don't do this.
-	// Instead, we directly repaint the progress bar without going through
+	// Instead, we directly tqrepaint the progress bar without going through
 	// the event-loop. We do that just once for every 10th item so that
 	// the progress bar doesn't flicker in turn. (pfeiffer)
 	if ( emitProgress >= 10 ) {
@@ -191,7 +191,7 @@ void KIconCanvas::slotLoadFiles()
 #endif
 
     // enable updates since we have to draw the whole view now
-    setUpdatesEnabled( true );
+    tqsetUpdatesEnabled( true );
 
     TQApplication::restoreOverrideCursor();
     d->m_bLoading = false;
@@ -259,7 +259,7 @@ void KIconDialog::init()
     mGroupOrSize = KIcon::Desktop;
     mContext = KIcon::Any;
     mType = 0;
-    mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png"));
+    mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png"));
 
     TQWidget *main = new TQWidget( this );
     setMainWidget(main);
@@ -268,11 +268,11 @@ void KIconDialog::init()
     top->setSpacing( spacingHint() );
 
     TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main);
-    bgroup->layout()->setSpacing(KDialog::spacingHint());
-    bgroup->layout()->setMargin(KDialog::marginHint());
+    bgroup->tqlayout()->setSpacing(KDialog::spacingHint());
+    bgroup->tqlayout()->setMargin(KDialog::marginHint());
     top->addWidget(bgroup);
     connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int)));
-    TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2);
+    TQGridLayout *grid = new TQGridLayout(bgroup->tqlayout(), 3, 2);
     mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup);
     grid->addWidget(mpRb1, 1, 0);
     mpCombo = new TQComboBox(bgroup);
@@ -631,8 +631,8 @@ void KIconDialog::slotProgress(int p)
 {
     mpProgress->setProgress(p);
     // commented out the following since setProgress already paints ther
-    // progress bar. ->repaint() only makes it flicker
-    //mpProgress->repaint();
+    // progress bar. ->tqrepaint() only makes it flicker
+    //mpProgress->tqrepaint();
 }
 
 void KIconDialog::slotFinished()
diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp
index 4cc1950b3..2d9f7881a 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/kio/kfile/kimagefilepreview.cpp
@@ -7,7 +7,7 @@
  * License. See the file "COPYING" for the exact licensing terms.
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp
index c6486c76a..d82c4523b 100644
--- a/kio/kfile/kmetaprops.cpp
+++ b/kio/kfile/kmetaprops.cpp
@@ -29,11 +29,11 @@
 #include <kprotocolinfo.h>
 
 #include <tqvalidator.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqdatetime.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqvgroupbox.h>
 
 #undef Bool
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index 2caee6287..e9a4c2b6f 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -42,7 +42,7 @@
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
@@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog()
 void KNotifyDialog::addApplicationEvents( const char *appName )
 {
     addApplicationEvents( TQString::fromUtf8( appName ) +
-                          TQString::fromLatin1( "/eventsrc" ) );
+                          TQString::tqfromLatin1( "/eventsrc" ) );
 }
 
 void KNotifyDialog::addApplicationEvents( const TQString& path )
@@ -374,7 +374,7 @@ Application * KNotifyWidget::addApplicationEvents( const TQString& path )
     kdDebug() << "**** knotify: adding path: " << path << endl;
     TQString relativePath = path;
 
-    if ( path.at(0) == '/' && KStandardDirs::exists( path ) )
+    if ( path.tqat(0) == '/' && KStandardDirs::exists( path ) )
         relativePath = makeRelative( path );
 
     if ( !relativePath.isEmpty() )
@@ -1005,10 +1005,10 @@ Application::Application( const TQString &path )
     m_events = 0L;
     config = new KConfig(config_file, false, false);
     kc = new KConfig(path, true, false, "data");
-    kc->setGroup( TQString::fromLatin1("!Global!") );
-    m_icon = kc->readEntry(TQString::fromLatin1("IconName"),
-                           TQString::fromLatin1("misc"));
-    m_description = kc->readEntry( TQString::fromLatin1("Comment"),
+    kc->setGroup( TQString::tqfromLatin1("!Global!") );
+    m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"),
+                           TQString::tqfromLatin1("misc"));
+    m_description = kc->readEntry( TQString::tqfromLatin1("Comment"),
                                    i18n("No description available") );
 
     int index = path.find( '/' );
@@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults )
 
     Event *e = 0L;
 
-    TQString global = TQString::fromLatin1("!Global!");
-    TQString default_group = TQString::fromLatin1("<default>");
-    TQString name = TQString::fromLatin1("Name");
-    TQString comment = TQString::fromLatin1("Comment");
+    TQString global = TQString::tqfromLatin1("!Global!");
+    TQString default_group = TQString::tqfromLatin1("<default>");
+    TQString name = TQString::tqfromLatin1("Name");
+    TQString comment = TQString::tqfromLatin1("Comment");
 
     TQStringList conflist = kc->groupList();
     TQStringList::ConstIterator it = conflist.begin();
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 52d3e6435..0b32bc684 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -26,7 +26,7 @@
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqcheckbox.h>
@@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
 
 void KApplicationTree::resizeEvent( TQResizeEvent * e)
 {
-    setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent)
-                         -2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
+    setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent)
+                         -2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
     KListView::resizeEvent(e);
 }
 
@@ -340,7 +340,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const TQString&_text,
 {
   TQString caption = KStringHandler::csqueeze( _urls.first().prettyURL() );
   if (_urls.count() > 1)
-      caption += TQString::fromLatin1("...");
+      caption += TQString::tqfromLatin1("...");
   setCaption(caption);
   setServiceType( _urls );
   init( _text, _value );
@@ -376,7 +376,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls )
   if ( _urls.count() == 1 )
   {
     qServiceType = KMimeType::findByURL( _urls.first())->name();
-    if (qServiceType == TQString::fromLatin1("application/octet-stream"))
+    if (qServiceType == TQString::tqfromLatin1("application/octet-stream"))
       qServiceType = TQString::null;
   }
   else
@@ -413,13 +413,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
     KHistoryCombo *combo = new KHistoryCombo();
     combo->setDuplicatesEnabled( false );
     KConfig *kc = KGlobal::config();
-    KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
-    int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
+    KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") );
+    int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 );
     combo->setMaxCount( max );
-    int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"),
+    int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"),
 				KGlobalSettings::completionMode());
     combo->setCompletionMode((KGlobalSettings::Completion)mode);
-    TQStringList list = kc->readListEntry( TQString::fromLatin1("History") );
+    TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") );
     combo->setHistoryItems( list, true );
     edit = new KURLRequester( combo, this );
   }
@@ -483,8 +483,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   // check to see if we use konsole if not disable the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
-  TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
+  KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+  TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
 
   if (bReadOnly || preferredTerminal != "konsole")
      nocloseonexit->hide();
@@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK()
 
   if (terminal->isChecked())
   {
-    KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
-    preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
+    KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+    preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
     m_command = preferredTerminal;
     // only add --noclose when we are sure it is konsole we're using
     if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
-      m_command += TQString::fromLatin1(" --noclose");
-    m_command += TQString::fromLatin1(" -e ");
+      m_command += TQString::tqfromLatin1(" --noclose");
+    m_command += TQString::tqfromLatin1(" -e ");
     m_command += edit->url();
     kdDebug(250) << "Setting m_command to " << m_command << endl;
   }
@@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK()
   {
      desktop = new KDesktopFile(newPath);
   }
-  desktop->writeEntry("Type", TQString::fromLatin1("Application"));
+  desktop->writeEntry("Type", TQString::tqfromLatin1("Application"));
   desktop->writeEntry("Name", initialServiceName);
   desktop->writePathEntry("Exec", fullExec);
   if (terminal->isChecked())
@@ -814,9 +814,9 @@ void KOpenWithDlg::accept()
         combo->addToHistory( edit->url() );
 
         KConfig *kc = KGlobal::config();
-        KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
-        kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() );
-	kc->writeEntry(TQString::fromLatin1("CompletionMode"),
+        KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") );
+        kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() );
+	kc->writeEntry(TQString::tqfromLatin1("CompletionMode"),
 		       combo->completionMode());
         // don't store the completion-list, as it contains all of KURLCompletion's
         // executables
diff --git a/kio/kfile/kpreviewprops.cpp b/kio/kfile/kpreviewprops.cpp
index 9ad4c5262..9fd91cc7b 100644
--- a/kio/kfile/kpreviewprops.cpp
+++ b/kio/kfile/kpreviewprops.cpp
@@ -19,7 +19,7 @@
 
 #include "kpreviewprops.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kfilemetapreview.h>
 #include <kglobalsettings.h>
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 952cad631..6496b2cdb 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -61,9 +61,9 @@ extern "C" {
 #include <tqcheckbox.h>
 #include <tqstrlist.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqwhatsthis.h>
@@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages()
   if ( mimetype.isEmpty() )
     return;
 
-  TQString query = TQString::fromLatin1(
+  TQString query = TQString::tqfromLatin1(
       "('KPropsDlg/Plugin' in ServiceTypes) and "
       "((not exist [X-KDE-Protocol]) or "
       " ([X-KDE-Protocol] == '%1'  )   )"          ).arg(item->url().protocol());
@@ -576,7 +576,7 @@ void KPropertiesDialog::rename( const TQString& _name )
   else
   {
     TQString tmpurl = m_singleUrl.url();
-    if ( tmpurl.at(tmpurl.length() - 1) == '/')
+    if ( tmpurl.tqat(tmpurl.length() - 1) == '/')
       // It's a directory, so strip the trailing slash first
       tmpurl.truncate( tmpurl.length() - 1);
     newUrl = tmpurl;
@@ -718,7 +718,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   kdDebug() << "url=" << url << " bDesktopFile=" << bDesktopFile << " isLocal=" << isLocal << " isReallyLocal=" << isReallyLocal << endl;
   mode_t mode = item->mode();
   bool hasDirs = item->isDir() && !item->isLink();
-  bool hasRoot = url.path() == TQString::fromLatin1("/");
+  bool hasRoot = url.path() == TQString::tqfromLatin1("/");
   TQString iconStr = KMimeType::iconForURL(url, mode);
   TQString directory = properties->kurl().directory();
   TQString protocol = properties->kurl().protocol();
@@ -831,7 +831,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
               magicMimeComment = TQString::null;
       }
 
-      if ( url.path() == TQString::fromLatin1("/") )
+      if ( url.path() == TQString::tqfromLatin1("/") )
         hasRoot = true;
       if ( (*it)->isDir() && !(*it)->isLink() )
       {
@@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ )
   {
     KIconButton *iconButton = new KIconButton( d->m_frame );
-    int bsize = 66 + 2 * iconButton->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
+    int bsize = 66 + 2 * iconButton->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin);
     iconButton->setFixedSize(bsize, bsize);
     iconButton->setIconSize(48);
     iconButton->setStrictIconSize(false);
@@ -883,7 +883,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
              this, TQT_SLOT( slotIconChanged() ) );
   } else {
     TQLabel *iconLabel = new TQLabel( d->m_frame );
-    int bsize = 66 + 2 * iconLabel->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
+    int bsize = 66 + 2 * iconLabel->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin);
     iconLabel->setFixedSize(bsize, bsize);
     iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) );
     iconArea = iconLabel;
@@ -908,7 +908,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     // Enhanced rename: Don't highlight the file extension.
     TQString pattern;
     KServiceTypeFactory::self()->findFromPattern( filename, &pattern );
-    if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1)
+    if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1)
       d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1);
     else
     {
@@ -942,7 +942,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     //TODO: wrap for win32 or mac?
     TQPushButton *button = new TQPushButton(box);
 
-    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure"));
+    TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("configure"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     button->setIconSet( iconSet );
     button->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -1136,9 +1136,9 @@ void KFilePropsPlugin::slotEditFileType()
   else
     mime = d->mimeType;
     //TODO: wrap for win32 or mac?
-  TQString keditfiletype = TQString::fromLatin1("keditfiletype");
+  TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
-                    + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId())
+                    + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId())
                     + " " + KProcess::quote(mime),
                     keditfiletype, keditfiletype /*unused*/);
 #endif
@@ -1234,7 +1234,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job )
     KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
 	KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
 	KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
-    m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4")
+    m_sizeLabel->setText( TQString::tqfromLatin1("%1 (%2)\n%3, %4")
 			  .arg(KIO::convertSize(totalSize))
 			  .arg(KGlobal::locale()->formatNumber(totalSize, 0))
         .arg(i18n("1 file","%n files",totalFiles))
@@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges()
 
     if (S_ISDIR(properties->item()->mode()))
     {
-      path = url.path(1) + TQString::fromLatin1(".directory");
+      path = url.path(1) + TQString::tqfromLatin1(".directory");
       // don't call updateUrl because the other tabs (i.e. permissions)
       // apply to the directory, not the .directory file.
     }
@@ -1654,11 +1654,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 
   /* Group: Access Permissions */
   gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame );
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
   box->addWidget (gb);
 
-  gl = new TQGridLayout (gb->layout(), 7, 2);
+  gl = new TQGridLayout (gb->tqlayout(), 7, 2);
   gl->setColStretch(1, 1);
 
   l = d->explanationLabel = new TQLabel( "", gb );
@@ -1723,11 +1723,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 
   /**** Group: Ownership ****/
   gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame );
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
   box->addWidget (gb);
 
-  gl = new TQGridLayout (gb->layout(), 4, 3);
+  gl = new TQGridLayout (gb->tqlayout(), 4, 3);
   gl->addRowSpacing(0, 10);
 
   /*** Set Owner ***/
@@ -1753,7 +1753,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
     kcom->setOrder(KCompletion::Sorted);
     setpwent();
     for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++)
-      kcom->addItem(TQString::fromLatin1(user->pw_name));
+      kcom->addItem(TQString::tqfromLatin1(user->pw_name));
     endpwent();
     usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto :
                                KGlobalSettings::CompletionNone);
@@ -1781,7 +1781,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
   {
     if (IamRoot)
-      groupList += TQString::fromLatin1(ge->gr_name);
+      groupList += TQString::tqfromLatin1(ge->gr_name);
     else
     {
       /* pick the groups to which the user belongs */
@@ -1802,7 +1802,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   /* add the effective Group to the list .. */
   ge = getgrgid (getegid());
   if (ge) {
-    TQString name = TQString::fromLatin1(ge->gr_name);
+    TQString name = TQString::tqfromLatin1(ge->gr_name);
     if (name.isEmpty())
       name.setNum(ge->gr_gid);
     if (groupList.find(name) == groupList.end())
@@ -1915,10 +1915,10 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
 
   // Group: Access Permissions
   gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox );
-  gb->layout()->setSpacing(KDialog::spacingHint());
-  gb->layout()->setMargin(KDialog::marginHint());
+  gb->tqlayout()->setSpacing(KDialog::spacingHint());
+  gb->tqlayout()->setMargin(KDialog::marginHint());
 
-  gl = new TQGridLayout (gb->layout(), 6, 6);
+  gl = new TQGridLayout (gb->tqlayout(), 6, 6);
   gl->addRowSpacing(0, 10);
 
   TQValueVector<TQWidget*> theNotSpecials;
@@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::fromLatin1("Link"));
+  config.writeEntry( "Type", TQString::tqfromLatin1("Link"));
   config.writePathEntry( "URL", URLEdit->url() );
   // Users can't create a Link .desktop file with a Name field,
   // but distributions can. Update the Name field in that case.
@@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::fromLatin1("MimeType") );
+  config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") );
 
   config.writeEntry( "Patterns",  patternEdit->text() );
   config.writeEntry( "Comment", commentEdit->text() );
@@ -2852,8 +2852,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
      if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty()
           && device != "none")
      {
-        devices.append( device + TQString::fromLatin1(" (")
-                        + mountPoint + TQString::fromLatin1(")") );
+        devices.append( device + TQString::tqfromLatin1(" (")
+                        + mountPoint + TQString::tqfromLatin1(")") );
         m_devicelist.append(device);
         d->mountpointlist.append(mountPoint);
      }
@@ -2916,7 +2916,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
   layout->addMultiCellWidget(sep, 6, 6, 0, 1);
 
   unmounted = new KIconButton( d->m_frame );
-  int bsize = 66 + 2 * unmounted->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
+  int bsize = 66 + 2 * unmounted->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin);
   unmounted->setFixedSize(bsize, bsize);
   unmounted->setIconType(KIcon::Desktop, KIcon::Device);
   layout->addWidget(unmounted, 7, 0);
@@ -3077,7 +3077,7 @@ void KDevicePropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::fromLatin1("FSDevice") );
+  config.writeEntry( "Type", TQString::tqfromLatin1("FSDevice") );
 
   config.writeEntry( "Dev", device->currentText() );
   config.writeEntry( "MountPoint", mountpoint->text() );
@@ -3362,7 +3362,7 @@ void KDesktopPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::fromLatin1("Application"));
+  config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
   config.writeEntry( "Comment", w->commentEdit->text() );
   config.writeEntry( "Comment", w->commentEdit->text(), true, false, true ); // for compat
   config.writeEntry( "GenericName", w->genNameEdit->text() );
@@ -3446,9 +3446,9 @@ void KDesktopPropsPlugin::slotAdvanced()
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+  KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
-						  TQString::fromLatin1("konsole"));
+						  TQString::tqfromLatin1("konsole"));
 
   bool terminalCloseBool = false;
 
@@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced()
   int i, maxEntries = 1000;
   setpwent();
   for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++)
-    kcom->addItem(TQString::fromLatin1(pw->pw_name));
+    kcom->addItem(TQString::tqfromLatin1(pw->pw_name));
   endpwent();
   if (i < maxEntries)
   {
@@ -3635,7 +3635,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   mainlayout->addWidget(tmpQGroupBox);
 
-  TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2);
+  TQGridLayout *grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2);
   grid->setSpacing( KDialog::spacingHint() );
   grid->setColStretch(1, 1);
 
@@ -3662,7 +3662,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   mainlayout->addWidget(tmpQGroupBox);
 
-  grid = new TQGridLayout(tmpQGroupBox->layout(), 3, 2);
+  grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 3, 2);
   grid->setSpacing( KDialog::spacingHint() );
   grid->setColStretch(1, 1);
 
@@ -3672,9 +3672,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   // check to see if we use konsole if not do not add the nocloseonexit
   // because we don't know how to do this on other terminal applications
-  KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+  KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
   TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
-						  TQString::fromLatin1("konsole"));
+						  TQString::tqfromLatin1("konsole"));
 
   int posOptions = 1;
   d->nocloseonexitCheck = 0L;
@@ -3701,7 +3701,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
 
   mainlayout->addWidget(tmpQGroupBox);
 
-  grid = new TQGridLayout(tmpQGroupBox->layout(), 2, 2);
+  grid = new TQGridLayout(tmpQGroupBox->tqlayout(), 2, 2);
   grid->setSpacing(KDialog::spacingHint());
   grid->setColStretch(1, 1);
 
@@ -3767,7 +3767,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   int i, maxEntries = 1000;
   setpwent();
   for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++)
-    kcom->addItem(TQString::fromLatin1(pw->pw_name));
+    kcom->addItem(TQString::tqfromLatin1(pw->pw_name));
   endpwent();
   if (i < maxEntries)
   {
@@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::fromLatin1("Application"));
+  config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
   config.writePathEntry( "Exec", execEdit->text() );
   config.writePathEntry( "SwallowExec", swallowExecEdit->text() );
   config.writeEntry( "SwallowTitle", swallowTitleEdit->text() );
@@ -3862,7 +3862,7 @@ void KExecPropsPlugin::applyChanges()
   TQString temp = terminalEdit->text();
   if (d->nocloseonexitCheck )
     if ( d->nocloseonexitCheck->isChecked() )
-      temp += TQString::fromLatin1("--noclose ");
+      temp += TQString::tqfromLatin1("--noclose ");
   temp = temp.stripWhiteSpace();
   config.writeEntry( "TerminalOptions", temp );
   config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() );
@@ -4097,7 +4097,7 @@ void KApplicationPropsPlugin::applyChanges()
 
   KSimpleConfig config( path );
   config.setDesktopGroup();
-  config.writeEntry( "Type", TQString::fromLatin1("Application"));
+  config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
   config.writeEntry( "Comment", commentEdit->text() );
   config.writeEntry( "Comment", commentEdit->text(), true, false, true ); // for compat
   config.writeEntry( "GenericName", genNameEdit->text() );
diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp
index 22b4cd477..85cdebb02 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/kio/kfile/krecentdirs.cpp
@@ -52,13 +52,13 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re
    if (key[1] == ':') 
    {
       key = key.mid(2);
-      config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly);
+      config = new KSimpleConfig(TQString::tqfromLatin1("krecentdirsrc"), readOnly);
    }
    else
    {
       key = key.mid(1);
       config = KGlobal::config();
-      config->setGroup(TQString::fromLatin1("Recent Dirs"));
+      config->setGroup(TQString::tqfromLatin1("Recent Dirs"));
    }
 
    result=config->readPathListEntry(key);
diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp
index f1f6af6ce..7b5c6908a 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/kio/kfile/krecentdocument.cpp
@@ -35,7 +35,7 @@
 #include <kdesktopfile.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
 
@@ -45,7 +45,7 @@
 TQString KRecentDocument::recentDocumentDirectory()
 {
     // need to change this path, not sure where
-    return locateLocal("data", TQString::fromLatin1("RecentDocuments/"));
+    return locateLocal("data", TQString::tqfromLatin1("RecentDocuments/"));
 }
 
 TQStringList KRecentDocument::recentDocuments()
@@ -88,9 +88,9 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
     KConfig *config = KGlobal::config();
     TQString oldGrp = config->group();
-    config->setGroup(TQString::fromLatin1("RecentDocuments"));
-    bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true);
-    int maxEntries = config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
+    config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
+    bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true);
+    int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10);
 
     config->setGroup(oldGrp);
     if(!useRecent)
@@ -100,7 +100,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
 
     TQString dStr = path + url.fileName();
 
-    TQString ddesktop = dStr + TQString::fromLatin1(".desktop");
+    TQString ddesktop = dStr + TQString::tqfromLatin1(".desktop");
 
     int i=1;
     // check for duplicates
@@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
         // see if it points to the same file and application
         KSimpleConfig tmp(ddesktop);
         tmp.setDesktopGroup();
-        if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith"))
+        if(tmp.readEntry(TQString::tqfromLatin1("X-KDE-LastOpenedWith"))
 	   == desktopEntryName)
 	{
             utime(TQFile::encodeName(ddesktop), NULL);
@@ -118,7 +118,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
         ++i;
         if ( i > maxEntries )
             break;
-        ddesktop = dStr + TQString::fromLatin1("[%1].desktop").arg(i);
+        ddesktop = dStr + TQString::tqfromLatin1("[%1].desktop").arg(i);
     }
 
     TQDir dir(path);
@@ -129,7 +129,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
         TQStringList::Iterator it;
         it = list.begin();
         while(i > maxEntries-1){
-            TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*it));
+            TQFile::remove(dir.absPath() + TQString::tqfromLatin1("/") + (*it));
             --i, ++it;
         }
     }
@@ -137,15 +137,15 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
     // create the applnk
     KSimpleConfig conf(ddesktop);
     conf.setDesktopGroup();
-    conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") );
-    conf.writePathEntry( TQString::fromLatin1("URL"), openStr );
+    conf.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") );
+    conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr );
     // If you change the line below, change the test in the above loop
-    conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
+    conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
     TQString name = url.fileName();
     if (name.isEmpty())
       name = openStr;
-    conf.writeEntry( TQString::fromLatin1("Name"), name );
-    conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) );
+    conf.writeEntry( TQString::tqfromLatin1("Name"), name );
+    conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) );
 }
 
 void KRecentDocument::add(const TQString &openStr, bool isUrl)
@@ -170,8 +170,8 @@ void KRecentDocument::clear()
 int KRecentDocument::maximumItems()
 {
     KConfig *config = KGlobal::config();
-    KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
-    return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
+    KConfigGroupSaver sa(config, TQString::tqfromLatin1("RecentDocuments"));
+    return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10);
 }
 
 
diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp
index ee79b4e58..234e8717a 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/kio/kfile/kurlbar.cpp
@@ -64,7 +64,7 @@ protected:
         if ( item ) {
             TQString text = static_cast<KURLBarItem*>( item )->toolTip();
             if ( !text.isEmpty() )
-                tip( m_view->itemRect( item ), text );
+                tip( m_view->tqitemRect( item ), text );
         }
     }
 
@@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p )
     if ( isCurrent() || isSelected() ) {
         int h = height( box );
 
-        TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight );
+        TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
         p->fillRect( 0, 0, w, h, brush );
         TQPen pen = p->pen();
         TQPen oldPen = pen;
-        pen.setColor( box->colorGroup().mid() );
+        pen.setColor( box->tqcolorGroup().mid() );
         p->setPen( pen );
 
         p->drawPoint( 0, 0 );
@@ -225,10 +225,10 @@ void KURLBarItem::paint( TQPainter *p )
             int xPos = pm->width() + margin + 2;
 
             if ( isCurrent() || isSelected() ) {
-                p->setPen( box->colorGroup().highlight().dark(115) );
+                p->setPen( box->tqcolorGroup().highlight().dark(115) );
                 p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1),
                              yPos + 1, visibleText );
-                p->setPen( box->colorGroup().highlightedText() );
+                p->setPen( box->tqcolorGroup().highlightedText() );
             }
 
             p->drawText( xPos, yPos, visibleText );
@@ -257,10 +257,10 @@ void KURLBarItem::paint( TQPainter *p )
             x = QMAX( x, margin );
 
             if ( isCurrent() || isSelected() ) {
-                p->setPen( box->colorGroup().highlight().dark(115) );
+                p->setPen( box->tqcolorGroup().highlight().dark(115) );
                 p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
                              y + 1, visibleText );
-                p->setPen( box->colorGroup().highlightedText() );
+                p->setPen( box->tqcolorGroup().highlightedText() );
             }
 
             p->drawText( x, y, visibleText );
@@ -844,7 +844,7 @@ KURLBarListBox::~KURLBarListBox()
 void KURLBarListBox::paintEvent( TQPaintEvent* )
 {
     TQPainter p(this);
-    p.setPen( colorGroup().mid() );
+    p.setPen( tqcolorGroup().mid() );
     p.drawRect( 0, 0, width(), height() );
 }
 
@@ -980,7 +980,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url,
         if ( KGlobal::instance()->aboutData() )
             appName = KGlobal::instance()->aboutData()->programName();
         if ( appName.isEmpty() )
-            appName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
+            appName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
         m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box );
         m_appLocal->setChecked( appLocal );
         TQWhatsThis::add( m_appLocal,
@@ -1010,7 +1010,7 @@ KURL KURLBarItemDialog::url() const
 {
     TQString text = m_urlEdit->url();
     KURL u;
-    if ( text.at(0) == '/' )
+    if ( text.tqat(0) == '/' )
         u.setPath( text );
     else
         u = text;
diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp
index 72c7cbd07..c9db56756 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/kio/kfile/kurlcombobox.cpp
@@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate
 {
 public:
     KURLComboBoxPrivate() {
-	dirpix = SmallIcon(TQString::fromLatin1("folder"));
+	dirpix = SmallIcon(TQString::tqfromLatin1("folder"));
     }
 
     TQPixmap dirpix;
@@ -72,7 +72,7 @@ void KURLComboBox::init( Mode mode )
     setTrapReturnKey( true );
     setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 
-    opendirPix = SmallIcon(TQString::fromLatin1("folder_open"));
+    opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open"));
 
     connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int )));
 }
@@ -87,7 +87,7 @@ TQStringList KURLComboBox::urls() const
     for ( int i = defaultList.count(); i < count(); i++ ) {
         url = text( i );
         if ( !url.isEmpty() ) {
-            //if ( url.at(0) == '/' )
+            //if ( url.tqat(0) == '/' )
             //    list.append( url.prepend( fileProt ) );
             //else
                 list.append( url );
@@ -129,7 +129,7 @@ void KURLComboBox::setDefaults()
 
     KURLComboItem *item;
     for ( unsigned int id = 0; id < defaultList.count(); id++ ) {
-        item = defaultList.at( id );
+        item = defaultList.tqat( id );
         insertURLItem( item );
     }
 }
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 5d1495127..1a53e7660 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -206,7 +206,7 @@ void KURLRequester::init()
 	d->edit = new KLineEdit( this, "line edit" );
 
     myButton = new KURLDragPushButton( this, "kfile button");
-    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
+    TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     myButton->setIconSet( iconSet );
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp
index ea91074e2..19409afdc 100644
--- a/kio/kfile/kurlrequesterdlg.cpp
+++ b/kio/kfile/kurlrequesterdlg.cpp
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <tqtoolbutton.h>
 
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp
index 47fcd02ca..c66ed3ff2 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/kio/kfile/tests/kdirselectdialogtest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
     KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
     if ( u.isValid() )
         KMessageBox::information( 0L,
-                                TQString::fromLatin1("You selected the url: %1")
+                                TQString::tqfromLatin1("You selected the url: %1")
                                 .arg( u.prettyURL() ), "Selected URL" );
 
     return 0;
diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp
index 867b9b4a8..43dbb4fd0 100644
--- a/kio/kfile/tests/kfdtest.cpp
+++ b/kio/kfile/tests/kfdtest.cpp
@@ -25,7 +25,7 @@ void KFDTest::doit()
 
     if ( dlg->exec() == KDialog::Accepted )
     {
-        KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
+        KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
     }
     
 //     tqApp->quit();
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp
index 5c520dd5d..bad100809 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/kio/kfile/tests/kfiletreeviewtest.cpp
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
     {
        for( int i = 1; i < argc; i++ )
        {
-	  argv1 = TQString::fromLatin1(argv[i]);
+	  argv1 = TQString::tqfromLatin1(argv[i]);
 	  kdDebug() << "Opening " << argv1 << endl;
 	  if( argv1 == "-d" )
 	     tf->setDirOnly();
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index 8661c9919..aad57b257 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>
 
@@ -51,11 +51,11 @@ int main(int argc, char **argv)
     TQString argv1;
     TQString startDir;
     if (argc > 1)
-	argv1 = TQString::fromLatin1(argv[1]);
+	argv1 = TQString::tqfromLatin1(argv[1]);
     if ( argc > 2 )
-        startDir = TQString::fromLatin1( argv[2]);
+        startDir = TQString::tqfromLatin1( argv[2]);
 
-    if (argv1 == TQString::fromLatin1("diroperator")) {
+    if (argv1 == TQString::tqfromLatin1("diroperator")) {
 	KDirOperator *op = new KDirOperator(startDir, 0, "operator");
 	op->setViewConfig( KGlobal::config(), "TestGroup" );
 	op->setView(KFile::Simple);
@@ -64,24 +64,24 @@ int main(int argc, char **argv)
 	a.exec();
     }
 
-    else if (argv1 == TQString::fromLatin1("justone")) {
+    else if (argv1 == TQString::tqfromLatin1("justone")) {
         TQString name = KFileDialog::getOpenFileName(startDir);
         qDebug("filename=%s",name.latin1());
     }
 
-    else if (argv1 == TQString::fromLatin1("existingURL")) {
+    else if (argv1 == TQString::tqfromLatin1("existingURL")) {
         KURL url = KFileDialog::getExistingURL();
         qDebug("URL=%s",url.url().latin1());
         name1 = url.url();
     }
 
-    else if (argv1 == TQString::fromLatin1("preview")) {
+    else if (argv1 == TQString::tqfromLatin1("preview")) {
         KURL u =  KFileDialog::getImageOpenURL();
         qDebug("filename=%s", u.url().latin1());
     }
 
-    else if (argv1 == TQString::fromLatin1("preselect")) {
-        names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd"));
+    else if (argv1 == TQString::tqfromLatin1("preselect")) {
+        names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd"));
         TQStringList::Iterator it = names.begin();
         while ( it != names.end() ) {
             qDebug("selected file: %s", (*it).latin1());
@@ -89,10 +89,10 @@ int main(int argc, char **argv)
         }
     }
 
-    else if (argv1 == TQString::fromLatin1("dirs"))
+    else if (argv1 == TQString::tqfromLatin1("dirs"))
 	name1 = KFileDialog::getExistingDirectory();
 
-    else if (argv1 == TQString::fromLatin1("heap")) {
+    else if (argv1 == TQString::tqfromLatin1("heap")) {
 	KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L,
 					    "file dialog", true );
 	dlg->setMode( KFile::File);
@@ -104,33 +104,33 @@ int main(int argc, char **argv)
     if ( urlBar )
     {
         urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"), 
-                                   TQString::fromLatin1("KDE FTP Server") );
+                                   TQString::tqfromLatin1("KDE FTP Server") );
     }
 
 	if ( dlg->exec() == KDialog::Accepted )
 	    name1 = dlg->selectedURL().url();
     }
 
-    else if ( argv1 == TQString::fromLatin1("eventloop") )
+    else if ( argv1 == TQString::tqfromLatin1("eventloop") )
     {
         KFDTest *test = new KFDTest( startDir );
         return a.exec();
     }
 
-    else if (argv1 == TQString::fromLatin1("save")) {
+    else if (argv1 == TQString::tqfromLatin1("save")) {
         KURL u = KFileDialog::getSaveURL();
-//        TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")),
+//        TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")),
 //        TQString::null, 0L);
         name1 = u.url();
     }
 
-    else if (argv1 == TQString::fromLatin1("icon")) {
+    else if (argv1 == TQString::tqfromLatin1("icon")) {
     	KIconDialog dlg;
 	TQString icon = dlg.selectIcon();
 	kdDebug() << icon << endl;
     }
 
-//     else if ( argv1 == TQString::fromLatin1("dirselect") ) {
+//     else if ( argv1 == TQString::tqfromLatin1("dirselect") ) {
 //         KURL url;
 //         url.setPath( "/" );
 //         KURL selected = KDirSelectDialog::selectDirectory( url );
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 
     else {
 	KFileDialog dlg(startDir,
-			TQString::fromLatin1("*|All Files\n"
+			TQString::tqfromLatin1("*|All Files\n"
 					    "*.lo *.o *.la|All libtool Files"),
 			0, 0, true);
 //    dlg.setFilter( "*.tdevelop" );
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
     }
 
     if (!(name1.isNull()))
-	KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1,
-				 TQString::fromLatin1("Your Choice"));
+	KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1,
+				 TQString::tqfromLatin1("Your Choice"));
     return 0;
 }
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp
index 9248eec5d..4a1d4bec0 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/kio/kfile/tests/kurlrequestertest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
     qDebug( "Selected url: %s", url.url().latin1());
 
     KURLRequester *req = new KURLRequester();
-    KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() );
+    KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() );
     el->show();
     return app.exec();
 }