From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 19 Jan 2011 01:42:14 +0000
Subject: 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
---
 kicker/taskbar/taskbarcontainer.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kicker/taskbar/taskbarcontainer.cpp')

diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 661706bdb..bfd1a40bf 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -135,7 +135,7 @@ void TaskBarContainer::configure()
         windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
                                                                  KIcon::Panel,
                                                                  16));
-        windowListButton->setMinimumSize(windowListButton->sizeHint());
+        windowListButton->setMinimumSize(windowListButton->tqsizeHint());
         layout->insertWidget(0, windowListButton);
         windowListButton->show();
     }
@@ -168,7 +168,7 @@ void TaskBarContainer::preferences()
 
 void TaskBarContainer::orientationChange(Orientation o)
 {
-    if (o == Horizontal)
+    if (o == Qt::Horizontal)
      {
         if (windowListButton)
         {
@@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
         windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
                                                                  KIcon::Panel,
                                                                  16));
-        windowListButton->setMinimumSize(windowListButton->sizeHint());
+        windowListButton->setMinimumSize(windowListButton->tqsizeHint());
     }
 }
 
@@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu()
             pos.setX( pos.x() + width() );
             break;
         case KPanelApplet::Left:
-            pos.setX( pos.x() - windowListMenu->sizeHint().width() );
+            pos.setX( pos.x() - windowListMenu->tqsizeHint().width() );
             break;
         case KPanelApplet::Down:
             pos.setY( pos.y() + height() );
             break;
         case KPanelApplet::Up:
-            pos.setY( pos.y() - windowListMenu->sizeHint().height() );
+            pos.setY( pos.y() - windowListMenu->tqsizeHint().height() );
         default:
             break;
     }
@@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton()
     connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
 }
 
-TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
+TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const
 {
-    TQSize size = taskBar->sizeHint( p, maxSize );
+    TQSize size = taskBar->tqsizeHint( p, maxSize );
     if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) {
         return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE );
     }
-- 
cgit v1.2.1