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
---
 kicker/applets/launcher/quickbuttongroup.h | 6 +++---
 kicker/applets/launcher/quicklauncher.cpp  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kicker/applets/launcher')

diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h
index 85f28845c..d96e72140 100644
--- a/kicker/applets/launcher/quickbuttongroup.h
+++ b/kicker/applets/launcher/quickbuttongroup.h
@@ -24,15 +24,15 @@ public:
     void setDragging(bool drag);
     void setEnableDrag(bool enable);
     void deleteContents();
-    void setUpdatesEnabled(bool enable);
+    void tqsetUpdatesEnabled(bool enable);
 };
 
 QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
 {   return findProperty(desc, std::mem_fun(&QuickButton::url));}
 
-inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
+inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable)
 {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
-        (*i)->setUpdatesEnabled(enable);
+        (*i)->tqsetUpdatesEnabled(enable);
         if (enable) { (*i)->update();}
     }
 }
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 9c1228a2d..85bea706e 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -741,8 +741,8 @@ void QuickLauncher::refreshContents()
 
     unsigned index;
     TQPoint pos;
-    setUpdatesEnabled(false);
-    m_buttons->setUpdatesEnabled(false);
+    tqsetUpdatesEnabled(false);
+    m_buttons->tqsetUpdatesEnabled(false);
     for (index = 0; index < m_buttons->size(); index++)
     {
         pos = m_manager->pos(index);
@@ -762,9 +762,9 @@ void QuickLauncher::refreshContents()
         m_dragButtons->setDragging(true);
     }
     m_buttons->show();
-    setUpdatesEnabled(true);
+    tqsetUpdatesEnabled(true);
     update();
-    m_buttons->setUpdatesEnabled(true);
+    m_buttons->tqsetUpdatesEnabled(true);
     updateGeometry();
     emit updateLayout();
     updateStickyHighlightLayer();
-- 
cgit v1.2.1