[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon/qml] phonon/graphicsview: cleanup
From:       Harald Sitter <sitter () kde ! org>
Date:       2011-07-31 18:02:24
Message-ID: 20110731180224.14646A60AE () git ! kde ! org
[Download RAW message or body]

Git commit 6e5b30aa989da3b4f3ff832db5a98aba634dbece by Harald Sitter.
Committed on 31/07/2011 at 20:02.
Pushed by sitter into branch 'qml'.

cleanup

M  +3    -9    phonon/graphicsview/videographicsobject.h
M  +11   -10   phonon/graphicsview/videographicsobject.cpp

http://commits.kde.org/phonon/6e5b30aa989da3b4f3ff832db5a98aba634dbece

diff --git a/phonon/graphicsview/videographicsobject.cpp b/phonon/graphicsview/videographicsobject.cpp
index 8e666f3..5e715ef 100644
--- a/phonon/graphicsview/videographicsobject.cpp
+++ b/phonon/graphicsview/videographicsobject.cpp
@@ -75,6 +75,8 @@ public:
     AbstractVideoGraphicsPainter *createPainter();
     void paintGl(QPainter *painter, QRectF rect, VideoFrame *frame);
 
+    void setTargetRect();
+
     QRectF geometry;
     QRectF boundingRect;
     QSize frameSize;
@@ -173,7 +175,7 @@ void VideoGraphicsObject::paint(QPainter *painter,
         // TODO: do scaling ourselfs?
         gotSize = true;
         d->frameSize = QSize(frame->width, frame->height);
-        setTargetRect();
+        d->setTargetRect();
     }
 
     if (frame->format == VideoFrame::Format_Invalid && !paintedOnce) {
@@ -201,21 +203,20 @@ void VideoGraphicsObject::setGeometry(const QRectF &newGeometry)
 {
     K_D(VideoGraphicsObject);
     d->geometry = newGeometry;
-    setTargetRect();
+    d->setTargetRect();
 }
 
-void VideoGraphicsObject::setTargetRect()
+void VideoGraphicsObjectPrivate::setTargetRect()
 {
-    K_D(VideoGraphicsObject);
-
-    emit prepareGeometryChange();
+    Q_Q(VideoGraphicsObject);
+    emit q->prepareGeometryChange();
 
     // keep aspect
-    QSizeF frameSize = d->frameSize;
-    frameSize.scale(d->geometry.size(), Qt::KeepAspectRatio);
+    QSizeF frameSize = frameSize;
+    frameSize.scale(geometry.size(), Qt::KeepAspectRatio);
 
-    d->boundingRect = QRectF(0, 0, frameSize.width(), frameSize.height());
-    d->boundingRect.moveCenter(d->geometry.center());
+    boundingRect = QRectF(0, 0, frameSize.width(), frameSize.height());
+    boundingRect.moveCenter(geometry.center());
 }
 
 void VideoGraphicsObject::frameReady()
diff --git a/phonon/graphicsview/videographicsobject.h b/phonon/graphicsview/videographicsobject.h
index e6cc328..00bc7e6 100644
--- a/phonon/graphicsview/videographicsobject.h
+++ b/phonon/graphicsview/videographicsobject.h
@@ -22,10 +22,9 @@
 #ifndef PHONON_VIDEOGRAPHICSITEM_H
 #define PHONON_VIDEOGRAPHICSITEM_H
 
-#include <QtCore/QMutex>
-#include <QtGui/QGraphicsItem>
+#include <QtGui/QGraphicsObject>
 
-#include "mediaobject.h"
+#include "medianode.h"
 
 namespace Phonon {
 
@@ -40,15 +39,10 @@ public:
     explicit VideoGraphicsObject(QGraphicsItem *parent = 0);
     virtual ~VideoGraphicsObject();
 
-#warning omg
     virtual QRectF boundingRect() const;
-
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
-
     void setGeometry(const QRectF &newGeometry);
 
-#warning what todo with this?! private?
-    void setTargetRect();
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
 
 private slots:
     void frameReady();

[prev in list] [next in list] [prev in thread] [next in thread]