summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar/taskbarcontainer.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kicker/taskbar/taskbarcontainer.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/taskbar/taskbarcontainer.cpp')
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 661706bdb..0101ae59d 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -63,20 +63,20 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const ch
margin = 0;
}
- layout = new TQBoxLayout( this, TQApplication::reverseLayout() ?
+ tqlayout = new TQBoxLayout( this, TQApplication::reverseLayout() ?
TQBoxLayout::RightToLeft :
TQBoxLayout::LeftToRight );
- layout->setMargin( margin );
+ tqlayout->setMargin( margin );
// scrollable taskbar
taskBar = new TaskBar(this);
- layout->addWidget( taskBar );
+ tqlayout->addWidget( taskBar );
connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) );
setBackground();
- // read settings and setup layout
+ // read settings and setup tqlayout
configure();
connectDCOPSignal("", "", "kdeTaskBarConfigChanged()",
@@ -110,7 +110,7 @@ void TaskBarContainer::configure()
connect(windowListMenu, TQT_SIGNAL(aboutToHide()),
TQT_SLOT(windowListMenuAboutToHide()));
- // geometry
+ // tqgeometry
TQString icon;
switch (direction)
{
@@ -135,8 +135,8 @@ void TaskBarContainer::configure()
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel,
16));
- windowListButton->setMinimumSize(windowListButton->sizeHint());
- layout->insertWidget(0, windowListButton);
+ windowListButton->setMinimumSize(windowListButton->tqsizeHint());
+ tqlayout->insertWidget(0, windowListButton);
windowListButton->show();
}
}
@@ -175,7 +175,7 @@ void TaskBarContainer::orientationChange(Orientation o)
windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE);
windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH);
}
- layout->setDirection(TQApplication::reverseLayout() ?
+ tqlayout->setDirection(TQApplication::reverseLayout() ?
TQBoxLayout::RightToLeft :
TQBoxLayout::LeftToRight);
}
@@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o)
windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH);
windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE);
}
- layout->setDirection(TQBoxLayout::TopToBottom);
+ tqlayout->setDirection(TQBoxLayout::TopToBottom);
}
taskBar->setOrientation(o);
@@ -194,7 +194,7 @@ void TaskBarContainer::orientationChange(Orientation o)
{
windowListButton->setOrientation(o);
}
- layout->activate();
+ tqlayout->activate();
}
void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
@@ -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 );
}