From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kicker/taskbar/taskbar.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kicker/taskbar/taskbar.h')

diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 0c45657cf..ff160bc92 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -47,8 +47,8 @@ public:
     TaskBar( TQWidget *parent = 0, const char *name = 0 );
     ~TaskBar();
 
-    TQSize tqsizeHint() const;
-    TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const;
+    TQSize sizeHint() const;
+    TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const;
 
     void setOrientation( Orientation );
     void setArrowType( Qt::ArrowType at );
@@ -108,7 +108,7 @@ private:
     void sortContainersByDesktop(TaskContainer::List& list);
     void setViewportBackground();
 
-    bool			blocktqlayout;
+    bool			blocklayout;
     bool			m_showAllWindows;
     // The screen to show, -1 for all screens
     int 			m_currentScreen;
@@ -127,7 +127,7 @@ private:
     void                        reGroup();
     KGlobalAccel*               keys;
     KTextShadowEngine* m_textShadowEngine;
-    TQTimer m_retqlayoutTimer;
+    TQTimer m_relayoutTimer;
     bool m_ignoreUpdates;
     TQImage m_blendGradient;
 };
-- 
cgit v1.2.1