From 1d077caf68127ab1a5518df84cc5592a1b47a965 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 14 Aug 2011 05:14:51 +0000 Subject: TQt4 port kdeartwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1246991 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin-styles/riscos/Manager.cpp | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'kwin-styles/riscos/Manager.cpp') diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp index c4b77f0a..837bec9c 100644 --- a/kwin-styles/riscos/Manager.cpp +++ b/kwin-styles/riscos/Manager.cpp @@ -82,23 +82,23 @@ void Manager::init() bool Manager::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) return false; + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonRelease: return false; @@ -134,22 +134,22 @@ void Manager::resize(const TQSize &s) widget()->resize(s); } -TQSize Manager::minimumSize() const +TQSize Manager::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } void Manager::activeChange() { updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); emit(activeChanged(isActive())); } void Manager::captionChange() { updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); } void Manager::iconChange() @@ -182,7 +182,7 @@ void Manager::paintEvent(TQPaintEvent *e) if (intersectsLeft || intersectsRight) { - p.setPen(Qt::black); + p.setPen(TQt::black); if (intersectsLeft) p.drawLine(0, r.top(), 0, r.bottom()); @@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e) // Title bar. - TQRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->tqgeometry(); bitBlt(widget(), tr.topLeft(), &titleBuf_); // Resize bar. @@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*) { updateButtonVisibility(); updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); } void Manager::updateButtonVisibility() @@ -282,7 +282,7 @@ void Manager::updateButtonVisibility() break; } - layout()->activate(); + tqlayout()->activate(); #endif } @@ -292,7 +292,7 @@ void Manager::updateTitleBuffer() Static * s = Static::instance(); - TQRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->tqgeometry(); if (tr.width() == 0 || tr.height() == 0) titleBuf_.resize(8, 8); @@ -352,13 +352,13 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const void Manager::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == LeftButton && titleSpacer_->geometry().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } void Manager::wheelEvent(TQWheelEvent *e) { - if (isSetShade() || titleLayout_->geometry().contains(e->pos()) ) + if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -428,7 +428,7 @@ bool Manager::animateMinimize(bool iconify) // Go away quick. helperShowHide(false); - qApp->syncX(); + tqApp->syncX(); TQRect r = iconGeometry(); @@ -463,7 +463,7 @@ bool Manager::animateMinimize(bool iconify) double delta = finalAngle / steps; TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (double angle = 0; ; angle += delta) { @@ -517,7 +517,7 @@ bool Manager::animateMinimize(bool iconify) // Go away quick. helperShowHide(false); - qApp->syncX(); + tqApp->syncX(); int stepCount = 12; @@ -527,7 +527,7 @@ bool Manager::animateMinimize(bool iconify) int dy = r.height() / (stepCount * 2); TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (int step = 0; step < stepCount; step++) { @@ -559,7 +559,7 @@ bool Manager::animateMinimize(bool iconify) TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) p.setClipRegion(TQRegion(workspaceWidget()->rect()) - wingeom); @@ -573,7 +573,7 @@ bool Manager::animateMinimize(bool iconify) p.flush(); - qApp->syncX(); + tqApp->syncX(); usleep(30000); @@ -678,7 +678,7 @@ void Manager::createTitle() for (TQPtrListIterator