Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

31 files changed, 248 insertions, 247 deletions

diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 82b4aeb17..7e34eeb12 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -97,7 +97,7 @@ TQString FaviconsModule::iconForURL(const KURL &url)
     TQString icon;
     TQString simplifiedURL = simplifyURL(url);
 
-    TQString *iconURL = d->faviconsCache.find( removeSlash(simplifiedURL) );
+    TQString *iconURL = d->faviconsCache.tqfind( removeSlash(simplifiedURL) );
     if (iconURL)
         icon = *iconURL;
     else
@@ -181,7 +181,7 @@ void FaviconsModule::downloadHostIcon(const KURL &url)
 
 void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const KURL &iconURL)
 {
-    if (d->failedDownloads.contains(iconURL.url()))
+    if (d->failedDownloads.tqcontains(iconURL.url()))
         return;
 
     KIO::Job *job = KIO::get(iconURL, false, false);
@@ -219,7 +219,7 @@ void FaviconsModule::slotResult(KIO::Job *job)
         TQBuffer buffer(download.iconData);
         buffer.open(IO_ReadOnly);
         TQImageIO io;
-        io.setIODevice(&buffer);
+        io.setIODevice(TQT_TQIODEVICE(&buffer));
         io.setParameters("size=16");
         // Check here too, the job might have had no error, but the downloaded
         // file contains just a 404 message sent with a 200 status.
diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc
index 3bc303bae..48f6d8bb6 100644
--- a/libkonq/kfileivi.cc
+++ b/libkonq/kfileivi.cc
@@ -81,7 +81,7 @@ KFileIVI::~KFileIVI()
     delete d;
 }
 
-void KFileIVI::invalidateThumb( int state, bool redraw )
+void KFileIVI::tqinvalidateThumb( int state, bool redraw )
 {
     TQIconSet::Mode mode;
     switch( state )
diff --git a/libkonq/kfileivi.h b/libkonq/kfileivi.h
index 6c16907ec..1b2a3402e 100644
--- a/libkonq/kfileivi.h
+++ b/libkonq/kfileivi.h
@@ -88,14 +88,14 @@ public:
                           bool redraw=false);
 
     /**
-     * Notifies that all icon effects on thumbs should be invalidated,
+     * Notifies that all icon effects on thumbs should be tqinvalidated,
      * e.g. because the effect settings have been changed. The thumb itself
      * is assumed to be still valid (use setThumbnailPixmap() instead
      * otherwise).
      * @param state the state of the icon (enum in KIcon)
      * @param redraw whether to redraw the item after setting the icon
      */
-    void invalidateThumb( int state, bool redraw = false );
+    void tqinvalidateThumb( int state, bool redraw = false );
 
     /**
      * Our current thumbnail is not longer "current".
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index 2b32129c2..a139141ac 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -123,7 +123,7 @@ void KIVDirectoryOverlay::slotNewItems( const KFileItemList& items )
         TQString iconName = file -> iconName();
         if (!iconName) continue;
 
-        int* iconCount = m_popularIcons -> find( file -> iconName() );
+        int* iconCount = m_popularIcons -> tqfind( file -> iconName() );
         if (!iconCount) {
             iconCount = new int(0);
             Q_ASSERT(file);
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index d592a0617..cc05df41d 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -56,10 +56,10 @@ KDirWatch * KNewMenu::s_pDirWatch = 0L;
 class KNewMenu::KNewMenuPrivate
 {
 public:
-    KNewMenuPrivate() : m_parentWidget(0) {}
+    KNewMenuPrivate() : m_tqparentWidget(0) {}
     KActionCollection * m_actionCollection;
     TQString m_destPath;
-    TQWidget *m_parentWidget;
+    TQWidget *m_tqparentWidget;
     KActionMenu *m_menuDev;
 };
 
@@ -75,13 +75,13 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) :
     makeMenus();
 }
 
-KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) :
+KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name ) :
   KActionMenu( i18n( "Create New" ), "filenew", _collec, name ),
   menuItemsVersion( 0 )
 {
     d = new KNewMenuPrivate;
     d->m_actionCollection = _collec;
-    d->m_parentWidget = parentWidget;
+    d->m_tqparentWidget = tqparentWidget;
     makeMenus();
 }
 
@@ -162,7 +162,7 @@ void KNewMenu::parseFiles()
                         else
                         {
                             // A relative path, then (that's the default in the files we ship)
-                            TQString linkDir = filePath.left( filePath.findRev( '/' ) + 1 /*keep / */ );
+                            TQString linkDir = filePath.left( filePath.tqfindRev( '/' ) + 1 /*keep / */ );
                             //kdDebug(1203) << "linkDir=" << linkDir << endl;
                             templatePath = linkDir + templatePath;
                         }
@@ -363,16 +363,16 @@ void KNewMenu::slotNewDir()
     if (popupFiles.isEmpty())
        return;
 
-    KonqOperations::newDir(d->m_parentWidget, popupFiles.first());
+    KonqOperations::newDir(d->m_tqparentWidget, popupFiles.first());
 }
 
 void KNewMenu::slotNewFile()
 {
-    int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu"
+    int id = TQString( TQT_TQOBJECT_CONST(sender())->name() + 7 ).toInt(); // skip "newmenu"
     if (id == 0)
     {
 	// run the command for the templates
-	KRun::runCommand(TQString(sender()->name()));
+	KRun::runCommand(TQString(TQT_TQOBJECT_CONST(sender())->name()));
 	return;
     }
 
@@ -396,7 +396,7 @@ void KNewMenu::slotNewFile()
     	{
     	    m_isURLDesktopFile = true;
     	    // entry.comment contains i18n("Enter link to location (URL):"). JFYI :)
-    	    KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_parentWidget );
+    	    KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_tqparentWidget );
     	    // TODO dlg.setCaption( i18n( ... ) );
     	    if ( dlg.exec() )
     	    {
@@ -419,7 +419,7 @@ void KNewMenu::slotNewFile()
                 //kdDebug(1203) << "second arg=" << (*it).url() << endl;
                 //kdDebug(1203) << "third arg=" << entry.text << endl;
                 TQString text = entry.text;
-                text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename
+                text.tqreplace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
                 
 		KURL defaultFile( *it );
 		defaultFile.addPath( KIO::encodeFileName( text ) );
@@ -428,7 +428,7 @@ void KNewMenu::slotNewFile()
 
                 KURL templateURL;
                 templateURL.setPath( entry.templatePath );
-                (void) new KPropertiesDialog( templateURL, *it, text, d->m_parentWidget );
+                (void) new KPropertiesDialog( templateURL, *it, text, d->m_tqparentWidget );
     	    }
     	    return; // done, exit.
     	}
@@ -439,7 +439,7 @@ void KNewMenu::slotNewFile()
         // Show the small dialog for getting the destination filename
         bool ok;
         TQString text = entry.text;
-        text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename
+        text.tqreplace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
         
 	KURL defaultFile( *(popupFiles.begin()) );
 	defaultFile.addPath( KIO::encodeFileName( text ) );
@@ -447,7 +447,7 @@ void KNewMenu::slotNewFile()
 	    text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text);
 
         name = KInputDialog::getText( TQString::null, entry.comment,
-    	text, &ok, d->m_parentWidget );
+    	text, &ok, d->m_tqparentWidget );
         if ( !ok )
 	    return;
     }
@@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
 
     TQLabel * label = new TQLabel( textFileName, fileNameBox );
     m_leFileName = new KLineEdit( fileNameBox, 0L );
-    m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3);
+    m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3);
     label->setBuddy(m_leFileName);  // please "scheck" style
     m_leFileName->setText( defaultName );
     m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect
@@ -559,7 +559,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
     m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" );
     m_urlRequester->setMode( KFile::File | KFile::Directory );
 
-    m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 );
+    m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 );
     connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
              TQT_SLOT(slotURLTextChanged(const TQString&)) );
     label->setBuddy(m_urlRequester);  // please "scheck" style
diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h
index 6935ae7a4..3c1b0a78b 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -58,7 +58,7 @@ public:
      * Constructor
      */
     KNewMenu( KActionCollection * _collec, const char *name=0L );
