Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

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

15 files changed, 51 insertions, 51 deletions

diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index d00605c82..2c7ae8a47 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
     else
 	return;
 
-    DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
+    DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name());
 
     if (bookmark.isGroup()) {
         KBookmarkGroup group = bookmark.toGroup();
@@ -443,7 +443,7 @@ void KonqSidebarBookmarkModule::slotBookmarksChanged( const TQString & groupAddr
     m_ignoreOpenChange = true;
 
     // update the right part of the tree
-    KBookmarkGroup group = KonqBookmarkManager::self()->findByAddress( groupAddress ).toGroup();
+    KBookmarkGroup group = KonqBookmarkManager::self()->tqfindByAddress( groupAddress ).toGroup();
     KonqSidebarBookmarkItem * item = findByAddress( groupAddress );
     Q_ASSERT(!group.isNull());
     Q_ASSERT(item);
@@ -484,7 +484,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
                 fillGroup( item, grp );
 
                 TQString address(grp.address());
-                if (m_folderOpenState.contains(address))
+                if (m_folderOpenState.tqcontains(address))
                     item->setOpen(m_folderOpenState[address]);
                 else
                     item->setOpen(false);
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 811867b14..58c1c86cf 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon()
     return m_fileItem->iconName() == "folder";
 }
 
-void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
+void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
 {
     if (m_fileItem->isLink())
     {
@@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup
         f.setItalic( TRUE );
         _painter->setFont( f );
     }
-    TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment );
+    TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment );
 }
 
 KURL KonqSidebarDirTreeItem::externalURL() const
@@ -134,7 +134,7 @@ TQString KonqSidebarDirTreeItem::externalMimeType() const
 
 bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats )
 {
-    if ( formats.contains("text/uri-list") )
+    if ( formats.tqcontains("text/uri-list") )
         return m_fileItem->acceptsDrops();
     return false;
 }
@@ -163,7 +163,7 @@ void KonqSidebarDirTreeItem::itemSelected()
         bInTrash = true;
 
     TQMimeSource *data = TQApplication::clipboard()->data();
-    bool paste = ( data->encodedData( data->format() ).size() != 0 );
+    bool paste = ( data->tqencodedData( data->format() ).size() != 0 );
 
     tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
 }
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
index 050f19424..3a599c7e9 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h
@@ -36,7 +36,7 @@ public:
 
     virtual void setOpen( bool open );
 
-    virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
+    virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
 
     virtual bool acceptsDrops( const TQStrList & formats );
     virtual void drop( TQDropEvent * ev );
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index ac26b1285..401c4985a 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
     if (openItem)
     {
        // We have this directory listed already, just copy the entries as we
-       // can't use the dirlister, it would invalidate the old entries
+       // can't use the dirlister, it would tqinvalidate the old entries
        int size = KGlobal::iconLoader()->currentSize( KIcon::Small );
        KonqSidebarTreeItem * parentItem = item;
        KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild());
@@ -549,7 +549,7 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL
 
     do 
     {
-	if (item->alias.contains(newUrlStr)) continue;
+	if (item->alias.tqcontains(newUrlStr)) continue;
 	kdDebug()<<"Redirectiong element"<<endl;
         // We need to update the URL in m_dictSubDirs
         m_dictSubDirs.insert( newUrlStr, item );
@@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url )
         if ( item->childCount() == 0 )
         {
             item->setExpandable( false );
-            item->repaint();
+            item->tqrepaint();
         }
         m_pTree->stopAnimation( item );
         
diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui
index 32fd31296..efffe5982 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KonqHistoryDlg</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>240</width>
                             <height>16</height>
@@ -193,7 +193,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>418</width>
                             <height>0</height>
@@ -212,7 +212,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>30</height>
@@ -224,8 +224,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 981be03bb..844f963a4 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -126,10 +126,10 @@ TQString KonqSidebarHistoryItem::toolTipText() const
 }
 
 void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
-				 int column, int width, int alignment )
+				 int column, int width, int tqalignment )
 {
     TQDateTime dt;
-    TQDateTime current = TQDateTime::currentDateTime();
+    TQDateTime current = TQDateTime::tqcurrentDateTime();
 
     if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
 	dt = current.addDays( - s_settings->m_valueYoungerThan );
@@ -149,7 +149,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
 	    p->setFont( s_settings->m_fontOlderThan );
     }
 
-    KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment );
+    KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 ///////////////////////////////////////////////////////////////////
diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h
index 1c6c7c4c4..0ddc7ae4e 100644
--- a/konqueror/sidebar/trees/history_module/history_item.h
+++ b/konqueror/sidebar/trees/history_module/history_item.h
@@ -60,7 +60,7 @@ public:
     static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; }
 
     virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column, 
