summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskbar')
-rw-r--r--kicker/taskbar/taskbar.cpp18
-rw-r--r--kicker/taskbar/taskbar.h4
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp14
-rw-r--r--kicker/taskbar/taskbarcontainer.h2
-rw-r--r--kicker/taskbar/taskcontainer.cpp44
5 files changed, 41 insertions, 41 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 4da304daf..3366f1be3 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqapplication.h>
#include <tqbitmap.h>
#include <tqdesktopwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqstringlist.h>
@@ -66,7 +66,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name )
blocklayout = true;
// init
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
// setup animation frames
for (int i = 1; i < 11; i++)
@@ -160,7 +160,7 @@ KTextShadowEngine *TaskBar::textShadowEngine()
}
-TQSize TaskBar::tqsizeHint() const
+TQSize TaskBar::sizeHint() const
{
// get our minimum height based on the minimum button height or the
// height of the font in use, which is largest
@@ -171,7 +171,7 @@ TQSize TaskBar::tqsizeHint() const
return TQSize(BUTTON_MIN_WIDTH, minButtonHeight);
}
-TQSize TaskBar::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const
+TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
// get our minimum height based on the minimum button height or the
// height of the font in use, which is largest
@@ -898,9 +898,9 @@ void TaskBar::propagateMouseEvent( TQMouseEvent* e )
{
if ( !isTopLevel() )
{
- TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ),
+ TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ),
e->globalPos(), e->button(), e->state() );
- TQApplication::sendEvent( tqtopLevelWidget(), &me );
+ TQApplication::sendEvent( topLevelWidget(), &me );
}
}
@@ -1074,7 +1074,7 @@ void TaskBar::activateNextTask(bool forward)
TaskContainer::List::iterator it;
for (int i = 0; i < numContainers; ++i)
{
- it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
+ it = forward ? list.at(i) : list.at(numContainers - i - 1);
if (it != list.end() && (*it)->activateNextTask(forward, forcenext))
{
@@ -1087,7 +1087,7 @@ void TaskBar::activateNextTask(bool forward)
// moving forward from the last, or backward from the first, loop around
for (int i = 0; i < numContainers; ++i)
{
- it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
+ it = forward ? list.at(i) : list.at(numContainers - i - 1);
if (it != list.end() && (*it)->activateNextTask(forward, forcenext))
{
@@ -1101,7 +1101,7 @@ void TaskBar::activateNextTask(bool forward)
forcenext = true; // select first
for (int i = 0; i < numContainers; ++i)
{
- it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
+ it = forward ? list.at(i) : list.at(numContainers - i - 1);
if (it == list.end())
{
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 40b02b6ea..9f56565e3 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( TQt::ArrowType at );
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 404c27e24..754894d17 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <dcopclient.h>
@@ -135,7 +135,7 @@ void TaskBarContainer::configure()
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel,
16));
- windowListButton->setMinimumSize(windowListButton->tqsizeHint());
+ windowListButton->setMinimumSize(windowListButton->sizeHint());
layout->insertWidget(0, windowListButton);
windowListButton->show();
}
@@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel,
16));
- windowListButton->setMinimumSize(windowListButton->tqsizeHint());
+ windowListButton->setMinimumSize(windowListButton->sizeHint());
}
}
@@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu()
pos.setX( pos.x() + width() );
break;
case KPanelApplet::Left:
- pos.setX( pos.x() - windowListMenu->tqsizeHint().width() );
+ pos.setX( pos.x() - windowListMenu->sizeHint().width() );
break;
case KPanelApplet::Down:
pos.setY( pos.y() + height() );
break;
case KPanelApplet::Up:
- pos.setY( pos.y() - windowListMenu->tqsizeHint().height() );
+ pos.setY( pos.y() - windowListMenu->sizeHint().height() );
default:
break;
}
@@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton()
connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
}
-TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const
+TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
{
- TQSize size = taskBar->tqsizeHint( p, maxSize );
+ TQSize size = taskBar->sizeHint( p, maxSize );
if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) {
return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE );
}
diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h
index e0e4f0dce..87a55c2b9 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -48,7 +48,7 @@ public:
void popupDirectionChange( KPanelApplet::Direction );
void preferences();
//FIXME: don't use Position, use Orientation
- TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const;
+ TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const;
void setBackground();
k_dcop:
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 7d0e4d3cd..0bf40a2c7 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqstyle.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqtooltip.h>
#include <kapplication.h>
@@ -233,9 +233,9 @@ void TaskContainer::setLastActivated()
void TaskContainer::animationTimerFired()
{
- if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end())
+ if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end())
{
- TQPixmap *pm = *frames.tqat(currentFrame);
+ TQPixmap *pm = *frames.at(currentFrame);
// draw pixmap
if ( pm && !pm->isNull() ) {
@@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * )
{
// calculate the icon rect
TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) );
- iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
+ iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
}
void TaskContainer::add(Task::Ptr task)
@@ -477,7 +477,7 @@ void TaskContainer::paintEvent( TQPaintEvent* )
}
TQPainter p;
- p.tqbegin(pm ,this);
+ p.begin(pm ,this);
drawButton(&p);
p.end();
@@ -533,7 +533,7 @@ void TaskContainer::drawButton(TQPainter *p)
font.setBold(active);
- TQColorGroup colors = tqpalette().active();
+ TQColorGroup colors = palette().active();
if (TaskBarSettings::useCustomColors())
{
@@ -583,8 +583,8 @@ void TaskContainer::drawButton(TQPainter *p)
bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
bool reverse = TQApplication::reverseLayout();
TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this));
- TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal),
- tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical));
+ TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
+ tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical));
// draw button background
if (drawButton)
@@ -653,7 +653,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw modified overlay
if (!modPixmap.isNull())
{
- TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos,
+ TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,
(height() - 16) / 2, 16, 16),
this);
@@ -670,7 +670,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw text
if (!text.isEmpty())
{
- TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0,
+ TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0,
width() - textPos, height()),
this);
int textFlags = AlignVCenter | SingleLine;
@@ -736,7 +736,7 @@ void TaskContainer::drawButton(TQPainter *p)
TQPaintDevice* opd = p->device();
p->end();
pm->convertFromImage(img);
- p->tqbegin(opd ,this);
+ p->begin(opd ,this);
}
else
{
@@ -754,9 +754,9 @@ void TaskContainer::drawButton(TQPainter *p)
}
}
- if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end())
+ if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end())
{
- TQPixmap *anim = *frames.tqat(currentFrame);
+ TQPixmap *anim = *frames.at(currentFrame);
if (anim && !anim->isNull())
{
@@ -787,7 +787,7 @@ void TaskContainer::drawButton(TQPainter *p)
}
int flags = TQStyle::Style_Enabled;
- TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2,
+ TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2,
br.y(), 8, br.height()), this);
if (sunken)
{
@@ -799,7 +799,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw mouse over frame in transparent mode
if (m_mouseOver && halo)
- KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground());
+ KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground());
if (aboutToActivate)
{
@@ -830,13 +830,13 @@ TQString TaskContainer::name()
// in common, and then use everything UP TO that as the name in the button
while (i < maxLength)
{
- TQChar check = match.tqat(i).lower();
+ TQChar check = match.at(i).lower();
Task::List::iterator itEnd = m_filteredTasks.end();
for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it)
{
// we're doing a lot of Utf8 -> TQString conversions here
// by repeatedly calling visibleIconicName() =/
- if (check != (*it)->visibleName().tqat(i).lower())
+ if (check != (*it)->visibleName().at(i).lower())
{
if (i > 0)
{
@@ -856,7 +856,7 @@ TQString TaskContainer::name()
}
// strip trailing crap
- while (i > 0 && !match.tqat(i).isLetterOrNumber())
+ while (i > 0 && !match.at(i).isLetterOrNumber())
{
--i;
}
@@ -1161,17 +1161,17 @@ void TaskContainer::popupMenu(int action)
pos.setX(pos.x() + width());
break;
case LeftArrow:
- pos.setX(pos.x() - m_menu->tqsizeHint().width());
+ pos.setX(pos.x() - m_menu->sizeHint().width());
break;
case DownArrow:
if ( TQApplication::reverseLayout() )
- pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() );
+ pos.setX( pos.x() + width() - m_menu->sizeHint().width() );
pos.setY( pos.y() + height() );
break;
case UpArrow:
if ( TQApplication::reverseLayout() )
- pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() );
- pos.setY(pos.y() - m_menu->tqsizeHint().height());
+ pos.setX( pos.x() + width() - m_menu->sizeHint().width() );
+ pos.setY(pos.y() - m_menu->sizeHint().height());
break;
default:
break;