Sort initializers in declaration order

[kdenlive] / src / geometryval.cpp

diff --git a/src/geometryval.cpp b/src/geometryval.cpp
index f75c21dcd4946178447993e13584fec46da637c8..43aaa5ee9761a399d6ac2d4abd10d322fde34375 100644 (file)
--- a/src/geometryval.cpp
+++ b/src/geometryval.cpp
@@ -15,22 +15,26 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "geometryval.h"
+#include "graphicsscenerectmove.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
 
 #include <QGraphicsView>
 #include <QVBoxLayout>
-#include <QGraphicsScene>
 #include <QGraphicsRectItem>
-#include <QMouseEvent>
 #include <QMenu>
 
-#include <KDebug>
-
-#include "graphicsscenerectmove.h"
-#include "geometryval.h"
-#include "kdenlivesettings.h"
 
-Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile), m_geom(NULL), m_path(NULL), paramRect(NULL), m_fixedMode(false) {
+Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent) :
+        QWidget(parent),
+        m_profile(profile),
+        paramRect(NULL),
+        m_geom(NULL),
+        m_path(NULL),
+        m_fixedMode(false)
+{
     ui.setupUi(this);
     QVBoxLayout* vbox = new QVBoxLayout(ui.widget);
     QGraphicsView *view = new QGraphicsView(this);
@@ -48,7 +52,6 @@ Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidge
     scene = new GraphicsSceneRectMove(this);
     scene->setTool(TITLE_SELECT);
     view->setScene(scene);
-    double aspect = (double) profile.sample_aspect_num / profile.sample_aspect_den * profile.width / profile.height;
     QGraphicsRectItem *m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, profile.width, profile.height));
     m_frameBorder->setZValue(-1100);
     m_frameBorder->setBrush(QColor(255, 255, 0, 30));
@@ -96,7 +99,7 @@ Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidge
     //view->fitInView(m_frameBorder, Qt::KeepAspectRatio);
     const double sc = 100.0 / profile.height * 0.8;
     QRectF srect = view->sceneRect();
-    view->setSceneRect(srect.x(), -srect.height() / 3, srect.width(), srect.height() + srect.height() / 3 * 2);
+    view->setSceneRect(srect.x(), -srect.height() / 3 + 10, srect.width(), srect.height() + srect.height() / 3 * 2 - 10);
     scene->setZoom(sc);
     view->centerOn(m_frameBorder);
     connect(ui.buttonNext , SIGNAL(clicked()) , this , SLOT(slotNextFrame()));
@@ -106,7 +109,8 @@ Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidge
     connect(scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateTransitionProperties()));
 }
 
