summaryrefslogtreecommitdiffstats
path: root/twin/clients/b2/b2client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'twin/clients/b2/b2client.cpp')
-rw-r--r--twin/clients/b2/b2client.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index afef7799f..571b16909 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -82,7 +82,7 @@ static bool drawSmallBorders = false;
// =====================================
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
{
return new B2::B2ClientFactory();
}
@@ -444,9 +444,9 @@ bool B2Client::isModalSystemNotification()
result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
if (result == Success && data != None && format == 32 )
{
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void B2Client::addButtons(const TQString& s, const TQString tips[],
@@ -464,8 +464,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
TQt::LeftButton | TQt::RightButton);
button[BtnMenu]->setPixmaps(P_MENU);
button[BtnMenu]->setUseMiniIcon();
- connect(button[BtnMenu], TQT_SIGNAL(pressed()),
- this, TQT_SLOT(menuButtonPressed()));
+ connect(button[BtnMenu], TQ_SIGNAL(pressed()),
+ this, TQ_SLOT(menuButtonPressed()));
titleLayout->addWidget(button[BtnMenu]);
}
}
@@ -477,8 +477,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
button[BtnSticky]->setPixmaps(P_PINUP);
button[BtnSticky]->setToggle();
button[BtnSticky]->setDown(isOnAllDesktops());
- connect(button[BtnSticky], TQT_SIGNAL(clicked()),
- this, TQT_SLOT(toggleOnAllDesktops()));
+ connect(button[BtnSticky], TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(toggleOnAllDesktops()));
titleLayout->addWidget(button[BtnSticky]);
}
}
@@ -487,8 +487,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
if (providesContextHelp() && (!button[BtnHelp])) {
button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]);
button[BtnHelp]->setPixmaps(P_HELP);
- connect(button[BtnHelp], TQT_SIGNAL(clicked()),
- this, TQT_SLOT(showContextHelp()));
+ connect(button[BtnHelp], TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(showContextHelp()));
titleLayout->addWidget(button[BtnHelp]);
}
break;
@@ -496,8 +496,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
if (isMinimizable() && (!button[BtnIconify])) {
button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]);
button[BtnIconify]->setPixmaps(P_ICONIFY);
- connect(button[BtnIconify], TQT_SIGNAL(clicked()),
- this, TQT_SLOT(minimize()));
+ connect(button[BtnIconify], TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(minimize()));
titleLayout->addWidget(button[BtnIconify]);
}
break;
@@ -507,8 +507,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
TQt::LeftButton | TQt::MidButton | TQt::RightButton);
button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
P_NORMALIZE : P_MAX);
- connect(button[BtnMax], TQT_SIGNAL(clicked()),
- this, TQT_SLOT(maxButtonClicked()));
+ connect(button[BtnMax], TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(maxButtonClicked()));
titleLayout->addWidget(button[BtnMax]);
}
break;
@@ -516,8 +516,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
if (isCloseable() && !button[BtnClose]) {
button[BtnClose] = new B2Button(this, tb, tips[BtnClose]);
button[BtnClose]->setPixmaps(P_CLOSE);
- connect(button[BtnClose], TQT_SIGNAL(clicked()),
- this, TQT_SLOT(closeWindow()));
+ connect(button[BtnClose], TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(closeWindow()));
titleLayout->addWidget(button[BtnClose]);
}
break;
@@ -525,8 +525,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
if (isShadeable() && !button[BtnShade]) {
button[BtnShade] = new B2Button(this, tb, tips[BtnShade]);
button[BtnShade]->setPixmaps(P_SHADE);
- connect(button[BtnShade], TQT_SIGNAL(clicked()),
- this, TQT_SLOT(shadeButtonClicked()));
+ connect(button[BtnShade], TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(shadeButtonClicked()));
titleLayout->addWidget(button[BtnShade]);
}
break;
@@ -534,8 +534,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
if (resizable && !button[BtnResize]) {
button[BtnResize] = new B2Button(this, tb, tips[BtnResize]);
button[BtnResize]->setPixmaps(P_RESIZE);
- connect(button[BtnResize], TQT_SIGNAL(pressed()),
- this, TQT_SLOT(resizeButtonPressed()));
+ connect(button[BtnResize], TQ_SIGNAL(pressed()),
+ this, TQ_SLOT(resizeButtonPressed()));
titleLayout->addWidget(button[BtnResize]);
}
break;
@@ -982,7 +982,7 @@ static void redraw_pixmaps()
TQColor color = is_act ? aGrp.button() : iGrp.button();
drawB2Rect(&thinBox, color, is_down);
pix->fill(TQt::black);
- bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox),
+ bitBlt(pix, 0, 0, &thinBox,
0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true);
}
@@ -1005,12 +1005,12 @@ static void redraw_pixmaps()
drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down);
pix->fill(options()->color(KDecoration::ColorTitleBar, is_act));
- bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox),
+ bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox,
0, 0, 12, 12, TQt::CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+ bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
- bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0,
- TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+ bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0,
+ &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
}
// resize
@@ -1020,8 +1020,8 @@ static void redraw_pixmaps()
*pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i];
pixmap[P_RESIZE * NumStates + i]->detach();
drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
- bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]),
- 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+ bitBlt(pixmap[P_RESIZE * NumStates + i],
+ 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
}
@@ -1183,22 +1183,22 @@ bool B2Client::eventFilter(TQObject *o, TQEvent *e)
return false;
switch (e->type()) {
case TQEvent::Resize:
- resizeEvent(TQT_TQRESIZEEVENT(e));
+ resizeEvent(static_cast<TQResizeEvent*>(e));
return true;
case TQEvent::Paint:
- paintEvent(TQT_TQPAINTEVENT(e));
+ paintEvent(static_cast<TQPaintEvent*>(e));
return true;
case TQEvent::MouseButtonDblClick:
- titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+ titlebar->mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
return true;
case TQEvent::Wheel:
- titlebar->wheelEvent(TQT_TQWHEELEVENT(e));
+ titlebar->wheelEvent(static_cast<TQWheelEvent*>(e));
return true;
case TQEvent::MouseButtonPress:
- processMousePressEvent(TQT_TQMOUSEEVENT(e));
+ processMousePressEvent(static_cast<TQMouseEvent*>(e));
return true;
case TQEvent::Show:
- showEvent(TQT_TQSHOWEVENT(e));
+ showEvent(static_cast<TQShowEvent*>(e));
return true;
default:
break;
@@ -1395,7 +1395,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *)
void B2Titlebar::paintEvent(TQPaintEvent *)
{
if(client->isActive())
- bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(),
+ bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(),
titleBuffer.height(), TQt::CopyROP, true);
else {
TQPainter p(this);