From 466ea658cfea6deb980dbc88cba17474c182422c Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sun, 12 May 2013 13:51:45 +0200 Subject: [PATCH] const'ify, move static function to public not in slot function --- src/geometrywidget.cpp | 2 +- src/kthumb.cpp | 4 ++-- src/kthumb.h | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp index c5e50ce2..eab0061e 100644 --- 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 63b41efb..ed979d39 100644 --- 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 148aaa73..b3a2f529 100644 --- 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. -- 2.39.2