-    KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L );
+    KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name=0L );
     virtual ~KNewMenu();
 
     /**
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index ca21c69a3..b1ebdc92f 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -51,7 +51,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
     m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
     TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
-    groupLayout->setAlignment( Qt::AlignTop );
+    groupLayout->tqsetAlignment( Qt::AlignTop );
     mainLayout->addWidget( m_buttonGroup );
 
     connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
@@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
     groupLayout->addWidget( m_radioColor, 0, 0 );
     m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup );
-    m_buttonColor->setSizePolicy( TQSizePolicy::Preferred,
+    m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred,
                                 TQSizePolicy::Minimum );
     groupLayout->addWidget( m_buttonColor, 0, 1 );
 
@@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     TQLabel* lbl = new TQLabel( i18n("Preview"), page );
     hlay->addWidget( lbl );
     TQFrame* frame = new TQFrame( page );
-    frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     frame->setFrameShape( TQFrame::HLine );
     frame->setFrameShadow( TQFrame::Sunken );
     hlay->addWidget( frame );
 
     // preview frame
     m_preview = new TQFrame( page );
-    m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+    m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
     m_preview->setMinimumSize( 370, 180 );
     m_preview->setFrameShape( TQFrame::Panel );
     m_preview->setFrameShadow( TQFrame::Raised );
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index d64dde7ef..e3059f4a2 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -133,7 +133,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
     resetCount();
     //m_bMultipleItemsSelected = false;
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
 
     actionCollection()->setHighlightingEnabled( true );
 
@@ -301,7 +301,7 @@ void KonqDirPart::slotBackgroundSettings()
         m_pProps->setBgPixmapFile( dlg->pixmapFile() );
         }
         m_pProps->applyColors( scrollWidget()->viewport() );
-        scrollWidget()->viewport()->repaint();
+        scrollWidget()->viewport()->tqrepaint();
     }
     
     delete dlg;
@@ -418,7 +418,7 @@ void KonqDirPart::slotClipboardDataChanged()
     // This is very related to KDIconView::slotClipboardDataChanged
 
     KURL::List lst;
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
         if ( KonqDrag::decodeIsCutSelection( data ) )
             (void) KURLDrag::decode( data, lst );
@@ -548,7 +548,7 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn )
 
     // This slot is called when an iconsize action is checked or by calling
     // action->setChecked(false) (previously true). So we must filter out
-    // the 'untoggled' case to prevent odd results here (repaints/loops!)
+    // the 'untoggled' case to prevent odd results here (tqrepaints/loops!)
     if ( !toggleOn )
         return;
 
diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc
index 0fdca5722..07a3e8bda 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cc
@@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KonqIconDrag::encodedData( const char* mime ) const
+TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
     if ( mimetype == "application/x-qiconlist" )
-        a = TQIconDrag::encodedData( mime );
+        a = TQIconDrag::tqencodedData( mime );
     else if ( mimetype == "text/uri-list" ) {
         TQCString s = urls.join( "\r\n" ).latin1();
         if( urls.count() > 0 )
@@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const
     return KonqIconDrag::format( i );
 }
 
-TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
+TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const
 {
     TQCString mimetype( mime );
     if ( mimetype == "application/x-kde-urilist" )
@@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
         a[c] = 0;
         return a;
     }
-    return KonqIconDrag::encodedData( mime );
+    return KonqIconDrag::tqencodedData( mime );
 }
 
 //
@@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const
     else return 0;
 }
 
-TQByteArray KonqDrag::encodedData( const char* mime ) const
+TQByteArray KonqDrag::tqencodedData( const char* mime ) const
 {
     TQByteArray a;
     TQCString mimetype( mime );
@@ -232,7 +232,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const
         // Code taken from TQUriDrag::setUris
         int c=0;
         for (TQStrListIterator it(m_urls); *it; ++it) {
-             int l = qstrlen(*it);
+             int l = tqstrlen(*it);
              a.resize(c+l+2);
              memcpy(a.data()+c,*it,l);
              memcpy(a.data()+c+l,"\r\n",2);
@@ -243,7 +243,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const
     }
     else if ( mimetype == "application/x-kde-urilist" )
     {
-        return TQUriDrag::encodedData( "text/uri-list" );
+        return TQUriDrag::tqencodedData( "text/uri-list" );
     }
     else if ( mimetype == "application/x-kde-cutselection" )
     {
@@ -271,7 +271,7 @@ TQByteArray KonqDrag::encodedData( const char* mime ) const
 
 bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e )
 {
-  TQByteArray a = e->encodedData( "application/x-kde-cutselection" );
+  TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" );
   if ( a.isEmpty() )
     return false;
   else
diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h
index e5e49a837..65a156021 100644
--- a/libkonq/konq_drag.h
+++ b/libkonq/konq_drag.h
@@ -35,7 +35,7 @@
  *****************************************************************************/
 
 // Clipboard/dnd data for: Icons + URLS + isCut
-class LIBKONQ_EXPORT KonqIconDrag : public QIconDrag
+class LIBKONQ_EXPORT KonqIconDrag : public TQIconDrag
 {
     Q_OBJECT
 
@@ -44,7 +44,7 @@ public:
     virtual ~KonqIconDrag() {}
 
     const char* format( int i ) const;
-    TQByteArray encodedData( const char* mime ) const;
+    TQByteArray tqencodedData( const char* mime ) const;
 
     void append( const TQIconDragItem &item, const TQRect &pr,
                  const TQRect &tr, const TQString &url );
@@ -72,7 +72,7 @@ public:
     virtual ~KonqIconDrag2() {}
 
     virtual const char* format( int i ) const;
-    virtual TQByteArray encodedData( const char* mime ) const;
+    virtual TQByteArray tqencodedData( const char* mime ) const;
 
     void append( const TQIconDragItem &item, const TQRect &pr,
                  const TQRect &tr, const TQString &url, const KURL &mostLocalURL );
@@ -82,7 +82,7 @@ private:
 };
 
 // Clipboard/dnd data for: URLS + isCut
-class LIBKONQ_EXPORT KonqDrag : public QUriDrag
+class LIBKONQ_EXPORT KonqDrag : public TQUriDrag
 {
 public:
     // KDE4: remove, use KonqDrag constructor instead
@@ -107,7 +107,7 @@ public:
     virtual ~KonqDrag() {}
 
     virtual const char* format( int i ) const;
-    virtual TQByteArray encodedData( const char* mime ) const;
+    virtual TQByteArray tqencodedData( const char* mime ) const;
 
     void setMoveSelection( bool move ) { m_bCutSelection = move; }
 
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index 81262ae99..c7ef40c56 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -37,7 +37,7 @@
 //--------------------------------------------------------------------------------
 
 KonqFileTip::KonqFileTip( TQScrollView* parent )
-  : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ),
+  : TQFrame( 0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM) ),
     m_on( false ),
     m_preview( false ),
     m_filter( false ),
@@ -49,7 +49,7 @@ KonqFileTip::KonqFileTip( TQScrollView* parent )
 {
     m_iconLabel = new TQLabel(this);
     m_textLabel = new TQLabel(this);
-    m_textLabel->setAlignment(Qt::AlignAuto | Qt::AlignTop);
+    m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop);
 
     TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0);
     layout->addWidget(m_iconLabel, 0, 0);
@@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p )
     }
 
     if ( m_corners[m_corner].isNull())
-        m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
+        m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
 
     TQPixmap &pix = m_corners[m_corner];
 
diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h
index 08ccc9b9b..2c30a0a8f 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -35,7 +35,7 @@ class TQTimer;
 
 //--------------------------------------------------------------------------------
 
-class LIBKONQ_EXPORT KonqFileTip : public QFrame
+class LIBKONQ_EXPORT KonqFileTip : public TQFrame
 {
   Q_OBJECT
 
diff --git a/libkonq/konq_historycomm.h b/libkonq/konq_historycomm.h
index ea2a387df..96c3a375e 100644
--- a/libkonq/konq_historycomm.h
+++ b/libkonq/konq_historycomm.h
@@ -37,7 +37,7 @@ public:
     KURL url;
     TQString typedURL;
     TQString title;
-    Q_UINT32 numberOfTimesVisited;
+    TQ_UINT32 numberOfTimesVisited;
     TQDateTime firstVisited;
     TQDateTime lastVisited;
 };
@@ -65,8 +65,8 @@ protected:
 
 k_dcop:
     virtual ASYNC notifyHistoryEntry( KonqHistoryEntry e, TQCString saveId) = 0;
-    virtual ASYNC notifyMaxCount( Q_UINT32 count, TQCString saveId ) = 0;
-    virtual ASYNC notifyMaxAge( Q_UINT32 days, TQCString saveId ) = 0;
+    virtual ASYNC notifyMaxCount( TQ_UINT32 count, TQCString saveId ) = 0;
+    virtual ASYNC notifyMaxAge( TQ_UINT32 days, TQCString saveId ) = 0;
     virtual ASYNC notifyClear( TQCString saveId ) = 0;
     virtual ASYNC notifyRemove( KURL url, TQCString saveId ) = 0;
     virtual ASYNC notifyRemove( KURL::List url, TQCString saveId ) = 0;
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index b971d39b3..bff8d7328 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -31,7 +31,7 @@
 
 #include "konqbookmarkmanager.h"
 
-const Q_UINT32 KonqHistoryManager::s_historyVersion = 3;
+const TQ_UINT32 KonqHistoryManager::s_historyVersion = 3;
 
 KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
     : KParts::HistoryProvider( parent, name ),
@@ -43,12 +43,12 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
     KConfig *config = KGlobal::config();
     KConfigGroupSaver cs( config, "HistorySettings" );
     m_maxCount = config->readNumEntry( "Maximum of History entries", 500 );
-    m_maxCount = QMAX( 1, m_maxCount );
+    m_maxCount = TQMAX( 1, m_maxCount );
     m_maxAgeDays = config->readNumEntry( "Maximum age of History entries", 90);
 
     m_history.setAutoDelete( true );
     m_filename = locateLocal( "data",
-			      TQString::fromLatin1("konqueror/konq_history" ));
+			      TQString::tqfromLatin1("konqueror/konq_history" ));
 
     if ( !kapp->dcopClient()->isAttached() )
 	kapp->dcopClient()->attach();
