const'ify, move static function to public not in slot function

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index c5e50ce2d20387afd2d259def078cc18459f1c62..eab0061e4da12c4dc955a5c750dafcc388f765de 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -276,7 +276,7 @@ GeometryWidget::~GeometryWidget()
        m_scene->removeItem(m_geomPath);
        delete m_geomPath;
     }
-    if (m_previous) delete m_previous;
+    delete m_previous;
     delete m_geometry;
     m_extraGeometryNames.clear();
     m_extraFactors.clear();

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 63b41efb2841388d25a75554c4ebb505bee9a953..ed979d390e4bab5622807489e7fc3ca20505d1d1 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -100,7 +100,7 @@ void KThumb::updateClipUrl(KUrl url, const QString &hash)
 }
 
 //static
-QPixmap KThumb::getImage(KUrl url, int width, int height)
+QPixmap KThumb::getImage(const KUrl& url, int width, int height)
 {
     if (url.isEmpty()) return QPixmap();
     return getImage(url, 0, width, height);
@@ -141,7 +141,7 @@ QImage KThumb::extractImage(int frame, int width, int height)
 }
 
 //static
-QPixmap KThumb::getImage(KUrl url, int frame, int width, int height)
+QPixmap KThumb::getImage(const KUrl& url, int frame, int width, int height)
 {
     Mlt::Profile profile(KdenliveSettings::current_profile().toUtf8().constData());
     QPixmap pix(width, height);

diff --git a/src/kthumb.h b/src/kthumb.h
index 148aaa73f4bb9b1803d72e7b04e53b4d2147a66b..b3a2f52962a03e397dbc804142e9562d7102bec5 100644 (file)
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -72,12 +72,14 @@ public:
 
 public slots:
     void updateClipUrl(KUrl url, const QString &hash);
-    static QPixmap getImage(KUrl url, int width, int height);
+
+public:
+    static QPixmap getImage(const KUrl &url, int width, int height);
 //    static QPixmap getImage(QDomElement xml, int frame, int width, int height);
     /* void getImage(KUrl url, int frame, int width, int height);
      void getThumbs(KUrl url, int startframe, int endframe, int width, int height);*/
     void slotCreateAudioThumbs();
-    static QPixmap getImage(KUrl url, int frame, int width, int height);
+    static QPixmap getImage(const KUrl& url, int frame, int width, int height);
     static QImage getFrame(Mlt::Producer *producer, int framepos, int frameWidth, int displayWidth, int height);
     static QImage getFrame(Mlt::Frame *frame, int frameWidth, int displayWidth, int height);
     /** @brief Calculates image variance, useful to know if a thumbnail is interesting.