From ddc823597fe65f92ec23d44d9153109b2c61ac59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kimmo=20H=E4m=E4l=E4inen?= Date: Fri, 26 Nov 2010 16:26:21 +0200 Subject: Remove a bunch of deprecated functions - fix typo in MTexturePixmapPrivate::removeEffect() to make it work --- src/mcompositemanager.cpp | 2 -- src/mcompositewindow.cpp | 39 --------------------------------------- src/mcompositewindow.h | 7 ------- src/mtexturepixmapitem.h | 1 - src/mtexturepixmapitem_egl.cpp | 5 ----- src/mtexturepixmapitem_glx.cpp | 6 +----- src/mtexturepixmapitem_p.cpp | 8 +------- src/mtexturepixmapitem_p.h | 1 - 8 files changed, 2 insertions(+), 67 deletions(-) diff --git a/src/mcompositemanager.cpp b/src/mcompositemanager.cpp index 1cc4935..1185f39 100644 --- a/src/mcompositemanager.cpp +++ b/src/mcompositemanager.cpp @@ -3265,8 +3265,6 @@ MCompositeWindow *MCompositeManagerPrivate::bindWindow(Window window) return item; } - item->manipulationEnabled(true); - // the decorator got mapped. this is here because the compositor // could be restarted at any point if (pc->isDecorator() && !MDecoratorFrame::instance()->decoratorItem()) { diff --git a/src/mcompositewindow.cpp b/src/mcompositewindow.cpp index 9c6cb0e..799654f 100644 --- a/src/mcompositewindow.cpp +++ b/src/mcompositewindow.cpp @@ -518,45 +518,6 @@ void MCompositeWindow::setScaled(bool s) scaled = s; } -void MCompositeWindow::hoverEnterEvent(QGraphicsSceneHoverEvent *e) -{ - if (thumb_mode) { - zval = zValue(); - setZValue(scene()->items().count() + 1); - setZValue(100); - anim->translateScale(scalefrom, scalefrom, scaleto, scaleto, pos()); - - } - return QGraphicsItem::hoverEnterEvent(e); -} - -void MCompositeWindow::hoverLeaveEvent(QGraphicsSceneHoverEvent *e) -{ - if (thumb_mode) { - setZValue(zval); - anim->translateScale(scalefrom, scalefrom, scaleto, scaleto, pos(), true); - } - return QGraphicsItem::hoverLeaveEvent(e); -} - -void MCompositeWindow::mouseReleaseEvent(QGraphicsSceneMouseEvent *m) -{ - anim->restore(); - setThumbMode(false); - setScaled(false); - setZValue(100); - - emit acceptingInput(); - windowRaised(); - QGraphicsItem::mouseReleaseEvent(m); -} - -void MCompositeWindow::manipulationEnabled(bool isEnabled) -{ - setFlag(QGraphicsItem::ItemIsMovable, isEnabled); - setFlag(QGraphicsItem::ItemIsSelectable, isEnabled); -} - void MCompositeWindow::setVisible(bool visible) { if ((pc && pc->isInputOnly()) diff --git a/src/mcompositewindow.h b/src/mcompositewindow.h index f13fcce..2fc45be 100644 --- a/src/mcompositewindow.h +++ b/src/mcompositewindow.h @@ -233,8 +233,6 @@ public: static MCompositeWindow *compositeWindow(Qt::HANDLE window); - virtual void windowRaised() = 0; - /*! * Ensures that the corresponding texture reflects the contents of the * associated pixmap and schedules a redraw of this item. @@ -320,7 +318,6 @@ public slots: void updateIconGeometry(); void startTransition(); - void manipulationEnabled(bool isEnabled); void setBlurred(bool); /* Operations with transition animations*/ @@ -368,7 +365,6 @@ signals: */ void windowHung(MCompositeWindow *window); - void acceptingInput(); void visualized(bool); /*! Emitted when this window gets restored from an iconified state */ @@ -382,9 +378,6 @@ signals: protected: - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *); virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); virtual QPainterPath shape() const; diff --git a/src/mtexturepixmapitem.h b/src/mtexturepixmapitem.h index 42b4ba6..b36bb02 100644 --- a/src/mtexturepixmapitem.h +++ b/src/mtexturepixmapitem.h @@ -99,7 +99,6 @@ protected: QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const; QRectF boundingRect() const; - virtual void windowRaised(); private: virtual MTexturePixmapPrivate* renderer() const; diff --git a/src/mtexturepixmapitem_egl.cpp b/src/mtexturepixmapitem_egl.cpp index 99a9ffb..3bd7b60 100644 --- a/src/mtexturepixmapitem_egl.cpp +++ b/src/mtexturepixmapitem_egl.cpp @@ -393,11 +393,6 @@ void MTexturePixmapItem::renderTexture(const QTransform& transform) glDisable(GL_BLEND); } -void MTexturePixmapItem::windowRaised() -{ - d->windowRaised(); -} - void MTexturePixmapItem::resize(int w, int h) { d->resize(w, h); diff --git a/src/mtexturepixmapitem_glx.cpp b/src/mtexturepixmapitem_glx.cpp index 249237d..7e67b49 100644 --- a/src/mtexturepixmapitem_glx.cpp +++ b/src/mtexturepixmapitem_glx.cpp @@ -278,6 +278,7 @@ void MTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num, { Q_UNUSED(rects); Q_UNUSED(num); + Q_UNUSED(when); if (isWindowTransitioning() || d->direct_fb_render || !windowVisible()) return; @@ -372,11 +373,6 @@ void MTexturePixmapItem::paint(QPainter *painter, } -void MTexturePixmapItem::windowRaised() -{ - d->windowRaised(); -} - void MTexturePixmapItem::resize(int w, int h) { d->resize(w, h); diff --git a/src/mtexturepixmapitem_p.cpp b/src/mtexturepixmapitem_p.cpp index eb5438f..25d0588 100644 --- a/src/mtexturepixmapitem_p.cpp +++ b/src/mtexturepixmapitem_p.cpp @@ -350,7 +350,7 @@ void MTexturePixmapPrivate::removeEffect() prev_effect = 0; for (int i=0; i < e->fragmentIds().size(); ++i) { GLuint id = e->fragmentIds()[i]; - QGLShaderProgram* frag = glresource->customShaders.value(i,0); + QGLShaderProgram* frag = glresource->customShaders.value(id, 0); if (frag) delete frag; glresource->customShaders.remove(id); @@ -451,12 +451,6 @@ void MTexturePixmapPrivate::saveBackingStore() item->rebindPixmap(); // windowp == 0 is also handled here } -void MTexturePixmapPrivate::windowRaised() -{ - if (item->window()) - XRaiseWindow(QX11Info::display(), item->window()); -} - void MTexturePixmapPrivate::resize(int w, int h) { if (!window) diff --git a/src/mtexturepixmapitem_p.h b/src/mtexturepixmapitem_p.h index 4e8937b..2dbbf00 100644 --- a/src/mtexturepixmapitem_p.h +++ b/src/mtexturepixmapitem_p.h @@ -60,7 +60,6 @@ public: void clearTexture(); bool isDirectRendered() const; void resize(int w, int h); - void windowRaised(); void drawTexture(const QTransform& transform, const QRectF& drawRect, qreal opacity); void q_drawTexture(const QTransform& transform, const QRectF& drawRect, qreal opacity); -- cgit v1.2.3