summaryrefslogtreecommitdiffstats
path: root/kwin/clients/web
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kwin/clients/web
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/clients/web')
-rw-r--r--kwin/clients/web/Web.cpp92
-rw-r--r--kwin/clients/web/Web.h6
-rw-r--r--kwin/clients/web/WebButton.cpp28
-rw-r--r--kwin/clients/web/WebButton.h6
4 files changed, 66 insertions, 66 deletions
diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp
index 1954b960f..43d1b9f42 100644
--- a/kwin/clients/web/Web.cpp
+++ b/kwin/clients/web/Web.cpp
@@ -80,7 +80,7 @@ bool WebClient::decorationBehaviour(DecorationBehaviour behaviour) const
}
}
-int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int WebClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
{
// bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
@@ -112,7 +112,7 @@ int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC
return 0;
default:
- return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+ return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
}
}
@@ -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("kwinwebrc");
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);
@@ -217,11 +217,11 @@ WebClient::paintEvent(TQPaintEvent * pe)
{
int r_x, r_y, r_x2, r_y2;
widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
- const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft);
- const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop);
- const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight);
- const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom);
- const int ttlHeight = tqlayoutMetric(LM_TitleHeight);
+ const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
+ const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
+ const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
+ const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
+ const int ttlHeight = layoutMetric(LM_TitleHeight);
const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1;
TQRect titleRect = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()),
@@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
TQPainter p(widget());
p.setPen(Qt::black);
- p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background());
+ p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
p.setClipRegion(pe->region() - titleRect);
@@ -241,12 +241,12 @@ WebClient::paintEvent(TQPaintEvent * pe)
p.fillRect(titleRect, options()->color(ColorTitleBar, isActive()));
- if (tqshape_)
+ if (shape_)
{
int r(width());
int b(height());
- // Draw edge of top-left corner inside the area removed by the tqmask.
+ // Draw edge of top-left corner inside the area removed by the mask.
p.drawPoint(3, 1);
p.drawPoint(4, 1);
@@ -254,7 +254,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
p.drawPoint(1, 3);
p.drawPoint(1, 4);
- // Draw edge of top-right corner inside the area removed by the tqmask.
+ // Draw edge of top-right corner inside the area removed by the mask.
p.drawPoint(r - 5, 1);
p.drawPoint(r - 4, 1);
@@ -262,7 +262,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
p.drawPoint(r - 2, 3);
p.drawPoint(r - 2, 4);
- // Draw edge of bottom-left corner inside the area removed by the tqmask.
+ // Draw edge of bottom-left corner inside the area removed by the mask.
p.drawPoint(1, b - 5);
p.drawPoint(1, b - 4);
@@ -270,7 +270,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
p.drawPoint(3, b - 2);
p.drawPoint(4, b - 2);
- // Draw edge of bottom-right corner inside the area removed by the tqmask.
+ // Draw edge of bottom-right corner inside the area removed by the mask.
p.drawPoint(r - 2, b - 5);
p.drawPoint(r - 2, b - 4);
@@ -288,43 +288,43 @@ WebClient::paintEvent(TQPaintEvent * pe)
void WebClient::updateWindowShape()
{
- if (!tqshape_)
+ if (!shape_)
return;
- TQRegion tqmask(0, 0, width(), height());
+ TQRegion mask(0, 0, width(), height());
int r(width());
int b(height());
// Remove top-left corner.
- tqmask -= TQRegion(0, 0, 5, 1);
- tqmask -= TQRegion(0, 1, 3, 1);
- tqmask -= TQRegion(0, 2, 2, 1);
- tqmask -= TQRegion(0, 3, 1, 2);
+ mask -= TQRegion(0, 0, 5, 1);
+ mask -= TQRegion(0, 1, 3, 1);
+ mask -= TQRegion(0, 2, 2, 1);
+ mask -= TQRegion(0, 3, 1, 2);
// Remove top-right corner.
- tqmask -= TQRegion(r - 5, 0, 5, 1);
- tqmask -= TQRegion(r - 3, 1, 3, 1);
- tqmask -= TQRegion(r - 2, 2, 2, 1);
- tqmask -= TQRegion(r - 1, 3, 1, 2);
+ mask -= TQRegion(r - 5, 0, 5, 1);
+ mask -= TQRegion(r - 3, 1, 3, 1);
+ mask -= TQRegion(r - 2, 2, 2, 1);
+ mask -= TQRegion(r - 1, 3, 1, 2);
// Remove bottom-left corner.
- tqmask -= TQRegion(0, b - 5, 1, 3);
- tqmask -= TQRegion(0, b - 3, 2, 1);
- tqmask -= TQRegion(0, b - 2, 3, 1);
- tqmask -= TQRegion(0, b - 1, 5, 1);
+ mask -= TQRegion(0, b - 5, 1, 3);
+ mask -= TQRegion(0, b - 3, 2, 1);
+ mask -= TQRegion(0, b - 2, 3, 1);
+ mask -= TQRegion(0, b - 1, 5, 1);
// Remove bottom-right corner.
- tqmask -= TQRegion(r - 5, b - 1, 5, 1);
- tqmask -= TQRegion(r - 3, b - 2, 3, 1);
- tqmask -= TQRegion(r - 2, b - 3, 2, 1);
- tqmask -= TQRegion(r - 1, b - 5, 1, 2);
+ mask -= TQRegion(r - 5, b - 1, 5, 1);
+ mask -= TQRegion(r - 3, b - 2, 3, 1);
+ mask -= TQRegion(r - 2, b - 3, 2, 1);
+ mask -= TQRegion(r - 1, b - 5, 1, 2);
- setMask(tqmask);
+ setMask(mask);
}
KDecoration* WebFactory::createDecoration( KDecorationBridge* b )
@@ -382,4 +382,4 @@ TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const
#include "Web.moc"
// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h
index 4b24d0da6..c8a8fa2db 100644
--- a/kwin/clients/web/Web.h
+++ b/kwin/clients/web/Web.h
@@ -46,7 +46,7 @@ namespace Web
virtual TQString defaultButtonsLeft() const;
virtual TQString defaultButtonsRight() const;
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
- virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+ virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
virtual KCommonDecorationButton *createButton(ButtonType type);
virtual void updateWindowShape();
@@ -62,7 +62,7 @@ namespace Web
int titleHeight_, borderSize_;
- bool tqshape_;
+ bool shape_;
TQBitmap _buttonBitmap(ButtonType t) const;
};
@@ -84,4 +84,4 @@ namespace Web
#endif
// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp
index b12d7bd84..61811accc 100644
--- a/kwin/clients/web/WebButton.cpp
+++ b/kwin/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);
}
@@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p)
TQPen highlightPen;
if (isDown() )
- highlightPen = TQPen(tqcolorGroup().light());
+ highlightPen = TQPen(colorGroup().light());
else
{
if (mouseOver_)
- highlightPen = TQPen(tqcolorGroup().highlight());
+ highlightPen = TQPen(colorGroup().highlight());
else
highlightPen = TQPen(NoPen);
}
- p->fillRect(rect(), tqcolorGroup().background());
+ p->fillRect(rect(), colorGroup().background());
Position position_;
if (0 == mapToParent(rect().topLeft() ).x() )
@@ -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);
@@ -284,4 +284,4 @@ WebButton::setBitmap(const unsigned char *bitmap)
}
// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h
index 2e6a54ef1..da94ea3f7 100644
--- a/kwin/clients/web/WebButton.h
+++ b/kwin/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_;
};
}
@@ -67,4 +67,4 @@ namespace Web
#endif
// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;