From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson 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/applets/taskbar/taskbarapplet.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kicker/applets/taskbar') diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index a8a952962..55e5d113f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -56,11 +56,11 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions : KPanelApplet( configFile, type, actions, parent, name ) { setBackgroundOrigin( AncestorOrigin ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, this ); container->setBackgroundOrigin( AncestorOrigin ); connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); - tqlayout->addWidget( container, 1 ); + layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() -- cgit v1.2.1