From 8fc16957ff5417b21e68ca5d84de89bec38c5a1c Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sun, 12 May 2013 08:57:59 +0200 Subject: [PATCH] Use const'ref. Remove not necessary ";" Fix includes --- src/abstractmonitor.cpp | 3 +-- src/abstractmonitor.h | 8 +++----- src/kthumb.cpp | 3 ++- src/kthumb.h | 6 +++--- src/mltdevicecapture.cpp | 1 + src/mltdevicecapture.h | 3 ++- src/renderer.h | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/abstractmonitor.cpp b/src/abstractmonitor.cpp index b1b3875c..ea729887 100644 --- a/src/abstractmonitor.cpp +++ b/src/abstractmonitor.cpp @@ -41,8 +41,7 @@ AbstractMonitor::AbstractMonitor(Kdenlive::MONITORID id, MonitorManager *manager AbstractMonitor::~AbstractMonitor() { - if (videoSurface) - delete videoSurface; + delete videoSurface; } void AbstractMonitor::createVideoSurface() diff --git a/src/abstractmonitor.h b/src/abstractmonitor.h index eec0cfef..b55fbd0f 100644 --- a/src/abstractmonitor.h +++ b/src/abstractmonitor.h @@ -26,9 +26,7 @@ #include #include #include -#include #include -#include #include @@ -43,10 +41,10 @@ Q_OBJECT public: * @param name A unique identifier for this renderer * @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering * @param profile The MLT profile used for the renderer (default one will be used if empty). */ - explicit AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0):QObject(parent), sendFrameForAnalysis(false), analyseAudio(false), m_name(name) {}; + explicit AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0):QObject(parent), sendFrameForAnalysis(false), analyseAudio(false), m_name(name) {} /** @brief Destroy the MLT Renderer. */ - virtual ~AbstractRender() {}; + virtual ~AbstractRender() {} /** @brief This property is used to decide if the renderer should convert it's frames to QImage for use in other Kdenlive widgets. */ bool sendFrameForAnalysis; @@ -54,7 +52,7 @@ Q_OBJECT public: /** @brief This property is used to decide if the renderer should send audio data for monitoring. */ bool analyseAudio; - const QString &name() const {return m_name;}; + const QString &name() const {return m_name;} /** @brief Someone needs us to send again a frame. */ virtual void sendFrameUpdate() = 0; diff --git a/src/kthumb.cpp b/src/kthumb.cpp index 2c8ac9b7..63b41efb 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -39,8 +39,9 @@ #include #include #include +#include -KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent) : +KThumb::KThumb(ClipManager *clipManager, const KUrl &url, const QString &id, const QString &hash, QObject * parent) : QObject(parent), m_url(url), m_thumbFile(), diff --git a/src/kthumb.h b/src/kthumb.h index 70b90412..148aaa73 100644 --- a/src/kthumb.h +++ b/src/kthumb.h @@ -50,10 +50,10 @@ typedef QMap > audioByteArray; class KThumb: public QObject { -Q_OBJECT public: + Q_OBJECT +public: - - KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent = 0); + KThumb(ClipManager *clipManager, const KUrl &url, const QString &id, const QString &hash, QObject * parent = 0); ~KThumb(); void setProducer(Mlt::Producer *producer); bool hasProducer() const; diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp index 629ed517..b55556dc 100644 --- a/src/mltdevicecapture.cpp +++ b/src/mltdevicecapture.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/src/mltdevicecapture.h b/src/mltdevicecapture.h index b0004a31..91faa5ba 100644 --- a/src/mltdevicecapture.h +++ b/src/mltdevicecapture.h @@ -30,7 +30,8 @@ #include #include - +#include + namespace Mlt { class Consumer; diff --git a/src/renderer.h b/src/renderer.h index 26add5a8..d0c7d34a 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -45,8 +45,8 @@ #include #include #include +#include -class QTimer; class QPixmap; class KComboBox; -- 2.39.5