@@ -102,7 +102,7 @@ bool KonqHistoryManager::loadHistory()
     TQDataStream crcStream( data, IO_ReadOnly );
 
     if ( !fileStream.atEnd() ) {
-	Q_UINT32 version;
+	TQ_UINT32 version;
         fileStream >> version;
 
         TQDataStream *stream = &fileStream;
@@ -111,7 +111,7 @@ bool KonqHistoryManager::loadHistory()
         bool crcOk = false;
 
         if ( version == 2 || version == 3) {
-            Q_UINT32 crc;
+            TQ_UINT32 crc;
             crcChecked = true;
             fileStream >> crc >> data;
             crcOk = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ) == crc;
@@ -132,7 +132,7 @@ bool KonqHistoryManager::loadHistory()
 	    // binary file, this would make backups impossible (they would clear
 	    // themselves on startup, because all entries expire).
 	    // [But V1 and V2 formats did it, so we do a dummy read]
-	    Q_UINT32 dummy;
+	    TQ_UINT32 dummy;
 	    *stream >> dummy;
 	    *stream >> dummy;
 
@@ -224,7 +224,7 @@ bool KonqHistoryManager::saveHistory()
     //For DCOP, transfer strings instead - wire compat.
     KonqHistoryEntry::marshalURLAsStrings = true;
 
-    Q_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() );
+    TQ_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() );
     *fileStream << crc << data;
 
     file.close();
@@ -295,12 +295,12 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
     // konqueror's window caption).
     if ( !pending && u != title )
 	entry.title = title;
-    entry.firstVisited = TQDateTime::currentDateTime();
+    entry.firstVisited = TQDateTime::tqcurrentDateTime();
     entry.lastVisited = entry.firstVisited;
 
     // always remove from pending if available, otherwise the else branch leaks
     // if the map already contains an entry for this key.
-    TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( u );
+    TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.tqfind( u );
     if ( it != m_pending.end() ) {
         delete it.data();
         m_pending.remove( it );
@@ -342,7 +342,7 @@ void KonqHistoryManager::insert( const TQString& url )
     // Local URL -> add to history
     KonqHistoryEntry entry;
     entry.url = u;
-    entry.firstVisited = TQDateTime::currentDateTime();
+    entry.firstVisited = TQDateTime::tqcurrentDateTime();
     entry.lastVisited = entry.firstVisited;
     emitAddToHistory( entry );
 }
@@ -368,7 +368,7 @@ void KonqHistoryManager::removePending( const KURL& url )
     if ( url.isLocalFile() )
 	return;
 
-    TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( url.prettyURL() );
+    TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.tqfind( url.prettyURL() );
     if ( it != m_pending.end() ) {
 	KonqHistoryEntry *oldEntry = it.data(); // the old entry, may be 0L
 	emitRemoveFromHistory( url ); // remove the current pending entry
@@ -419,22 +419,22 @@ void KonqHistoryManager::emitClear()
 			      "notifyClear(TQCString)", data );
 }
 
-void KonqHistoryManager::emitSetMaxCount( Q_UINT32 count )
+void KonqHistoryManager::emitSetMaxCount( TQ_UINT32 count )
 {
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << count << objId();
     kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
-			      "notifyMaxCount(Q_UINT32, TQCString)", data );
+			      "notifyMaxCount(TQ_UINT32, TQCString)", data );
 }
 
-void KonqHistoryManager::emitSetMaxAge( Q_UINT32 days )
+void KonqHistoryManager::emitSetMaxAge( TQ_UINT32 days )
 {
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
     stream << days << objId();
     kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
-			      "notifyMaxAge(Q_UINT32, TQCString)", data );
+			      "notifyMaxAge(TQ_UINT32, TQCString)", data );
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -487,7 +487,7 @@ void KonqHistoryManager::notifyHistoryEntry( KonqHistoryEntry e,
     emit entryAdded( entry );
 }
 
-void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, TQCString )
+void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString )
 {
     m_maxCount = count;
     clearPending();
@@ -503,7 +503,7 @@ void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, TQCString )
     }
 }
 
-void KonqHistoryManager::notifyMaxAge( Q_UINT32 days, TQCString  )
+void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString  )
 {
     m_maxAgeDays = days;
     clearPending();
@@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString )
 // compatibility fallback, try to load the old completion history
 bool KonqHistoryManager::loadFallback()
 {
-    TQString file = locateLocal( "config", TQString::fromLatin1("konq_history"));
+    TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history"));
     if ( file.isEmpty() )
 	return false;
 
@@ -627,7 +627,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item)
     uint weight = 1;
 
     // find out the weighting of this item (appended to the string as ":num")
-    int index = item.findRev(':');
+    int index = item.tqfindRev(':');
     if ( index > 0 ) {
 	bool ok;
 	weight = item.mid( index + 1 ).toUInt( &ok );
@@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item)
 	entry->url = u;
 	entry->numberOfTimesVisited = weight;
 	// to make it not expire immediately...
-	entry->lastVisited = TQDateTime::currentDateTime();
+	entry->lastVisited = TQDateTime::tqcurrentDateTime();
     }
 
     return entry;
diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h
index 11b14603b..47c3d7b35 100644
--- a/libkonq/konq_historymgr.h
+++ b/libkonq/konq_historymgr.h
@@ -91,7 +91,7 @@ public:
      *
      * The history is saved after receiving the DCOP call.
      */
-    void emitSetMaxCount( Q_UINT32 count );
+    void emitSetMaxCount( TQ_UINT32 count );
 
     /**
      * Sets a new maximum age of history entries and removes all entries that
@@ -102,7 +102,7 @@ public:
      *
      * The history is saved after receiving the DCOP call.
      */
-    void emitSetMaxAge( Q_UINT32 days );
+    void emitSetMaxAge( TQ_UINT32 days );
 
     /**
      * Removes the history entry for @p url, if existant. Tells all other
@@ -123,12 +123,12 @@ public:
     /**
      * @returns the current maximum number of history entries.
      */
-    Q_UINT32 maxCount() const { return m_maxCount; }
+    TQ_UINT32 maxCount() const { return m_maxCount; }
 
     /**
      * @returns the current maximum age (in days) of history entries.
      */
-    Q_UINT32 maxAge() const { return m_maxAgeDays; }
+    TQ_UINT32 maxAge() const { return m_maxAgeDays; }
 
     /**
      * Adds a pending entry to the history. Pending means, that the entry is
@@ -236,7 +236,7 @@ protected:
      */
     inline bool isExpired( KonqHistoryEntry *entry ) {
 	return (entry && m_maxAgeDays > 0 && entry->lastVisited <
-		TQDate::currentDate().addDays( -m_maxAgeDays ));
+		TQDateTime(TQDate::currentDate().addDays( -m_maxAgeDays )));
     }
 
     /**
@@ -259,13 +259,13 @@ protected:
      * Called when the configuration of the maximum count changed.
      * Called via DCOP by some config-module
      */
-    virtual void notifyMaxCount( Q_UINT32 count, TQCString saveId );
+    virtual void notifyMaxCount( TQ_UINT32 count, TQCString saveId );
 
     /**
      * Called when the configuration of the maximum age of history-entries
      * changed. Called via DCOP by some config-module
      */
-    virtual void notifyMaxAge( Q_UINT32 days, TQCString saveId );
+    virtual void notifyMaxAge( TQ_UINT32 days, TQCString saveId );
 
     /**
      * Clears the history completely. Called via DCOP by some config-module
@@ -327,7 +327,7 @@ protected:
 private slots:
     /**
      * Called by the updateTimer to emit the KParts::HistoryProvider::updated()
-     * signal so that khtml can repaint the updated links.
+     * signal so that khtml can tqrepaint the updated links.
      */
     void slotEmitUpdated();
 
@@ -367,8 +367,8 @@ private:
      */
     TQMap<TQString,KonqHistoryEntry*> m_pending;
 
-    Q_UINT32 m_maxCount;   // maximum of history entries
-    Q_UINT32 m_maxAgeDays; // maximum age of a history entry
+    TQ_UINT32 m_maxCount;   // maximum of history entries
+    TQ_UINT32 m_maxAgeDays; // maximum age of a history entry
 
     KCompletion *m_pCompletion; // the completion object we sync with
 
@@ -378,7 +378,7 @@ private:
      */
     TQTimer *m_updateTimer;
 
-    static const Q_UINT32 s_historyVersion;
+    static const TQ_UINT32 s_historyVersion;
 };
 
 
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 0ce2ca346..152083895 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
     m_LineupMode = LineupBoth;
     // emit our signals
     slotSelectionChanged();
-    m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" );
+    m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" );
     KonqUndoManager::incRef();
 }
 
@@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
                         if (!hasPixmap && backgroundMode() != NoBackground)
                            d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
                         d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
-                        d->m_movie->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) );
+                        d->m_movie->connectqStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
                         d->movieFileName = d->pActiveItem->mouseOverAnimation();
                         d->pActiveItem->setAnimated( true );
                     }
