Merge branch 'master' into feature/pkey

[kdenlive] / src / titlewidget.h

diff --git a/src/titlewidget.h b/src/titlewidget.h
index fe2d46f1a167aa3f6a96565ce1623c6d20595016..478bad411482c0506ffb5fdba315dab123d99ba4 100644 (file)
--- a/src/titlewidget.h
+++ b/src/titlewidget.h
@@ -105,6 +105,8 @@ public:
 
 protected:
     virtual void resizeEvent(QResizeEvent * event);
+    virtual void keyPressEvent(QKeyEvent *e);
+    virtual QSize sizeHint() const;
 
 private:
 
@@ -170,7 +172,7 @@ private:
     /** @brief Updates the displayed X/Y coordinates. */
     void updateCoordinates(QGraphicsItem *i);
 
-    /** @brief Updates the displayed width/height values. */
+    /** @brief Updates the displayed width/height/zindex values. */
     void updateDimension(QGraphicsItem *i);
 
     /** @brief Updates the displayed rotation/zoom values. Changes values of rotation/zoom GUI elements. */
@@ -224,7 +226,7 @@ private:
     void selectItems(int itemType);
 
     /** @brief Appends the shortcut of a QAction to a tooltip text */
-    QString getTooltipWithShortcut(const QString text, QAction *button);
+    QString getTooltipWithShortcut(const QString& text, QAction *button);
 
 public slots:
     void slotNewText(QGraphicsTextItem *tt);