From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin/lib/kdecoration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kwin/lib/kdecoration.cpp') diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp index 97c8965e9..a8b78bee5 100644 --- a/kwin/lib/kdecoration.cpp +++ b/kwin/lib/kdecoration.cpp @@ -388,14 +388,14 @@ 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]) return(*d->cg[idx]); d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::palette().active(). + Qt::black, TQApplication::tqpalette().active(). base()); return(*d->cg[idx]); } @@ -434,7 +434,7 @@ bool KDecorationOptions::moveResizeMaximizedWindows() const return d->move_resize_maximized_windows; } -KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( Qt::ButtonState button ) const +KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( TQt::ButtonState button ) const { return button == Qt::RightButton? d->OpMaxButtonRightClick : button == Qt::MidButton? d->OpMaxButtonMiddleClick : -- cgit v1.2.1