@@ -331,7 +331,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
         else // No change in current item
         {
             // No effect. If we want to underline on hover, we should
-            // force the IVI to repaint here, though!
+            // force the IVI to tqrepaint here, though!
             d->pActiveItem = 0L;
             d->pFileTip->setItem( 0L );
         }
@@ -346,10 +346,10 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
 
     // ## shouldn't this be disabled during rectangular selection too ?
     if (d->bSoundPreviews && d->pSoundPlayer &&
-        d->pSoundPlayer->mimeTypes().contains(
+        d->pSoundPlayer->mimeTypes().tqcontains(
             item->item()->mimetype())
         && KGlobalSettings::showFilePreview(item->item()->url())
-        && topLevelWidget() == kapp->activeWindow())
+        && tqtopLevelWidget() == kapp->activeWindow())
     {
         d->pSoundItem = item;
         d->bSoundItemClicked = false;
@@ -478,7 +478,7 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect )
         }
         d->pActiveItem->setPixmapDirect( frame, false, false /*no redraw*/ );
         TQRect pixRect = d->pActiveItem->pixmapRect(false);
-        repaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false );
+        tqrepaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false );
     }
 }
 
@@ -561,7 +561,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
       if ( itemTextBg.isValid() )
           setItemTextBackground( itemTextBg );
       else
-          setItemTextBackground( NoBrush );
+          setItemTextBackground( Qt::NoBrush );
     }
 
     bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled();
@@ -648,9 +648,9 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
     }
     bool stopAll = !stopImagePreviewFor.isEmpty() && stopImagePreviewFor.first() == "*";
 
-    // Disable repaints that can be triggered by ivi->setIcon(). Since icons are
+    // Disable tqrepaints that can be triggered by ivi->setIcon(). Since icons are
     // resized in-place, if the icon size is increasing it can happens that the right
-    // or bottom icons exceed the size of the viewport.. here we prevent the repaint
+    // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint
     // event that will be triggered in that case.
     bool prevUpdatesState = viewport()->isUpdatesEnabled();
     viewport()->setUpdatesEnabled( false );
@@ -669,7 +669,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
             ivi->setIcon( size, ivi->state(), true, false );
         }
         else
-            ivi->invalidateThumb( ivi->state(), true );
+            ivi->tqinvalidateThumb( ivi->state(), true );
     }
 
     // Restore viewport update to previous state
@@ -677,7 +677,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
 
     if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() ||
          !stopImagePreviewFor.isEmpty() ) && autoArrange() )
-        arrangeItemsInGrid( true ); // take new grid into account and repaint
+        arrangeItemsInGrid( true ); // take new grid into account and tqrepaint
     else
         viewport()->update(); //Repaint later..
 }
@@ -692,7 +692,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString
             return true;
         // Support for *mt == "image/*"
         TQString tmp( mimeType );
-        if ( (*mt).endsWith("*") && tmp.replace(TQRegExp("/.*"), "/*") == (*mt) )
+        if ( (*mt).endsWith("*") && tmp.tqreplace(TQRegExp("/.*"), "/*") == (*mt) )
             return true;
         if ( (*mt) == "text/plain" )
         {
@@ -830,13 +830,13 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
         return;
     }
 
-    if ((d->bSoundPreviews = d->previewSettings.contains( "audio/" )) &&
+    if ((d->bSoundPreviews = d->previewSettings.tqcontains( "audio/" )) &&
         !d->pSoundPlayer)
     {
       KLibFactory *factory = KLibLoader::self()->factory("konq_sound");
       if (factory)
         d->pSoundPlayer = static_cast<KonqSoundPlayer *>(
-          factory->create(this, 0, "KonqSoundPlayer"));
+          factory->create(TQT_TQOBJECT(this), 0, "KonqSoundPlayer"));
       d->bSoundPreviews = (d->pSoundPlayer != 0L);
     }
 
@@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e )
 {
     if ( e->provides( "text/uri-list" ) )
     {
-        TQByteArray payload = e->encodedData( "text/uri-list" );
+        TQByteArray payload = e->tqencodedData( "text/uri-list" );
         if ( !payload.size() )
             kdError() << "Empty data !" << endl;
         // Cache the URLs, since we need them every time we move over a file
@@ -1030,7 +1030,7 @@ void KonqIconViewWidget::contentsDragMoveEvent( TQDragMoveEvent *e )
         return;
     }
 
-    TQIconViewItem *item = findItem( e->pos() );
+    TQIconViewItem *item = tqfindItem( e->pos() );
     if ( e->source() != viewport() &&
          !item && m_rootItem && !m_rootItem->isWritable() ) {
         emit dragMove( false );
@@ -1147,14 +1147,14 @@ void KonqIconViewWidget::cutSelection()
     kdDebug(1203) << " -- KonqIconViewWidget::cutSelection() -- " << endl;
     KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
     obj->setMoveSelection( true );
-    TQApplication::clipboard()->setData( obj );
+    TQApplication::tqclipboard()->setData( obj );
 }
 
 void KonqIconViewWidget::copySelection()
 {
     kdDebug(1203) << " -- KonqIconViewWidget::copySelection() -- " << endl;
     KonqIconDrag * obj = konqDragObject( /* no parent ! */ );
-    TQApplication::clipboard()->setData( obj );
+    TQApplication::tqclipboard()->setData( obj );
 }
 
 void KonqIconViewWidget::pasteSelection()
@@ -1221,7 +1221,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
         // The following call is SO expensive (the ::widgetAt call eats up to 80%
         // of the mouse move cpucycles!), so it's mandatory to place that function
         // under strict checks, such as d->pSoundPlayer->isPlaying()
-        if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() )
+        if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() )
         {
             if (d->pSoundPlayer)
                 d->pSoundPlayer->stop();
@@ -1236,7 +1236,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
 
 void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
 {
-  TQIconViewItem *i = findItem( ev->pos() );
+  TQIconViewItem *i = tqfindItem( ev->pos() );
 
     if ( ev->source() != viewport() &&
          !i && m_rootItem && !m_rootItem->isWritable() ) {
@@ -1249,7 +1249,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
   if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link)
           && ev->source() && ev->source() == viewport())
   {
-    // First we need to call TQIconView though, to clear the drag shape
+    // First we need to call TQIconView though, to clear the drag tqshape
     bool bMovable = itemsMovable();
     setItemsMovable(false); // hack ? call it what you want :-)
     KIconView::contentsDropEvent( ev );
@@ -1281,7 +1281,7 @@ void KonqIconViewWidget::doubleClickTimeout()
     if ( d->releaseMouseEvent )
     {
         TQMouseEvent e( TQEvent::MouseButtonPress,d->mousePos , 1, d->mouseState);
-        TQIconViewItem* item = findItem( e.pos() );
+        TQIconViewItem* item = tqfindItem( e.pos() );
         KURL url;
         if ( item )
         {
@@ -1290,7 +1290,7 @@ void KonqIconViewWidget::doubleClickTimeout()
             if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
                 brenameTrash = true;
 
-            if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == LeftButton && item->textRect( false ).contains(e.pos()))
+            if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).tqcontains(e.pos()))
             {
                 if( d->pActivateDoubleClick->isActive () )
                     d->pActivateDoubleClick->stop();
@@ -1359,7 +1359,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
 {
     if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ())
         d->pActivateDoubleClick->stop();
-     TQIconViewItem* item = findItem( e->pos() );
+     TQIconViewItem* item = tqfindItem( e->pos() );
      m_mousePos = e->pos();
      KURL url;
      if ( item )
@@ -1368,7 +1368,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
          bool brenameTrash =false;
          if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
              brenameTrash = true;
-         if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick &&  url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
+         if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).tqcontains(e->pos())&& !d->firstClick &&  url.isLocalFile() && (!url.protocol().tqfind("device", 0, false)==0))
          {
              d->firstClick = true;
              d->mousePos = e->pos();
@@ -1488,7 +1488,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
         y = QMAX(y, i->y() + i->height());
     }
 
-    TQMemArray<TQRect> rects = r.rects();
+    TQMemArray<TQRect> rects = r.tqrects();
     TQMemArray<TQRect>::Iterator it = rects.begin();
     bool foundPlace = FALSE;
     for (; it != rects.end(); ++it)
@@ -1703,7 +1703,7 @@ void KonqIconViewWidget::lineupIcons()
     }
 
     // Perform the actual moving
-    TQRegion repaintRegion;
+    TQRegion tqrepaintRegion;
     TQValueList<TQIconViewItem*> movedItems;
 
     for ( i = 0; i < nx; i++ ) {
@@ -1722,7 +1722,7 @@ void KonqIconViewWidget::lineupIcons()
                     movedItems.prepend( item );
                     item->move( newX, newY );
                     if ( item->rect() != oldRect )
-                        repaintRegion = repaintRegion.unite( oldRect );
+                        tqrepaintRegion = tqrepaintRegion.unite( oldRect );
                 }
             }
             delete bin;
@@ -1730,20 +1730,20 @@ void KonqIconViewWidget::lineupIcons()
         }
     }
 