-void Geometryval::slotAlignCenter() {
+void Geometryval::slotAlignCenter()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -118,7 +122,8 @@ void Geometryval::slotAlignCenter() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotAlignHCenter() {
+void Geometryval::slotAlignHCenter()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -130,7 +135,8 @@ void Geometryval::slotAlignHCenter() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotAlignVCenter() {
+void Geometryval::slotAlignVCenter()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -142,7 +148,8 @@ void Geometryval::slotAlignVCenter() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotAlignTop() {
+void Geometryval::slotAlignTop()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -154,7 +161,8 @@ void Geometryval::slotAlignTop() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotAlignBottom() {
+void Geometryval::slotAlignBottom()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -166,7 +174,8 @@ void Geometryval::slotAlignBottom() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotAlignLeft() {
+void Geometryval::slotAlignLeft()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -178,7 +187,8 @@ void Geometryval::slotAlignLeft() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotAlignRight() {
+void Geometryval::slotAlignRight()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -190,7 +200,8 @@ void Geometryval::slotAlignRight() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotResize50() {
+void Geometryval::slotResize50()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -202,7 +213,8 @@ void Geometryval::slotResize50() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotResize100() {
+void Geometryval::slotResize100()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -214,7 +226,8 @@ void Geometryval::slotResize100() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotResize200() {
+void Geometryval::slotResize200()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -226,7 +239,8 @@ void Geometryval::slotResize200() {
     slotUpdateTransitionProperties();
 }
 
-void Geometryval::slotTransparencyChanged(int transp) {
+void Geometryval::slotTransparencyChanged(int transp)
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->fetch(&item, pos);
@@ -240,11 +254,13 @@ void Geometryval::slotTransparencyChanged(int transp) {
     emit parameterChanged();
 }
 
-void Geometryval::slotSyncCursor() {
+void Geometryval::slotSyncCursor()
+{
     KdenliveSettings::setTransitionfollowcursor(m_syncAction->isChecked());
 }
 
-void Geometryval::slotPositionChanged(int pos, bool seek) {
+void Geometryval::slotPositionChanged(int pos, bool seek)
+{
     if (seek && KdenliveSettings::transitionfollowcursor()) emit seekToPos(pos);
     ui.spinPos->setValue(pos);
     m_helper->setValue(pos);
@@ -272,7 +288,8 @@ void Geometryval::slotPositionChanged(int pos, bool seek) {
     paramRect->setBrush(QColor(255, 0, 0, item.mix()));
 }
 
-void Geometryval::slotDeleteFrame() {
+void Geometryval::slotDeleteFrame()
+{
     // check there is more than one keyframe
     Mlt::GeometryItem item;
     const int pos = ui.spinPos->value();
@@ -290,9 +307,13 @@ void Geometryval::slotDeleteFrame() {
     m_scaleMenu->setEnabled(false);
     m_alignMenu->setEnabled(false);
     m_helper->update();
+    slotPositionChanged(pos, false);
+    updateTransitionPath();
+    emit parameterChanged();
 }
 
-void Geometryval::slotAddFrame() {
+void Geometryval::slotAddFrame()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     item.frame(pos);
@@ -309,9 +330,11 @@ void Geometryval::slotAddFrame() {
     m_scaleMenu->setEnabled(true);
     m_alignMenu->setEnabled(true);
     m_helper->update();
+    emit parameterChanged();
 }
 
-void Geometryval::slotNextFrame() {
+void Geometryval::slotNextFrame()
+{
     Mlt::GeometryItem item;
     int error = m_geom->next_key(&item, m_helper->value() + 1);
     kDebug() << "// SEEK TO NEXT KFR: " << error;
@@ -324,7 +347,8 @@ void Geometryval::slotNextFrame() {
     ui.spinPos->setValue(pos);
 }
 
-void Geometryval::slotPreviousFrame() {
+void Geometryval::slotPreviousFrame()
+{
     Mlt::GeometryItem item;
     int error = m_geom->prev_key(&item, m_helper->value() - 1);
     kDebug() << "// SEEK TO NEXT KFR: " << error;
@@ -334,17 +358,27 @@ void Geometryval::slotPreviousFrame() {
 }
 
 
-QDomElement Geometryval::getParamDesc() {
+QDomElement Geometryval::getParamDesc()
+{
     param.setAttribute("value", m_geom->serialise());
     kDebug() << " / / UPDATING TRANSITION VALUE: " << param.attribute("value");
     return param;
 }
 
-void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame) {
+void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame)
+{
     param = par;
     QString val = par.attribute("value");
     if (par.attribute("fixed") == "1") {
         m_fixedMode = true;
+        ui.buttonPrevious->setHidden(true);
+        ui.buttonNext->setHidden(true);
+        ui.buttonDelete->setHidden(true);
+        ui.buttonAdd->setHidden(true);
+        ui.spinTransp->setMaximum(500);
+        ui.label_pos->setHidden(true);
+        m_helper->setHidden(true);
+        ui.spinPos->setHidden(true);
     }
     char *tmp = (char *) qstrdup(val.toUtf8().data());
     if (m_geom) m_geom->parse(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
@@ -353,10 +387,7 @@ void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame)
 
     //kDebug() << " / / UPDATING TRANSITION VALUE: " << m_geom->serialise();
     //read param her and set rect
-    if (m_fixedMode) {
-        m_helper->setHidden(true);
-        ui.spinPos->setHidden(true);
-    } else {
+    if (!m_fixedMode) {
         m_helper->setKeyGeometry(m_geom, maxFrame - minFrame - 1);
         m_helper->update();
         /*QDomDocument doc;
@@ -383,11 +414,12 @@ void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame)
     slotPositionChanged(0, false);
     if (!m_fixedMode) {
         connect(ui.spinPos, SIGNAL(valueChanged(int)), this , SLOT(slotPositionChanged(int)));
-        connect(ui.spinTransp, SIGNAL(valueChanged(int)), this , SLOT(slotTransparencyChanged(int)));
     }
+    connect(ui.spinTransp, SIGNAL(valueChanged(int)), this , SLOT(slotTransparencyChanged(int)));
 }
 
-void Geometryval::updateTransitionPath() {
+void Geometryval::updateTransitionPath()
+{
     if (m_fixedMode) return;
     Mlt::GeometryItem item;
     int pos = 0;
@@ -407,7 +439,8 @@ void Geometryval::updateTransitionPath() {
     m_path->setPath(path);
 }
 
-void Geometryval::slotUpdateTransitionProperties() {
+void Geometryval::slotUpdateTransitionProperties()
+{
     int pos = ui.spinPos->value();
     Mlt::GeometryItem item;
     int error = m_geom->next_key(&item, pos);