summaryrefslogtreecommitdiffstats
path: root/kwin/lib/kdecoration.cpp
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/lib/kdecoration.cpp
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/lib/kdecoration.cpp')
-rw-r--r--kwin/lib/kdecoration.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp
index 22b3cd75c..97c8965e9 100644
--- a/kwin/lib/kdecoration.cpp
+++ b/kwin/lib/kdecoration.cpp
@@ -68,7 +68,7 @@ void KDecoration::setMainWidget( TQWidget* w )
assert( w_ == NULL );
w_ = w;
w->setMouseTracking( true );
- widget()->resize( tqgeometry().size());
+ widget()->resize( geometry().size());
}
TQWidget* KDecoration::initialParentWidget() const
@@ -206,9 +206,9 @@ bool KDecoration::isPreview() const
return bridge_->isPreview();
}
-TQRect KDecoration::tqgeometry() const
+TQRect KDecoration::geometry() const
{
- return bridge_->tqgeometry();
+ return bridge_->geometry();
}
TQRect KDecoration::iconGeometry() const
@@ -388,7 +388,7 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const
return(active ? d->activeFont : d->inactiveFont);
}
-const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const
+const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const
{
int idx = type + (active ? 0 : NUM_COLORS);
if(d->cg[idx])