-    // repaint
+    // tqrepaint
     if ( newItemWidth )
         updateContents();
     else {
-        // Repaint only repaintRegion...
-        TQMemArray<TQRect> rects = repaintRegion.rects();
+        // Repaint only tqrepaintRegion...
+        TQMemArray<TQRect> rects = tqrepaintRegion.tqrects();
         for ( uint l = 0; l < rects.count(); l++ ) {
             kdDebug( 1203 ) << "Repainting (" << rects[l].x() << ","
                             << rects[l].y() << ")\n";
-            repaintContents( rects[l], false );
+            tqrepaintContents( rects[l], false );
         }
         // Repaint icons that were moved
         while ( !movedItems.isEmpty() ) {
-            repaintItem( movedItems.first() );
+            tqrepaintItem( movedItems.first() );
             movedItems.remove( movedItems.first() );
         }
     }
@@ -1760,7 +1760,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
     gridValues( &x0, &y0, &dx, &dy, &nxmax, &nymax );
     int textHeight = iconTextHeight() * fontMetrics().height();
 
-    TQRegion repaintRegion;
+    TQRegion tqrepaintRegion;
     TQValueList<TQIconViewItem*> movedItems;
     int nx = 0, ny = 0;
 
@@ -1775,7 +1775,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
             movedItems.prepend( item );
             item->move( newX, newY );
             if ( item->rect() != oldRect )
-                repaintRegion = repaintRegion.unite( oldRect );
+                tqrepaintRegion = tqrepaintRegion.unite( oldRect );
         }
         if ( arrangement == TQIconView::LeftToRight ) {
             nx++;
@@ -1793,16 +1793,16 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
         }
     }
 
-    // Repaint only repaintRegion...
-    TQMemArray<TQRect> rects = repaintRegion.rects();
+    // Repaint only tqrepaintRegion...
+    TQMemArray<TQRect> rects = tqrepaintRegion.tqrects();
     for ( uint l = 0; l < rects.count(); l++ ) {
         kdDebug( 1203 ) << "Repainting (" << rects[l].x() << ","
                         << rects[l].y() << ")\n";
-        repaintContents( rects[l], false );
+        tqrepaintContents( rects[l], false );
     }
     // Repaint icons that were moved
     while ( !movedItems.isEmpty() ) {
-        repaintItem( movedItems.first() );
+        tqrepaintItem( movedItems.first() );
         movedItems.remove( movedItems.first() );
     }
 }
@@ -1916,7 +1916,7 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
     KTrader::OfferList::ConstIterator it;
 
     for ( it = plugins.begin(); it != plugins.end(); ++it ) {
-        if ( d->previewSettings.contains((*it)->desktopEntryName()) ) {
+        if ( d->previewSettings.tqcontains((*it)->desktopEntryName()) ) {
             TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
             for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
                 d->pPreviewMimeTypes->append(*mt);
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 6a1ebcdb6..616404ee5 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -76,7 +76,7 @@ KonqOperations::~KonqOperations()
 
 void KonqOperations::editMimeType( const TQString & mimeType )
 {
-  TQString keditfiletype = TQString::fromLatin1("keditfiletype");
+  TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
                     keditfiletype, keditfiletype /*unused*/);
 }
@@ -124,7 +124,7 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP
 {
     // move or not move ?
     bool move = false;
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     if ( data->provides( "application/x-kde-cutselection" ) ) {
       move = KonqDrag::decodeIsCutSelection( data );
       kdDebug(1203) << "move (from clipboard data) = " << move << endl;
@@ -185,7 +185,7 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm
         return;
     }
 
-    if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) )
+    if ( askDeleteConfirmation( selectedURLs, method, confirmation, tqparentWidget() ) )
     {
         //m_srcURLs = selectedURLs;
         KIO::Job *job;
@@ -525,7 +525,7 @@ void KonqOperations::doFileCopy()
         }
 
         m_method = TRASH;
-        if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) )
+        if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, tqparentWidget() ) )
             action = TQDropEvent::Move;
         else
         {
@@ -815,7 +815,7 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job )
     slotStart();
 }
 
-TQWidget* KonqOperations::parentWidget() const
+TQWidget* KonqOperations::tqparentWidget() const
 {
     return static_cast<TQWidget *>( parent() );
 }
diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h
index f9134bcde..fa47b4abe 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -34,7 +34,7 @@ class KonqMainWindow;
  * Implements file operations (move,del,trash,shred,paste,copy,move,link...)
  * for konqueror and kdesktop whatever the view mode is (icon, tree, ...)
  */
-class LIBKONQ_EXPORT KonqOperations : public QObject
+class LIBKONQ_EXPORT KonqOperations : public TQObject
 {
     Q_OBJECT
 protected:
@@ -173,7 +173,7 @@ protected:
     void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; }
 
 private:
-    TQWidget* parentWidget() const;
+    TQWidget* tqparentWidget() const;
 
 protected slots:
 
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index 3cff83453..932b1b7d0 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L;
 KonqPixmapProvider * KonqPixmapProvider::self()
 {
     if ( !s_self )
-	s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" );
+	s_self = new KonqPixmapProvider( TQT_TQOBJECT(kapp), "KonqPixmapProvider" );
 
     return s_self;
 }
