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

List:       kde-commits
Subject:    [kdenlive] /: Fix transitions broken:
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2011-11-13 18:43:44
Message-ID: 20111113184344.4413EA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit b6f15d1f15f92794829559206e4e32eaf93b1329 by Jean-Baptiste Mardelle.
Committed on 13/11/2011 at 19:43.
Pushed by mardelle into branch 'master'.

Fix transitions broken: http://kdenlive.org/mantis/view.php?id=2404
Also fix a few CMakeLists missing newline

M  +1    -1    icons/CMakeLists.txt
M  +0    -2    src/abstractclipitem.h
M  +1    -1    src/mimetypes/CMakeLists.txt
M  +2    -2    src/transition.cpp
M  +1    -1    src/transition.h

http://commits.kde.org/kdenlive/b6f15d1f15f92794829559206e4e32eaf93b1329

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 6381335..6ab32fb 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,3 +1,3 @@
 #FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.svg*")
 kde4_install_icons( ${DATA_INSTALL_DIR}/kdenlive/icons)
-#install( FILES ${files} DESTINATION ${ICON_INSTALL_DIR} )
\ No newline at end of file
+#install( FILES ${files} DESTINATION ${ICON_INSTALL_DIR} )
diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index 060d538..8703c91 100644
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -37,9 +37,7 @@ class QGraphicsSceneMouseEvent;
 class AbstractClipItem : public QObject, public QGraphicsRectItem
 {
     Q_OBJECT
-#if QT_VERSION >= 0x040600
     Q_PROPERTY(QRectF rect READ rect WRITE setRect)
-#endif
 
 public:
     AbstractClipItem(const ItemInfo &info, const QRectF& rect, double fps);
diff --git a/src/mimetypes/CMakeLists.txt b/src/mimetypes/CMakeLists.txt
index 8a0e869..b82456b 100644
--- a/src/mimetypes/CMakeLists.txt
+++ b/src/mimetypes/CMakeLists.txt
@@ -1,4 +1,4 @@
 find_package(SharedMimeInfo REQUIRED)
 
 install(FILES kdenlive.xml westley.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
\ No newline at end of file
+update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
diff --git a/src/transition.cpp b/src/transition.cpp
index a43a8ce..b9a4ed9 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -51,8 +51,8 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, \
double fps, QD  else {
         QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect");
         startAnimation->setDuration(200);
-        QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() \
                / 2);
-        QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, \
(qreal)itemHeight()); +        const QRectF r(0, 0, m_info.cropDuration.frames(fps) - \
0.02, (qreal) itemHeight() / 2); +        const QRectF r2(0, 0, \
m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());  \
startAnimation->setStartValue(r);  startAnimation->setEndValue(r2);
         startAnimation->setEasingCurve(QEasingCurve::OutQuad);
diff --git a/src/transition.h b/src/transition.h
index 49b90e0..614d37e 100644
--- a/src/transition.h
+++ b/src/transition.h
@@ -82,7 +82,7 @@ public:
     int defaultZValue() const;
     /** @brief When a transition is resized, check if keyframes are out of the \
transition and fix if necessary. */  bool updateKeyframes();
-    void animate();
+
 protected:
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 


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