From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 15 Feb 2011 19:15:16 +0000
Subject: Allow kdebase to (mostly) function correctly with TQt for Qt4 Fix
 kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the
 patch) Fix a newly invalidated section of code under GCC 4.5.2
 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp | 6 +++---
 konqueror/sidebar/trees/konq_sidebartree.cpp                | 4 ++--
 konqueror/sidebar/trees/konqsidebar_tree.cpp                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'konqueror/sidebar/trees')

diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index e79ed82df..b0d818c62 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -413,9 +413,9 @@ void KonqSidebarBookmarkModule::slotCopyLocation()
     if ( !bookmark.isGroup() )
     {
         kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
-                                    QClipboard::Selection );
+                                    TQClipboard::Selection );
         kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0),
-                                    QClipboard::Clipboard );
+                                    TQClipboard::Clipboard );
     }
 }
 
@@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
                     item->setOpen(false);
             }
             else if ( bk.isSeparator() )
-                item->setVisible( false );
+                item->tqsetVisible( false );
             else
                 item->setExpandable( false );
     }
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 9b342f20e..404a2f2c5 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -1031,8 +1031,8 @@ void KonqSidebarTree::slotCopyLocation()
 {
     if (!m_currentTopLevelItem) return;
     KURL url = m_currentTopLevelItem->externalURL();
-    kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Selection );
-    kapp->tqclipboard()->setData( new KURLDrag(url, 0), QClipboard::Clipboard );
+    kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Selection );
+    kapp->tqclipboard()->setData( new KURLDrag(url, 0), TQClipboard::Clipboard );
 }
 
 ///////////////////////////////////////////////////////////////////
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 2711c723a..fc53039b6 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -150,7 +150,7 @@ extern "C"
 		{
 			int id=names.tqfindIndex( item );
 			if (id==-1) return false;
-			KSimpleConfig ksc2(*list.at(id));
+			KSimpleConfig ksc2(*list.tqat(id));
 			ksc2.setGroup("Desktop Entry");
 		        map->insert("Type","Link");
 			map->insert("Icon",ksc2.readEntry("Icon"));
-- 
cgit v1.2.1