@@ -54,7 +54,7 @@ KonqPixmapProvider::~KonqPixmapProvider()
 // finally, inserts the url/icon pair into the cache
 TQString KonqPixmapProvider::iconNameFor( const TQString& url )
 {
-    TQMapIterator<TQString,TQString> it = iconMap.find( url );
+    TQMapIterator<TQString,TQString> it = iconMap.tqfind( url );
     TQString icon;
     if ( it != iconMap.end() ) {
         icon = it.data();
@@ -120,7 +120,7 @@ void KonqPixmapProvider::save( KConfig *kc, const TQString& key,
     TQStringList::ConstIterator it = items.begin();
     TQMapConstIterator<TQString,TQString> mit;
     while ( it != items.end() ) {
-	mit = iconMap.find( *it );
+	mit = iconMap.tqfind( *it );
 	if ( mit != iconMap.end() ) {
 	    list.append( mit.key() );
 	    list.append( mit.data() );
@@ -182,12 +182,12 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
 	int x = big.width()  - small.width();
 	int y = 0;
 
- 	if ( big.mask() ) {
- 	    TQBitmap mask = *big.mask();
+ 	if ( big.tqmask() ) {
+ 	    TQBitmap mask = *big.tqmask();
  	    bitBlt( &mask, x, y,
-            small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0,
+            small.tqmask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(small.tqmask())) : &small, 0, 0,
  		    small.width(), small.height(),
- 		    small.mask() ? OrROP : SetROP );
+ 		    small.tqmask() ? OrROP : SetROP );
  	    big.setMask( mask );
  	}
 
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 044bda9d2..273ce8cfc 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -43,6 +43,7 @@
 #include "knewmenu.h"
 #include "konq_popupmenu.h"
 #include "konq_operations.h"
+#include "konq_xmlguiclient.h"
 #include <dcopclient.h>
 
 /*
@@ -95,12 +96,12 @@ public:
 class KonqPopupMenu::KonqPopupMenuPrivate
 {
 public:
-  KonqPopupMenuPrivate() : m_parentWidget( 0 ),
+  KonqPopupMenuPrivate() : m_tqparentWidget( 0 ),
                            m_itemFlags( KParts::BrowserExtension::DefaultPopupItems )
   {
   }
   TQString m_urlTitle;
-  TQWidget *m_parentWidget;
+  TQWidget *m_tqparentWidget;
   KParts::BrowserExtension::PopupFlags m_itemFlags;
 };
 
@@ -199,30 +200,30 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
                               KURL viewURL,
                               KActionCollection & actions,
                               KNewMenu * newMenu,
-                              TQWidget * parentWidget,
+                              TQWidget * tqparentWidget,
                               bool showProperties )
-    : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+    : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
 {
     KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow;
-    init(parentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
+    init(tqparentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems);
 }
 
 KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items,
                               const KURL& viewURL,
                               KActionCollection & actions,
                               KNewMenu * newMenu,
-                              TQWidget * parentWidget,
+                              TQWidget * tqparentWidget,
                               KonqPopupFlags kpf,
                               KParts::BrowserExtension::PopupFlags flags)
-  : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
+  : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr)
 {
-    init(parentWidget, kpf, flags);
+    init(tqparentWidget, kpf, flags);
 }
 
-void KonqPopupMenu::init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
+void KonqPopupMenu::init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags)
 {
     d = new KonqPopupMenuPrivate;
-    d->m_parentWidget = parentWidget;
+    d->m_tqparentWidget = tqparentWidget;
     d->m_itemFlags = flags;
     setup(kpf);
 }
@@ -280,8 +281,8 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
             TQCString name;
             name.setNum( id );
             name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
-            KAction * act = new KAction( TQString((*it).m_strName).replace('&',"&&"), 0,
-                                         this, TQT_SLOT( slotRunService() ),
+            KAction * act = new KAction( TQString((*it).m_strName).tqreplace('&',"&&"), 0,
+                                         TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
                                          &m_ownActions, name );
 
             if ( !(*it).m_strIcon.isEmpty() )
@@ -290,7 +291,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
                 act->setIconSet( pix );
             }
 
-            addAction( act, menu ); // Add to toplevel menu
+            tqaddAction( act, menu ); // Add to toplevel menu
 
             m_mapPopupServices[ id++ ] = *it;
             ++count;
@@ -338,7 +339,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     bool sMoving        = sDeleting;
     bool sWriting       = sDeleting && m_lstItems.first()->isWritable();
     m_sMimeType         = m_lstItems.first()->mimetype();
-    TQString mimeGroup   = m_sMimeType.left(m_sMimeType.find('/'));
+    TQString mimeGroup   = m_sMimeType.left(m_sMimeType.tqfind('/'));
     mode_t mode         = m_lstItems.first()->mode();
     bool isDirectory    = S_ISDIR(mode);
     bool bTrashIncluded = false;
@@ -354,7 +355,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     m_pluginList.setAutoDelete( true );
     m_ownActions.setHighlightingEnabled( true );
 
-    attrName = TQString::fromLatin1( "name" );
+    attrName = TQString::tqfromLatin1( "name" );
 
     prepareXMLGUIStuff();
     m_builder = new KonqPopupMenuGUIBuilder( this );
@@ -380,11 +381,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         {
             m_sMimeType = TQString::null; // mimetypes are different => null
 
-            if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().find('/')))
+            if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().tqfind('/')))
                 mimeGroup = TQString::null; // mimetype groups are different as well!
         }
 
-        if ( mimeTypeList.findIndex( (*it)->mimetype() ) == -1 )
+        if ( mimeTypeList.tqfindIndex( (*it)->mimetype() ) == -1 )
             mimeTypeList << (*it)->mimetype();
 
         if ( isReallyLocal && !url.isLocalFile() )
@@ -475,7 +476,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     if ( ((kpf & ShowNewWindow) != 0) && sReading )
     {
         TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
-        actNewWindow = new KAction( openStr, "window_new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+        actNewWindow = new KAction( openStr, "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
     }
 
     if ( actNewWindow && !isKDesktop )
@@ -496,7 +497,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             m_pMenuNew->slotCheckUpToDate();
             m_pMenuNew->setPopupFiles( m_lstPopupURLs );
 
-            addAction( m_pMenuNew );
+            tqaddAction( m_pMenuNew );
 
             addSeparator();
         }
@@ -504,32 +505,32 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         {
             if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
             {
-                KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
-                addAction( actNewDir );
+                KAction *actNewDir = new KAction( i18n( "Create &Folder..." ), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+                tqaddAction( actNewDir );
                 addSeparator();
             }
         }
     } else if ( isIntoTrash ) {
         // Trashed item, offer restoring
-        act = new KAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
-        addAction( act );
+        act = new KAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
+        tqaddAction( act );
     }
 
     if (d->m_itemFlags & KParts::BrowserExtension::ShowNavigationItems)
     {
         if (d->m_itemFlags & KParts::BrowserExtension::ShowUp)
-            addAction( "up" );
-        addAction( "back" );
-        addAction( "forward" );
+            tqaddAction( "up" );
+        tqaddAction( "back" );
+        tqaddAction( "forward" );
         if (d->m_itemFlags & KParts::BrowserExtension::ShowReload)
-            addAction( "reload" );
+            tqaddAction( "reload" );
         addSeparator();
     }
 
     // "open in new window" is either provided by us, or by the tabhandling group
     if (actNewWindow)
     {
-        addAction( actNewWindow );
+        tqaddAction( actNewWindow );
         addSeparator();
     }
     addGroup( "tabhandling" ); // includes a separator
@@ -538,21 +539,21 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     {
         if ( !currentDir && sReading ) {
             if ( sDeleting ) {
-                addAction( "cut" );
+                tqaddAction( "cut" );
             }
-            addAction( "copy" );
+            tqaddAction( "copy" );
         }
 
         if ( S_ISDIR(mode) && sWriting ) {
             if ( currentDir )
-                addAction( "paste" );
+                tqaddAction( "paste" );
             else
-                addAction( "pasteto" );
+                tqaddAction( "pasteto" );
         }
         if ( !currentDir )
         {
             if ( m_lstItems.count() == 1 && sMoving )
-                addAction( "rename" );
+                tqaddAction( "rename" );
 
             bool addTrash = false;
             bool addDel = false;
@@ -563,7 +564,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             if ( sDeleting ) {
                 if ( !isLocal )
                     addDel = true;
-                else if (KApplication::keyboardMouseState() & Qt::ShiftButton) {
+                else if (KApplication::keyboardMouseState() & TQt::ShiftButton) {
                     addTrash = false;
                     addDel = true;
                 }
@@ -575,18 +576,18 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             }
 
             if ( addTrash )
-                addAction( "trash" );
+                tqaddAction( "trash" );
             if ( addDel )
-                addAction( "del" );
+                tqaddAction( "del" );
         }
     }
     if ( isCurrentTrash )
     {
-        act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
+        act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
         KSimpleConfig trashConfig( "trashrc", true );
         trashConfig.setGroup( "Status" );
         act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
-        addAction( act );
+        tqaddAction( act );
     }
     addGroup( "editactions" );
 
@@ -602,7 +603,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         TQString caption;
         if (currentDir)
         {
-           bool httpPage = (m_sViewURL.protocol().find("http", 0, false) == 0);
+           bool httpPage = (m_sViewURL.protocol().tqfind("http", 0, false) == 0);
            if (httpPage)
               caption = i18n("&Bookmark This Page");
            else
@@ -615,11 +616,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         else
            caption = i18n("&Bookmark This File");
 
-        act = new KAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
+        act = new KAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
         if (m_lstItems.count() > 1)
             act->setEnabled(false);
         if (kapp->authorizeKAction("bookmarks"))
-            addAction( act );
+            tqaddAction( act );
         if (bIsLink)
             addGroup( "linkactions" );
     }
@@ -706,7 +707,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             if ( cfg.hasKey( "X-KDE-ShowIfDcopCall" ) )
             {
                 TQString dcopcall = cfg.readEntry( "X-KDE-ShowIfDcopCall" );
-                const TQCString app = dcopcall.section(' ', 0,0).utf8();
+                const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8();
 
                 //if( !kapp->dcopClient()->isApplicationRegistered( app ))
                 //	continue; //app does not exist so cannot send call
@@ -717,8 +718,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
                 TQCString replyType;
                 TQByteArray replyData;
-                TQCString object =    dcopcall.section(' ', 1,-2).utf8();
-                TQString function =  dcopcall.section(' ', -1);
+                TQCString object = TQString(dcopcall.section(' ', 1,-2)).utf8();
+                TQString function =  TQString(dcopcall.section(' ', -1));
                 if(!function.endsWith("(KURL::List)")) {
                     kdWarning() << "Desktop file " << *eIt << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
                     continue; //Be safe.
@@ -741,7 +742,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             else if ( cfg.hasKey( "X-KDE-Protocols" ) )
             {
                 TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) );
-                if ( !protocols.contains( urlForServiceMenu.protocol() ) )
+                if ( !protocols.tqcontains( urlForServiceMenu.protocol() ) )
                     continue;
             }
             else if ( urlForServiceMenu.protocol() == "trash" || urlForServiceMenu.url().startsWith( "system:/trash" ) )
@@ -755,7 +756,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
             if ( cfg.hasKey( "X-KDE-Require" ) )
             {
                 const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
-                if ( capabilities.contains( "Write" ) && !sWriting )
+                if ( capabilities.tqcontains( "Write" ) && !sWriting )
                     continue;
             }
             if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-KDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) )
@@ -791,7 +792,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                          *it == m_sMimeType) ||
                         (!mimeGroup.isEmpty() &&
                          ((*it).right(1) == "*" &&
-                          (*it).left((*it).find('/')) == mimeGroup)))
+                          (*it).left((*it).tqfind('/')) == mimeGroup)))
                     {
                         checkTheMimetypes = true;
                     }
@@ -801,7 +802,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                         ok = true;
                         for (TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)
                         {
-                            if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
+                            if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) ||
                                 ((*itex) == m_sMimeType) )
                             {
                                 ok = false;
@@ -882,27 +883,27 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     const TQString onlyShowIn = service->property("OnlyShowIn", TQVariant::String).toString();
                     if ( !onlyShowIn.isEmpty() ) {
                         const TQStringList aList = TQStringList::split(';', onlyShowIn);
-                        if (!aList.contains("KDE"))
+                        if (!aList.tqcontains("KDE"))
                             continue;
                     }
                     const TQString notShowIn = service->property("NotShowIn", TQVariant::String).toString();
                     if ( !notShowIn.isEmpty() ) {
                         const TQStringList aList = TQStringList::split(';', notShowIn);
-                        if (aList.contains("KDE"))
+                        if (aList.tqcontains("KDE"))
                             continue;
                     }
 
                     TQCString nam;
                     nam.setNum( id );
 
-                    TQString actionName( (*it)->name().replace("&", "&&") );
+                    TQString actionName( (*it)->name().tqreplace("&", "&&") );
                     if ( menu == m_menuElement ) // no submenu -> prefix single offer
                         actionName = i18n( "Open with %1" ).arg( actionName );
 
                     act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0,
-                                       this, TQT_SLOT( slotRunService() ),
+                                       TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
                                        &m_ownActions, nam.prepend( "appservice_" ) );
-                    addAction( act, menu );
+                    tqaddAction( act, menu );
 
                     m_mapPopup[ id++ ] = *it;
                 }
@@ -917,13 +918,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 {
                     openWithActionName = i18n( "&Open With..." );
                 }
-                KAction *openWithAct = new KAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
-                addAction( openWithAct, menu );
+                KAction *openWithAct = new KAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+                tqaddAction( openWithAct, menu );
             }
             else // no app offers -> Open With...
             {
-                act = new KAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
-                addAction( act );
+                act = new KAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+                tqaddAction( act );
             }
 
         }
@@ -976,9 +977,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
     if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
     {
-        act = new KAction( i18n( "&Properties" ), 0, this, TQT_SLOT( slotPopupProperties() ),
+        act = new KAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ),
                            &m_ownActions, "properties" );
-        addAction( act );
+        tqaddAction( act );
     }
 
     while ( !m_menuElement.lastChild().isNull() &&
@@ -990,9 +991,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         if ( KFileShare::authorization() == KFileShare::Authorized )
         {
             addSeparator();
-            act = new KAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ),
+            act = new KAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ),
                                &m_ownActions, "sharefile" );
-            addAction( act );
+            tqaddAction( act );
         }
     }
 
@@ -1034,7 +1035,7 @@ void KonqPopupMenu::slotPopupNewDir()
   if (m_lstPopupURLs.empty())
     return;
 
-  KonqOperations::newDir(d->m_parentWidget, m_lstPopupURLs.first());
+  KonqOperations::newDir(d->m_tqparentWidget, m_lstPopupURLs.first());
 }
 
 void KonqPopupMenu::slotPopupEmptyTrashBin()
@@ -1072,11 +1073,11 @@ void KonqPopupMenu::slotPopupAddToBookmark()
 
 void KonqPopupMenu::slotRunService()
 {
-  TQCString senderName = sender()->name();
-  int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
+  TQCString senderName = TQT_TQOBJECT_CONST(sender())->name();
+  int id = senderName.mid( senderName.tqfind( '_' ) + 1 ).toInt();
 
   // Is it a usual service (application)
-  TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id );
+  TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.tqfind( id );
   if ( it != m_mapPopup.end() )
   {
     KRun::run( **it, m_lstPopupURLs );
@@ -1084,7 +1085,7 @@ void KonqPopupMenu::slotRunService()
   }
 
   // Is it a service specific to desktop entry files ?
-  TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.find( id );
+  TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.tqfind( id );
   if ( it2 != m_mapPopupServices.end() )
   {
       KDEDesktopMimeType::executeService( m_lstPopupURLs, it2.data() );
@@ -1115,19 +1116,19 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog()
         if (item->entry().count() == 0) // this item wasn't listed by a slave
         {
             // KPropertiesDialog will use stat to get more info on the file
-            return new KPropertiesDialog( item->url(), d->m_parentWidget );
+            return new KPropertiesDialog( item->url(), d->m_tqparentWidget );
         }
     }
-    return new KPropertiesDialog( m_lstItems, d->m_parentWidget );
+    return new KPropertiesDialog( m_lstItems, d->m_tqparentWidget );
 }
 
 KAction *KonqPopupMenu::action( const TQDomElement &element ) const
 {
   TQCString name = element.attribute( attrName ).ascii();
-  KAction *res = m_ownActions.action( name );
+  KAction *res = m_ownActions.action( static_cast<const char *>(name) );
 
   if ( !res )
-    res = m_actions.action( name );
+    res = m_actions.action( static_cast<const char *>(name) );
 
   if ( !res && m_pMenuNew && strcmp( name, m_pMenuNew->name() ) == 0 )
     return m_pMenuNew;
@@ -1156,7 +1157,7 @@ void KonqPopupMenu::addPlugins()
     //search for a plugin with the right protocol
     KTrader::OfferList plugin_offers;
     unsigned int pluginCount = 0;
-    plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
+    plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
     if ( plugin_offers.isEmpty() )
         return; // no plugins installed do not bother about it
 
@@ -1170,12 +1171,12 @@ void KonqPopupMenu::addPlugins()
         KonqPopupMenuPlugin *plugin =
             KParts::ComponentFactory::
             createInstanceFromLibrary<KonqPopupMenuPlugin>( TQFile::encodeName( (*iterator)->library() ),
-                                                            this,
+                                                            TQT_TQOBJECT(this),
                                                             (*iterator)->name().latin1() );
         if ( !plugin )
             continue;
         // This make the kuick plugin insert its stuff above "Properties"
-        TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount );
+        TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount );
         addMerge( pluginClientName );
         plugin->domDocument().documentElement().setAttribute( "name", pluginClientName );
         m_pluginList.append( plugin );
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index ee528bc9e..15dbcef5e 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -69,7 +69,7 @@ public:
          // WARNING: bitfield. Next item is 8
 
   /**
-   * @deprecated lacks parentWidget pointer, and
+   * @deprecated lacks tqparentWidget pointer, and
    * uses bool instead of KonqPopupFlags enum,
    * might do strange things with the 'new window' action.
    */
@@ -89,7 +89,7 @@ public:
                  KURL viewURL,
                  KActionCollection & actions,
                  KNewMenu * newMenu,
-		 TQWidget * parentWidget,
+		 TQWidget * tqparentWidget,
 		 bool showPropertiesAndFileType = true ) KDE_DEPRECATED;
 
   /**
@@ -99,7 +99,7 @@ public:
    * @param viewURL the URL shown in the view, to test for RMB click on view background
    * @param actions list of actions the caller wants to see in the menu
    * @param newMenu "New" menu, shared with the File menu, in konqueror
-   * @param parentWidget the widget we're showing this popup for. Helps destroying
+   * @param tqparentWidget the widget we're showing this popup for. Helps destroying
    * the popup if the widget is destroyed before the popup.
    * @param kpf flags from the KonqPopupFlags enum, set by the calling application
    * @param f flags from the BrowserExtension enum, set by the calling part
@@ -117,7 +117,7 @@ public:
                  const KURL& viewURL,
                  KActionCollection & actions,
                  KNewMenu * newMenu,
-                 TQWidget * parentWidget,
+                 TQWidget * tqparentWidget,
                  KonqPopupFlags kpf,
                  KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/);
 
@@ -177,7 +177,7 @@ protected:
   KActionCollection m_ownActions;
 
 private:
-  void init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
+  void init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags);
   void setup(KonqPopupFlags kpf);
   void addPlugins( );
   int  insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin);
@@ -210,7 +210,7 @@ public:
   * Constructor
   * If you want to insert a dynamic item or menu to konqpopupmenu
   * this class is the right choice.
-  * Create a KAction and use _popup->addAction(new KAction );
+  * Create a KAction and use _popup->tqaddAction(new KAction );
   * If you want to create a submenu use _popup->addGroup( );
   */
   KonqPopupMenuPlugin( KonqPopupMenu *_popup, const char *name ); // this should also be the parent
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index 303fe044f..eb9c68bbc 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -40,7 +40,7 @@ static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
     key += _wallpaper;
     KPixmap pix;
 
-    if ( TQPixmapCache::find( key, pix ) )
+    if ( TQPixmapCache::tqfind( key, pix ) )
       return pix;
 
     TQString path = locate("tiles", _wallpaper);
@@ -103,7 +103,7 @@ KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps
   //the default-to-off bias to propagate up.
   if (!config->readBoolEntry("EnableSoundPreviews", false))
   {
-    if (!m_dontPreview.contains("audio/"))
+    if (!m_dontPreview.tqcontains("audio/"))
       m_dontPreview.append("audio/");
   }
 
@@ -234,13 +234,13 @@ bool KonqPropsView::enterDir( const KURL & dir )
         {
 
             if (!config->readBoolEntry("EnableSoundPreviews", false))
-                if (!m_dontPreview.contains("audio/"))
+                if (!m_dontPreview.tqcontains("audio/"))
                     m_dontPreview.append("audio/");
         }
         else
         {
-            if (m_defaultProps->m_dontPreview.contains("audio/"))
-                if (!m_dontPreview.contains("audio/"))
+            if (m_defaultProps->m_dontPreview.tqcontains("audio/"))
+                if (!m_dontPreview.tqcontains("audio/"))
                     m_dontPreview.append("audio/");
         }
     }
@@ -395,7 +395,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show )
 
 void KonqPropsView::setShowingPreview( const TQString &preview, bool show )
 {
-    if ( m_dontPreview.contains( preview ) != show )
+    if ( m_dontPreview.tqcontains( preview ) != show )
         return;
     else if ( show )
         m_dontPreview.remove( preview );
@@ -409,7 +409,7 @@ void KonqPropsView::setShowingPreview( const TQString &preview, bool show )
 
         //Audio is special-cased, as we use a binary setting
         //for it to get it to follow the defaults right.
-        bool audioEnabled = !m_dontPreview.contains("audio/");
+        bool audioEnabled = !m_dontPreview.tqcontains("audio/");
 
         //Don't write it out into the DontPreview line
         if (!audioEnabled)
@@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color )
 const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const
 {
     if ( !m_bgColor.isValid() )
-        return widget->colorGroup().base();
+        return widget->tqcolorGroup().base();
     else
         return m_bgColor;
 }
@@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color )
 const TQColor & KonqPropsView::textColor( TQWidget * widget ) const
 {
     if ( !m_textColor.isValid() )
-        return widget->colorGroup().text();
+        return widget->tqcolorGroup().text();
     else
         return m_textColor;
 }