-			    int width, int alignment );
+			    int width, int tqalignment );
 
 private:
     const KonqHistoryEntry *m_entry;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a3806be94..a29a2fe0c 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
     connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
 
     m_dict.setAutoDelete( true );
-    m_currentTime = TQDateTime::currentDateTime();
+    m_currentTime = TQDateTime::tqcurrentDateTime();
 
     KConfig *kc = KGlobal::config();
     KConfigGroupSaver cs( kc, "HistorySettings" );
@@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
     KonqHistoryEntry *entry;
     KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
     KonqHistoryIterator it( entries );
-    m_currentTime = TQDateTime::currentDateTime();
+    m_currentTime = TQDateTime::tqcurrentDateTime();
 
     // the group item and the item of the serverroot '/' get a fav-icon
     // if available. All others get the protocol icon.
@@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
     if ( !m_initialized )
 	return;
 
-    m_currentTime = TQDateTime::currentDateTime();
+    m_currentTime = TQDateTime::tqcurrentDateTime();
     KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
     KonqSidebarHistoryItem *item = group->findChild( entry );
     if ( !item )
@@ -185,7 +185,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
     t->lockScrolling( true );
     group->sort();
     m_topLevelItem->sort();
-    qApp->processOneEvent();
+    tqApp->processOneEvent();
     t->lockScrolling( false );
 }
 
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 6871415a0..20ca214d4 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global)
     m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
     m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
 
-    TQString minutes = TQString::fromLatin1("minutes");
-    TQString days = TQString::fromLatin1("days");
+    TQString minutes = TQString::tqfromLatin1("minutes");
+    TQString days = TQString::tqfromLatin1("days");
     TQString metric = config->readEntry("Metric youngerThan", days );
     m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
     metric = config->readEntry("Metric olderThan", days );
@@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
     config->writeEntry("Value youngerThan", m_valueYoungerThan );
     config->writeEntry("Value olderThan", m_valueOlderThan );
 
-    TQString minutes = TQString::fromLatin1("minutes");
-    TQString days = TQString::fromLatin1("days");
+    TQString minutes = TQString::tqfromLatin1("minutes");
+    TQString days = TQString::tqfromLatin1("days");
     config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
 			  days : minutes );
     config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index ccedf65d9..532e3a164 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -144,8 +144,8 @@ void HistorySidebarConfig::load()
 
 void HistorySidebarConfig::save()
 {
-    Q_UINT32 age   = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
-    Q_UINT32 count = dialog->spinEntries->value();
+    TQ_UINT32 age   = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
+    TQ_UINT32 count = dialog->spinEntries->value();
 
     KConfig config("konquerorrc");
     config.setGroup("HistorySettings");
@@ -156,13 +156,13 @@ void HistorySidebarConfig::save()
     TQDataStream streamAge( dataAge, IO_WriteOnly );
     streamAge << age << "foo";
     kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
-			      "notifyMaxAge(Q_UINT32, TQCString)", dataAge );
+			      "notifyMaxAge(TQ_UINT32, TQCString)", dataAge );
 
     TQByteArray dataCount;
     TQDataStream streamCount( dataCount, IO_WriteOnly );
     streamCount << count << "foo";
     kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
-			      "notifyMaxCount(Q_UINT32, TQCString)", dataCount );
+			      "notifyMaxCount(TQ_UINT32, TQCString)", dataCount );
 
     m_settings->m_valueYoungerThan = dialog->spinNewer->value();
     m_settings->m_valueOlderThan   = dialog->spinOlder->value();
diff --git a/konqueror/sidebar/trees/init/home.desktop b/konqueror/sidebar/trees/init/home.desktop
index d18f98466..d91617b92 100644
--- a/konqueror/sidebar/trees/init/home.desktop
+++ b/konqueror/sidebar/trees/init/home.desktop
@@ -76,7 +76,7 @@ Name[vi]=Thư mục Nhà
 Name[wa]=Ridant måjhon
 Name[zh_CN]=主文件夹
 Name[zh_TW]=家目錄
-Comment=This folder contains your personal files
+Comment=This folder tqcontains your personal files
 Comment[af]=Hierdie kabinet bevat jou persoonlike lêers
 Comment[ar]=هذا المجلّد يحتوي على ملفاتك الخاصة
 Comment[az]=Bütün şəxsi fayllarınız bu qovluqda yer alır
diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop
index 490b4ef7f..9a43fe03a 100644
--- a/konqueror/sidebar/trees/init/system.desktop
+++ b/konqueror/sidebar/trees/init/system.desktop
@@ -111,11 +111,11 @@ Comment[kk]=Бұл қапшық компьютердегі ортақ орынд
 Comment[km]=ថត​នេះ​អនុញ្ញាត​ឲ្យអ្នក​ចូលដំណើរការ​កន្លែង​ទូទៅ​លើកុំព្យូទ័រ​របស់​អ្នក
 Comment[lt]=Šio aplanko padedami pasieksite dažniausiai lankomas kompiuterio vietas
 Comment[mk]=Оваа папка ви овозможува пристап до вообичаените места на вашиот компјутер
-Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin
+Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datatqmaskin
 Comment[nds]=Mit dissen Orner kannst Du op en Reeg faken bruukte Öörd togriepen
 Comment[ne]=यो फोल्डरले तपाईँलाई कम्प्युटरको साझा स्थानहरूमा पहुँच अनुमति दिन्छ
 Comment[nl]=Deze map geeft toegang tot algemene plekken van uw desktop
-Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina
+Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datatqmaskina
 Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ
 Comment[pl]=Ten folder umożliwia dostęp do najczęściej używanych miejsc w Twoim komputerze
 Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index c1c98e07a..0ce8f9d52 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -55,7 +55,7 @@ static const int autoOpenTimeout = 750;
 
 getModule KonqSidebarTree::getPluginFactory(TQString name)
 {
-  if (!pluginFactories.contains(name))
+  if (!pluginFactories.tqcontains(name))
   {
     KLibLoader *loader = KLibLoader::self();
     TQString libName    = pluginInfo[name];
@@ -114,8 +114,8 @@ public:
 };
 
 
-KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path )
-    : KListView( parentWidget ),
+KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path )
+    : KListView( tqparentWidget ),
       m_currentTopLevelItem( 0 ),
       m_toolTip( this ),
       m_scrollingLocked( false ),
@@ -272,7 +272,7 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e )
     TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) );
 
     // Accept drops on the background, if URLs
-    if ( !item && m_lstDropFormats.contains("text/uri-list") )
+    if ( !item && m_lstDropFormats.tqcontains("text/uri-list") )
     {
         m_dropItem = 0;
         e->acceptAction();
@@ -417,7 +417,7 @@ bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const
 {
     // for KListViewMode...
     for( int i = 0; e->format( i ); i++ )
-        if ( d->m_dropFormats.contains(e->format( i ) ) )
+        if ( d->m_dropFormats.tqcontains(e->format( i ) ) )
             return true;
     return false;
 }
@@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder()
         return;
 
     m_dropItem->setOpen( true );
-    m_dropItem->repaint();
+    m_dropItem->tqrepaint();
 }
 
 void KonqSidebarTree::rescanConfiguration()
@@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
             // Version 5 includes the audiocd browser
             // Version 6 includes the printmanager and lan browser
             const int currentVersion = 6;
-            TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
+            TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber");
             KSimpleConfig versionCfg( path + "/.directory" );
             int versionNumber = versionCfg.readNumEntry( key, 1 );
             kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@@ -650,9 +650,9 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
 	                TQStringList::ConstIterator eEnd = globalDirEntries.end();
         	        for (; eIt != eEnd; ++eIt )
                 	{
-	                    //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
+	                    //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir tqcontains " << *eIt << endl;
         	            if ( *eIt != "." && *eIt != ".."
-                	         && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
+                	         && !entries.tqcontains( *eIt ) && !dirEntries.tqcontains( *eIt ) )
 	                    { // we don't have that one yet -> copy it.
                 	        TQString cp("cp -R -- ");
         	                cp += KProcess::quote(dirtree_dir + *eIt);
@@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation()
     for (; it != end; ++it )
     {
         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 ) );
         it.key()->setPixmap( 0, SmallIcon( icon));
 
         iconNumber++;
@@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
 bool KonqSidebarTree::tabSupport()
 {
     // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror)
-   DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+   DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
     DCOPReply reply = ref.call("functions()");
     if (reply.isValid()) {
         QCStringList funcs;
@@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
 void KonqSidebarTree::slotOpenTab()
 {
     if (!m_currentTopLevelItem) return;
-    DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name());
+    DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name());
     ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
 }
 
@@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
     if ( item ) {
 	TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
 	if ( !text.isEmpty() )
-	    tip ( m_view->itemRect( item ), text );
+	    tip ( m_view->tqitemRect( item ), text );
     }
 }
 
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index 269803a84..8cfb2106c 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify
 {
     Q_OBJECT
 public:
-    KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
+    KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path );
     virtual ~KonqSidebarTree();
 
     void followURL( const KURL &url );
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 4ce6fe445..d526a826f 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -57,7 +57,7 @@ void KonqSidebarTreeTopLevelItem::itemSelected()
 
 bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats )
 {
-    return formats.contains("text/uri-list") &&
+    return formats.tqcontains("text/uri-list") &&
         ( m_bTopLevelGroup || !externalURL().isEmpty() );
 }