Merge branch 'master' into next

[kdenlive] / src / keyframeedit.h

diff --git a/src/keyframeedit.h b/src/keyframeedit.h
index c415c0d7a9a15089f36b07e2181fbbb17e9fc2b9..210192e48a8c653b125bbd7548d8c5ff843d5c23 100644 (file)
--- a/src/keyframeedit.h
+++ b/src/keyframeedit.h
@@ -98,6 +98,11 @@ protected:
     /** @brief Gets the position of a keyframe from the table.
      * @param row Row of the keyframe in the table */
     int getPos(int row);
+    /** @brief Converts a frame value to timecode considering the frames vs. HH:MM:SS:FF setting.
+     * @return timecode */
+    QString getPosString(int pos);
+
+    void generateAllParams();
 
     int m_min;
     int m_max;
@@ -109,20 +114,14 @@ private:
     QList <QDomElement> m_params;
     Timecode m_timecode;
     QGridLayout *m_slidersLayout;
-    QButtonGroup *m_showButtons;
     PositionEdit *m_position;
 
-    void generateAllParams();
-    /** @brief Converts a frame value to timecode considering the frames vs. HH:MM:SS:FF setting.
-    * @return timecode */
-    QString getPosString(int pos);
-
 private slots:
     void slotDeleteKeyframe();
     void slotAddKeyframe();
     void slotGenerateParams(int row, int column);
     void slotAdjustKeyframePos(int value);
-    void slotAdjustKeyframeValue(int value);
+    void slotAdjustKeyframeValue(double value);
     /** @brief Turns the seek to keyframe position setting on/off.
     * @param seek true = seeking on */
     void slotSetSeeking(bool seek);