summaryrefslogtreecommitdiffstats
path: root/twin/clients
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:53:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:53:50 -0600
commitf64397c82fa94371ab4a64af28c4d0029f4cd93f (patch)
treecdb72f3faadbcebe60088800f27df1ec23ad15d8 /twin/clients
parent628043be55ddd2f534411d028e4f68c8fe4eaabb (diff)
downloadtdebase-f64397c82fa94371ab4a64af28c4d0029f4cd93f.tar.gz
tdebase-f64397c82fa94371ab4a64af28c4d0029f4cd93f.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'twin/clients')
-rw-r--r--twin/clients/b2/b2client.cpp36
-rw-r--r--twin/clients/default/kdedefault.cpp8
-rw-r--r--twin/clients/keramik/keramik.cpp38
-rw-r--r--twin/clients/kwmtheme/cli_installer/main.cpp16
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.cpp14
-rw-r--r--twin/clients/laptop/laptopclient.cpp2
-rw-r--r--twin/clients/plastik/plastikbutton.cpp2
-rw-r--r--twin/clients/plastik/plastikclient.cpp4
-rw-r--r--twin/clients/quartz/quartz.cpp6
-rw-r--r--twin/clients/redmond/redmond.cpp2
-rw-r--r--twin/clients/web/Web.cpp30
-rw-r--r--twin/clients/web/Web.h2
-rw-r--r--twin/clients/web/WebButton.cpp20
-rw-r--r--twin/clients/web/WebButton.h4
14 files changed, 92 insertions, 92 deletions
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 28ebc9c76..8e62360a6 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -558,7 +558,7 @@ bool B2Client::mustDrawHandle() const
void B2Client::iconChange()
{
if (button[BtnMenu])
- button[BtnMenu]->tqrepaint(false);
+ button[BtnMenu]->repaint(false);
}
// Gallium: New button show/hide magic for customizable
@@ -607,7 +607,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/)
titleMoveAbs(bar_x_ofs);
doShape();
- widget()->tqrepaint(); // the frame is misrendered without this
+ widget()->repaint(); // the frame is misrendered without this
}
void B2Client::captionChange()
@@ -616,7 +616,7 @@ void B2Client::captionChange()
titleMoveAbs(bar_x_ofs);
doShape();
titlebar->recalcBuffer();
- titlebar->tqrepaint(false);
+ titlebar->repaint(false);
}
void B2Client::paintEvent(TQPaintEvent* e)
@@ -710,7 +710,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
visibilitinotify events until its state changes, so we just try
*/
if (titlebar->isFullyObscured()) {
- /* We first see, if our tqrepaint contained the titlebar area */
+ /* We first see, if our repaint contained the titlebar area */
TQRegion reg(TQRect(0, 0, width(), buttonSize + 4));
reg = reg.intersect(e->region());
if (!reg.isEmpty())
@@ -815,8 +815,8 @@ void B2Client::titleMoveAbs(int new_ofs)
bar_x_ofs = new_ofs;
positionButtons();
doShape();
- widget()->tqrepaint(0, 0, width(), buttonSize + 4, false);
- titlebar->tqrepaint(false);
+ widget()->repaint(0, 0, width(), buttonSize + 4, false);
+ titlebar->repaint(false);
}
}
@@ -841,7 +841,7 @@ void B2Client::maximizeChange()
bool m = maximizeMode() == MaximizeFull;
if (button[BtnMax]) {
button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
- button[BtnMax]->tqrepaint();
+ button[BtnMax]->repaint();
TQToolTip::remove(button[BtnMax]);
TQToolTip::add(button[BtnMax],
m ? i18n("Restore") : i18n("Maximize"));
@@ -851,13 +851,13 @@ void B2Client::maximizeChange()
g->activate();
doShape();
- widget()->tqrepaint(false);
+ widget()->repaint(false);
}
void B2Client::activeChange()
{
- widget()->tqrepaint(false);
- titlebar->tqrepaint(false);
+ widget()->repaint(false);
+ titlebar->repaint(false);
TQColor c = options()->colorGroup(
KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
@@ -865,7 +865,7 @@ void B2Client::activeChange()
for (int i = 0; i < BtnCount; i++)
if (button[i]) {
button[i]->setBg(c);
- button[i]->tqrepaint(false);
+ button[i]->repaint(false);
}
}
@@ -1128,7 +1128,7 @@ void B2Client::positionButtons()
// Transparent bound stuff.
static TQRect *visible_bound;
-static TQPointArray bound_tqshape;
+static TQPointArray bound_shape;
bool B2Client::drawbound(const TQRect& geom, bool clear)
{
@@ -1153,7 +1153,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
barLeft += 2;
barRight -= 2;
- bound_tqshape.putPoints(0, 8,
+ bound_shape.putPoints(0, 8,
g.left(), frameTop,
barLeft, frameTop,
barLeft, g.top(),
@@ -1168,7 +1168,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
TQPainter p(workspaceWidget());
p.setPen(TQPen(Qt::white, 5));
p.setRasterOp(TQt::XorROP);
- p.drawPolygon(bound_tqshape);
+ p.drawPolygon(bound_shape);
if (clear) {
delete visible_bound;
@@ -1273,7 +1273,7 @@ void B2Button::setPixmaps(int button_id)
for (int i = 0; i < NumStates; i++) {
icon[i] = B2::pixmap[button_id + i];
}
- tqrepaint(false);
+ repaint(false);
}
void B2Button::mousePressEvent(TQMouseEvent * e)
@@ -1297,14 +1297,14 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e)
void B2Button::enterEvent(TQEvent *e)
{
hover = true;
- tqrepaint(false);
+ repaint(false);
TQButton::enterEvent(e);
}
void B2Button::leaveEvent(TQEvent *e)
{
hover = false;
- tqrepaint(false);
+ repaint(false);
TQButton::leaveEvent(e);
}
@@ -1388,7 +1388,7 @@ void B2Titlebar::recalcBuffer()
void B2Titlebar::resizeEvent(TQResizeEvent *)
{
recalcBuffer();
- tqrepaint(false);
+ repaint(false);
}
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 987e80ee2..c3be60c80 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update )
|| new_useGradients != useGradients
|| new_titleHeight != normalTitleHeight
|| new_toolTitleHeight != toolTitleHeight )
- changed |= SettingColors; // just recreate the pixmaps and tqrepaint
+ changed |= SettingColors; // just recreate the pixmaps and repaint
}
showGrabBar = new_showGrabBar;
@@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p)
void KDEDefaultButton::enterEvent(TQEvent *e)
{
isMouseOver=true;
- tqrepaint(false);
+ repaint(false);
TQButton::enterEvent(e);
}
@@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e)
void KDEDefaultButton::leaveEvent(TQEvent *e)
{
isMouseOver=false;
- tqrepaint(false);
+ repaint(false);
TQButton::leaveEvent(e);
}
@@ -856,7 +856,7 @@ void KDEDefaultClient::init()
void KDEDefaultClient::reset( unsigned long changed)
{
- widget()->tqrepaint();
+ widget()->repaint();
KCommonDecoration::reset(changed);
}
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index ce137cd20..121861865 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -784,7 +784,7 @@ void KeramikButton::enterEvent( TQEvent *e )
TQButton::enterEvent( e );
hover = true;
- tqrepaint( false );
+ repaint( false );
}
@@ -793,7 +793,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
TQButton::leaveEvent( e );
hover = false;
- tqrepaint( false );
+ repaint( false );
}
@@ -1014,13 +1014,13 @@ void KeramikClient::reset( unsigned long )
captionBufferDirty = maskDirty = true;
- // Only tqrepaint the window if it's visible
+ // Only repaint the window if it's visible
// (i.e. not minimized and on the current desktop)
if ( widget()->isVisible() ) {
- widget()->tqrepaint( false );
+ widget()->repaint( false );
for ( int i = 0; i < NumButtons; i++ )
- if ( button[i] ) button[i]->tqrepaint( false );
+ if ( button[i] ) button[i]->repaint( false );
}
}
@@ -1365,7 +1365,7 @@ void KeramikClient::captionChange()
captionBufferDirty = true;
- widget()->tqrepaint( r | captionRect, false );
+ widget()->repaint( r | captionRect, false );
}
@@ -1381,7 +1381,7 @@ void KeramikClient::iconChange()
activeIcon = inactiveIcon = NULL;
captionBufferDirty = true;
- widget()->tqrepaint( captionRect, false );
+ widget()->repaint( captionRect, false );
}
}
@@ -1400,10 +1400,10 @@ void KeramikClient::activeChange()
captionBufferDirty = true;
- widget()->tqrepaint( false );
+ widget()->repaint( false );
for ( int i=0; i < NumButtons; i++ )
- if ( button[i] ) button[i]->tqrepaint( false );
+ if ( button[i] ) button[i]->repaint( false );
}
@@ -1420,7 +1420,7 @@ void KeramikClient::maximizeChange()
captionBufferDirty = maskDirty = true;
widget()->layout()->activate();
- widget()->tqrepaint( false );
+ widget()->repaint( false );
} else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) {
// We've been restored - enlarge the titlebar by 3 pixels
topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -1430,14 +1430,14 @@ void KeramikClient::maximizeChange()
captionBufferDirty = maskDirty = true;
widget()->layout()->activate();
- widget()->tqrepaint( false );
+ widget()->repaint( false );
}
}
if ( button[ MaxButton ] ) {
TQToolTip::remove( button[ MaxButton ] );
TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
- button[ MaxButton ]->tqrepaint();
+ button[ MaxButton ]->repaint();
}
}
@@ -1446,7 +1446,7 @@ void KeramikClient::desktopChange()
{
if ( button[ OnAllDesktopsButton ] )
{
- button[ OnAllDesktopsButton ]->tqrepaint( true );
+ button[ OnAllDesktopsButton ]->repaint( true );
TQToolTip::remove( button[ OnAllDesktopsButton ] );
TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
}
@@ -1457,7 +1457,7 @@ void KeramikClient::shadeChange()
{
if ( button[ ShadeButton ] )
{
- button[ ShadeButton ]->tqrepaint( true );
+ button[ ShadeButton ]->repaint( true );
TQToolTip::remove( button[ ShadeButton ] );
TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") );
}
@@ -1467,14 +1467,14 @@ void KeramikClient::shadeChange()
void KeramikClient::keepAboveChange( bool )
{
if ( button[ AboveButton ] )
- button[ AboveButton ]->tqrepaint( true );
+ button[ AboveButton ]->repaint( true );
}
void KeramikClient::keepBelowChange( bool )
{
if ( button[ BelowButton ] )
- button[ BelowButton ]->tqrepaint( true );
+ button[ BelowButton ]->repaint( true );
}
@@ -1502,21 +1502,21 @@ void KeramikClient::slotMaximize()
void KeramikClient::slotAbove()
{
setKeepAbove( !keepAbove());
- button[ AboveButton ]->tqrepaint( true );
+ button[ AboveButton ]->repaint( true );
}
void KeramikClient::slotBelow()
{
setKeepBelow( !keepBelow());
- button[ BelowButton ]->tqrepaint( true );
+ button[ BelowButton ]->repaint( true );
}
void KeramikClient::slotShade()
{
setShade( !isSetShade());
- button[ ShadeButton ]->tqrepaint( true );
+ button[ ShadeButton ]->repaint( true );
}
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 4533cf3e8..c67a2d227 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -73,36 +73,36 @@ int main(int argc, char **argv)
input.setGroup("Window Border");
output->setGroup("General");
- tmpStr = input.readEntry("tqshapePixmapTop");
+ tmpStr = input.readEntry("shapePixmapTop");
if(!tmpStr.isEmpty()){
copy(srcStr+tmpStr, localDirStr+tmpStr);
}
output->writeEntry("wm_top", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapBottom");
+ tmpStr = input.readEntry("shapePixmapBottom");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottom", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapLeft");
+ tmpStr = input.readEntry("shapePixmapLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_left", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapRight");
+ tmpStr = input.readEntry("shapePixmapRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_right", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapTopLeft");
+ tmpStr = input.readEntry("shapePixmapTopLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_topleft", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapTopRight");
+ tmpStr = input.readEntry("shapePixmapTopRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_topright", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapBottomLeft");
+ tmpStr = input.readEntry("shapePixmapBottomLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottomleft", tmpStr, true, true);
- tmpStr = input.readEntry("tqshapePixmapBottomRight");
+ tmpStr = input.readEntry("shapePixmapBottomRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottomright", tmpStr, true, true);
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 1a1316dc1..e7db7c2d6 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
void KWMThemeClient::resizeEvent( TQResizeEvent* )
{
doShape();
- widget()->tqrepaint();
+ widget()->repaint();
}
void KWMThemeClient::captionChange()
{
- widget()->tqrepaint( titlebar->geometry(), false );
+ widget()->repaint( titlebar->geometry(), false );
}
void KWMThemeClient::paintEvent( TQPaintEvent *)
@@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
void KWMThemeClient::doShape()
{
- TQBitmap tqshapemask(width(), height());
- tqshapemask.fill(color0);
+ TQBitmap shapemask(width(), height());
+ shapemask.fill(color0);
TQPainter p;
- p.begin(&tqshapemask);
+ p.begin(&shapemask);
p.setBrush(color1);
p.setPen(color1);
int x,y;
@@ -740,14 +740,14 @@ void KWMThemeClient::doShape()
}
}
p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1);
- setMask(tqshapemask);
+ setMask(shapemask);
}
void KWMThemeClient::showEvent(TQShowEvent *)
{
doShape();
- widget()->tqrepaint(false);
+ widget()->repaint(false);
}
void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 3b0a1c7ef..58d54a118 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
deco.fill(Qt::color0);
}
deco.setMask(deco);
- tqrepaint();
+ repaint();
}
void LaptopButton::drawButton(TQPainter *p)
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 5f81033cb..428c8e72c 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -140,7 +140,7 @@ void PlastikButton::animate()
}
}
- tqrepaint(false);
+ repaint(false);
}
void PlastikButton::enterEvent(TQEvent *e)
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 0e72ff59c..f48417779 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed )
{
if (changed & SettingColors)
{
- // tqrepaint the whole thing
+ // repaint the whole thing
clearCaptionPixmaps();
widget()->update();
updateButtons();
@@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed )
updateLayout();
- // then tqrepaint
+ // then repaint
clearCaptionPixmaps();
widget()->update();
}
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 7530adc84..21b4c039c 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap)
if (bitmap) {
deco = new TQBitmap(10, 10, bitmap, true);
deco->setMask( *deco );
- tqrepaint( false );
+ repaint( false );
}
}
@@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed )
{
if (changed & SettingColors || changed & SettingFont)
{
- // tqrepaint the whole thing
- widget()->tqrepaint(false);
+ // repaint the whole thing
+ widget()->repaint(false);
}
KCommonDecoration::reset(changed);
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index e4127adaa..790afa461 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p )
deco.resize(0, 0);
pix = p;
- tqrepaint(false);
+ repaint(false);
}
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 0f3b9c70b..f799e1b8b 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type)
{
switch (type) {
case MenuButton:
- return new WebButton(MenuButton, this, "menu", tqshape_);
+ return new WebButton(MenuButton, this, "menu", shape_);
case OnAllDesktopsButton:
- return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_);
+ return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_);
case HelpButton:
- return new WebButton(HelpButton, this, "help", tqshape_);
+ return new WebButton(HelpButton, this, "help", shape_);
case MinButton:
- return new WebButton(MinButton, this, "minimize", tqshape_);
+ return new WebButton(MinButton, this, "minimize", shape_);
case MaxButton:
- return new WebButton(MaxButton, this, "maximize", tqshape_);
+ return new WebButton(MaxButton, this, "maximize", shape_);
case CloseButton:
- return new WebButton(CloseButton, this, "close", tqshape_);
+ return new WebButton(CloseButton, this, "close", shape_);
case AboveButton:
- return new WebButton(AboveButton, this, "above", tqshape_);
+ return new WebButton(AboveButton, this, "above", shape_);
case BelowButton:
- return new WebButton(BelowButton, this, "below", tqshape_);
+ return new WebButton(BelowButton, this, "below", shape_);
case ShadeButton:
- return new WebButton(ShadeButton, this, "shade", tqshape_);
+ return new WebButton(ShadeButton, this, "shade", shape_);
default:
return 0;
@@ -185,7 +185,7 @@ WebClient::init()
KConfig c("twinwebrc");
c.setGroup("General");
- tqshape_ = c.readBoolEntry("Shape", true);
+ shape_ = c.readBoolEntry("Shape", true);
KCommonDecoration::init();
}
@@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed )
{
if (changed & SettingColors)
{
- // tqrepaint the whole thing
- widget()->tqrepaint(false);
+ // repaint the whole thing
+ widget()->repaint(false);
} else if (changed & SettingFont) {
// font has changed -- update title height
// title height
@@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed )
if (0 != titleHeight_ % 2)
titleHeight_ += 1;
- widget()->tqrepaint(false);
+ widget()->repaint(false);
}
KCommonDecoration::reset(changed);
@@ -241,7 +241,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
p.fillRect(titleRect, options()->color(ColorTitleBar, isActive()));
- if (tqshape_)
+ if (shape_)
{
int r(width());
int b(height());
@@ -288,7 +288,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
void WebClient::updateWindowShape()
{
- if (!tqshape_)
+ if (!shape_)
return;
TQRegion mask(0, 0, width(), height());
diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h
index c2c18b0bd..ec1b08dc5 100644
--- a/twin/clients/web/Web.h
+++ b/twin/clients/web/Web.h
@@ -62,7 +62,7 @@ namespace Web
int titleHeight_, borderSize_;
- bool tqshape_;
+ bool shape_;
TQBitmap _buttonBitmap(ButtonType t) const;
};
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index 3c96cac2d..785abe699 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -69,10 +69,10 @@ namespace Web {
0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff
};
-WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape)
+WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape)
: KCommonDecorationButton (type, parent, name),
mouseOver_ (false),
- tqshape_ (tqshape),
+ shape_ (shape),
deco_ (parent)
{
setBackgroundMode(NoBackground);
@@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed)
WebButton::enterEvent(TQEvent * e)
{
mouseOver_ = true;
- tqrepaint();
+ repaint();
TQButton::enterEvent(e);
}
@@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e)
WebButton::leaveEvent(TQEvent * e)
{
mouseOver_ = false;
- tqrepaint();
+ repaint();
TQButton::leaveEvent(e);
}
@@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p)
p->drawLine(0, 0, width(), 0);
p->drawLine(0, 1, 0, height() - 1);
- if (tqshape_)
+ if (shape_)
{
p->drawPoint(3, 1);
p->drawPoint(4, 1);
@@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p)
p->setBrush(NoBrush);
p->setPen(highlightPen);
- if (tqshape_)
+ if (shape_)
p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6));
p->drawRect(2, 2, width() - 4, height() - 4);
- if (tqshape_)
+ if (shape_)
{
p->setClipRect(rect());
p->drawPoint(4, 3);
@@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p)
p->setPen(Qt::black);
p->drawLine(0, 0, width(), 0);
p->drawLine(width() - 1, 1, width() - 1, height() - 1);
- if (tqshape_)
+ if (shape_)
{
p->drawPoint(width() - 5, 1);
p->drawPoint(width() - 4, 1);
@@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p)
p->setBrush(NoBrush);
p->setPen(highlightPen);
- if (tqshape_)
+ if (shape_)
p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6));
p->drawRect(2, 2, width() - 4, height() - 4);
- if (tqshape_)
+ if (shape_)
{
p->setClipRect(rect());
p->drawPoint(width() - 5, 3);
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index 108aa2a52..d86db6cc6 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -41,7 +41,7 @@ namespace Web
Left, Mid, Right
};
- WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape);
+ WebButton(ButtonType type, WebClient *parent, const char *name, bool shape);
virtual ~WebButton();
@@ -59,7 +59,7 @@ namespace Web
bool mouseOver_;
- bool tqshape_;
+ bool shape_;
WebClient* deco_;
};
}