diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:53:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:53:50 -0600 |
commit | f64397c82fa94371ab4a64af28c4d0029f4cd93f (patch) | |
tree | cdb72f3faadbcebe60088800f27df1ec23ad15d8 /twin/clients/web | |
parent | 628043be55ddd2f534411d028e4f68c8fe4eaabb (diff) | |
download | tdebase-f64397c82fa94371ab4a64af28c4d0029f4cd93f.tar.gz tdebase-f64397c82fa94371ab4a64af28c4d0029f4cd93f.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'twin/clients/web')
-rw-r--r-- | twin/clients/web/Web.cpp | 30 | ||||
-rw-r--r-- | twin/clients/web/Web.h | 2 | ||||
-rw-r--r-- | twin/clients/web/WebButton.cpp | 20 | ||||
-rw-r--r-- | twin/clients/web/WebButton.h | 4 |
4 files changed, 28 insertions, 28 deletions
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_; }; } |