@@ -567,10 +567,10 @@ const TQStringList& KonqPropsView::previewSettings()
             for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
             {
             TQString name = (*it)->desktopEntryName();
-            if ( ! m_dontPreview.contains(name) )
+            if ( ! m_dontPreview.tqcontains(name) )
                     d->previewsToShow->append( name );
             }
-            if ( ! m_dontPreview.contains( "audio/" ) )
+            if ( ! m_dontPreview.tqcontains( "audio/" ) )
             d->previewsToShow->append( "audio/" );
         }
     }
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index c69b97966..a1d397d18 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -107,7 +107,7 @@ public:
 
   void setShowingPreview( const TQString &preview, bool show );
   void setShowingPreview( bool show );
-  bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.contains(preview); }
+  bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.tqcontains(preview); }
   bool isShowingPreview();
   const TQStringList &previewSettings();
 
@@ -133,7 +133,7 @@ protected:
 
   TQString currentGroup() const {
       return isDefaultProperties() ? 
-          TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties");
+          TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties");
   }
 
 private:
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index d48c7af10..51eb595a5 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -142,14 +142,14 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
             kdDebug(1203) << "No X-KDE-AutoEmbed, looking for group" << endl;
     }
     // 2 - in the configuration for the group if nothing was found in the mimetype
