summaryrefslogtreecommitdiffstats
path: root/kwin/lib/kdecoration.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kwin/lib/kdecoration.cpp
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 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 97c8965e9..22b3cd75c 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( geometry().size());
+ widget()->resize( tqgeometry().size());
}
TQWidget* KDecoration::initialParentWidget() const
@@ -206,9 +206,9 @@ bool KDecoration::isPreview() const
return bridge_->isPreview();
}
-TQRect KDecoration::geometry() const
+TQRect KDecoration::tqgeometry() const
{
- return bridge_->geometry();
+ return bridge_->tqgeometry();
}
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::colorGroup(ColorType type, bool active) const
+const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const
{
int idx = type + (active ? 0 : NUM_COLORS);
if(d->cg[idx])