-    TQString serviceTypeGroup = serviceType.left(serviceType.find("/"));
+    TQString serviceTypeGroup = serviceType.left(serviceType.tqfind("/"));
     kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl;
     if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" )
         return true; //always embed mimetype inode/*, Browser/* and Konqueror/*
-    TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup );
+    TQMap<TQString, TQString>::ConstIterator it = m_embedMap.tqfind( TQString::tqfromLatin1("embed-")+serviceTypeGroup );
     if ( it != m_embedMap.end() ) {
         kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl;
-        return it.data() == TQString::fromLatin1("true");
+        return it.data() == TQString::tqfromLatin1("true");
     }
     // 3 - if no config found, use default.
     // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp !
diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cc
index 577dd5dc4..31448a57e 100644
--- a/libkonq/konq_sound.cc
+++ b/libkonq/konq_sound.cc
@@ -71,7 +71,7 @@ const TQStringList &KonqSoundPlayerImpl::mimeTypes()
 			vector<string> *prop = (*it).getProperty("MimeType");
 			for (vector<string>::iterator mt = prop->begin();
 				mt != prop->end(); ++mt)
-				if ((*mt).length()) // && (*mt).find("video/") == string::npos)
+				if ((*mt).length()) // && (*mt).tqfind("video/") == string::npos)
 					m_mimeTypes << (*mt).c_str();
 			delete prop;
 		}
@@ -122,7 +122,7 @@ TQObject *KonqSoundFactory::createObject(TQObject *, const char *,
 	const char *className, const TQStringList &)
 {
 	if (qstrcmp(className, "KonqSoundPlayer") == 0)
-		return new KonqSoundPlayerImpl();
+		return TQT_TQOBJECT(new KonqSoundPlayerImpl());
 	return 0;
 }
 
diff --git a/libkonq/konq_sound.h b/libkonq/konq_sound.h
index 32bddc40f..c0139e763 100644
--- a/libkonq/konq_sound.h
+++ b/libkonq/konq_sound.h
@@ -21,7 +21,7 @@
 
 #include <klibloader.h>
 
-class KonqSoundPlayer : public QObject
+class KonqSoundPlayer : public TQObject
 {
 public:
 	virtual const TQStringList &mimeTypes() = 0;
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index 91eece83b..962c26741 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -135,7 +135,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons
       Q_ASSERT( from.isLocalFile() );
       Q_ASSERT( to.protocol() == "trash" );
       TQMap<TQString, TQString> metaData = job->metaData();
-      TQMap<TQString, TQString>::ConstIterator it = metaData.find( "trashURL-" + from.path() );
+      TQMap<TQString, TQString>::ConstIterator it = metaData.tqfind( "trashURL-" + from.path() );
       if ( it != metaData.end() ) {
           // Update URL
           op.m_dst = it.data();
@@ -317,7 +317,7 @@ void KonqUndoManager::undo()
     }
     else if ( (*it).m_link )
     {
-      if ( !d->m_fileCleanupStack.contains( (*it).m_dst ) )
+      if ( !d->m_fileCleanupStack.tqcontains( (*it).m_dst ) )
         d->m_fileCleanupStack.prepend( (*it).m_dst );
 
       if ( d->m_current.m_type != KonqCommand::MOVE )
@@ -339,7 +339,7 @@ void KonqUndoManager::undo()
     KURL::List::ConstIterator it = d->m_current.m_src.begin();
     KURL::List::ConstIterator end = d->m_current.m_src.end();
     for (; it != end; ++it )
-      if ( !d->m_dirStack.contains( *it) )
+      if ( !d->m_dirStack.tqcontains( *it) )
         d->m_dirStack.push( *it );
   }
   */
@@ -390,7 +390,7 @@ void KonqUndoManager::slotResult( KIO::Job *job )
 
 void KonqUndoManager::addDirToUpdate( const KURL& url )
 {
-  if ( d->m_dirsToUpdate.find( url ) == d->m_dirsToUpdate.end() )
+  if ( d->m_dirsToUpdate.tqfind( url ) == d->m_dirsToUpdate.end() )
     d->m_dirsToUpdate.prepend( url );
 }
 
@@ -652,13 +652,13 @@ TQDataStream &operator>>( TQDataStream &stream, KonqBasicOperation &op )
 
 TQDataStream &operator<<( TQDataStream &stream, const KonqCommand &cmd )
 {
-  stream << cmd.m_valid << (Q_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst;
+  stream << cmd.m_valid << (TQ_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst;
   return stream;
 }
 
 TQDataStream &operator>>( TQDataStream &stream, KonqCommand &cmd )
 {
-  Q_INT8 type;
+  TQ_INT8 type;
   stream >> cmd.m_valid >> type >> cmd.m_opStack >> cmd.m_src >> cmd.m_dst;
   cmd.m_type = static_cast<KonqCommand::Type>( type );
   return stream;
diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h
index 3e704a8d2..6be92033b 100644
--- a/libkonq/konq_undo.h
+++ b/libkonq/konq_undo.h
@@ -68,7 +68,7 @@ struct KonqCommand
   KURL m_dst;
 };
 
-class KonqCommandRecorder : public QObject
+class KonqCommandRecorder : public TQObject
 {
   Q_OBJECT
 public:
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc
index 5561ced8e..1f4d6a13b 100644
--- a/libkonq/konq_xmlguiclient.cc
+++ b/libkonq/konq_xmlguiclient.cc
@@ -70,12 +70,12 @@ TQDomDocument KonqXMLGUIClient::domDocument() const
   return m_doc;
 }
 
-void KonqXMLGUIClient::addAction( KAction *act, const TQDomElement &menu )
+void KonqXMLGUIClient::tqaddAction( KAction *act, const TQDomElement &menu )
 {
-  addAction( act->name(), menu );
+  tqaddAction( act->name(), menu );
 }
 
-void KonqXMLGUIClient::addAction( const char *name, const TQDomElement &menu )
+void KonqXMLGUIClient::tqaddAction( const char *name, const TQDomElement &menu )
 {
   static const TQString& tagAction = KGlobal::staticQString( "action" );
 
diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h
index 772554dd2..596615872 100644
--- a/libkonq/konq_xmlguiclient.h
+++ b/libkonq/konq_xmlguiclient.h
@@ -45,8 +45,8 @@ public:
   TQDomElement DomElement( ) const; // KDE4: s/D/d/
 
 protected:
-  void addAction( KAction *action, const TQDomElement &menu = TQDomElement() );
-  void addAction( const char *name, const TQDomElement &menu = TQDomElement() );
+  void tqaddAction( KAction *action, const TQDomElement &menu = TQDomElement() );
+  void tqaddAction( const char *name, const TQDomElement &menu = TQDomElement() );
   void addSeparator( const TQDomElement &menu = TQDomElement() );
   /// only add a separator if an action is added afterwards
   void addPendingSeparator();
diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h
index 9774d92e9..a45878562 100644
--- a/libkonq/konqbookmarkmanager.h
+++ b/libkonq/konqbookmarkmanager.h
@@ -11,7 +11,7 @@ public:
     static KBookmarkManager * self() {
         if ( !s_bookmarkManager )
         {
-            TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
+            TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
         }
         return s_bookmarkManager;