const'ify

diff --git a/src/databackup/backupwidget.cpp b/src/databackup/backupwidget.cpp
index fda02cbcd8aaa7cc0cf0a8dafa52440e5112d399..2aafd7a14d3be7fb863b484198ef856e75719737 100644 (file)
--- a/src/databackup/backupwidget.cpp
+++ b/src/databackup/backupwidget.cpp
@@ -24,14 +24,12 @@
 #include <KUrl>
 
 
-BackupWidget::BackupWidget(KUrl projectUrl, KUrl projectFolder, const QString &projectId, QWidget * parent) :
+BackupWidget::BackupWidget(const KUrl &projectUrl, const KUrl &projectFolder, const QString &projectId, QWidget * parent) :
         QDialog(parent)
 {
     setupUi(this);
     setWindowTitle(i18n("Restore Backup File"));
 
-    KUrl backupFile;
-
     if (projectUrl.isEmpty()) {
         // No url, means we opened the backup dialog from an empty project
         info_label->setText(i18n("Showing all backup files in folder"));
@@ -106,7 +104,7 @@ void BackupWidget::slotDisplayBackupPreview()
     backup_preview->setPixmap(pix);
 }
 
-QString BackupWidget::selectedFile()
+QString BackupWidget::selectedFile() const
 {
     if (!backup_list->currentItem()) return QString();
     return backup_list->currentItem()->data(Qt::UserRole).toString();

diff --git a/src/databackup/backupwidget.h b/src/databackup/backupwidget.h
index cb21fd3b89045afdb9e15cbddfcededd5c346247..bb6b87e13369b0d1cb2868f341ada1a6bf4f3b0e 100644 (file)
--- a/src/databackup/backupwidget.h
+++ b/src/databackup/backupwidget.h
@@ -37,11 +37,11 @@ class BackupWidget : public QDialog, public Ui::BackupDialog_UI
     Q_OBJECT
 
 public:
-    BackupWidget(KUrl projectUrl, KUrl projectFolder, const QString &projectId, QWidget * parent = 0);
+    BackupWidget(const KUrl &projectUrl, const KUrl &projectFolder, const QString &projectId, QWidget * parent = 0);
     // Constructor for extracting widget
     ~BackupWidget();
     /** @brief Return the path for selected backup file. */
-    QString selectedFile();
+    QString selectedFile() const;
     
 private slots:
     /** @brief Parse the backup files in project folder. */

diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp
index 9e5b3c8528994ac2103550a44f7f0e4361183ad7..63f944e141b91b3d990767458ef7acc63ee3ebf3 100644 (file)
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -41,7 +41,7 @@
 #include <KApplication>
 
 
-CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) :
+CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) :
         AbstractCollapsibleWidget(parent),
         m_paramWidget(NULL),
         m_effect(effect),
@@ -145,7 +145,7 @@ CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_ef
 
 CollapsibleEffect::~CollapsibleEffect()
 {
-    if (m_paramWidget) delete m_paramWidget;
+    delete m_paramWidget;
     delete m_menu;
 }
 

diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h
index de675b48a23a177b295944bd39dccd01668ae073..ce4672c70390cf6546cf14383ef6eb43cee87e51 100644 (file)
--- a/src/effectstack/collapsibleeffect.h
+++ b/src/effectstack/collapsibleeffect.h
@@ -43,7 +43,7 @@ class CollapsibleEffect : public AbstractCollapsibleWidget
     Q_OBJECT
 
 public:
-    CollapsibleEffect(QDomElement effect, QDomElement original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0);
+    CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0);
     ~CollapsibleEffect();
     QLabel *title;
        

diff --git a/src/projecttree/abstractclipjob.cpp b/src/projecttree/abstractclipjob.cpp
index c39a12e6025c2da638a8155ff7470231130f939e..7854569347f51fb98a260f963d1a9a0e788dbe8d 100644 (file)
--- a/src/projecttree/abstractclipjob.cpp
+++ b/src/projecttree/abstractclipjob.cpp
@@ -26,7 +26,7 @@
 #include <KLocale>
 
 
-AbstractClipJob::AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, QStringList) :
+AbstractClipJob::AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, const QStringList &) :
         QObject(),
         clipType(cType),
         jobType(type),

diff --git a/src/projecttree/abstractclipjob.h b/src/projecttree/abstractclipjob.h
index 55d263a23ea8fe5030bc8a470835f826cc41ce79..dfc778fa145825f48623470df007dadc80749f4b 100644 (file)
--- a/src/projecttree/abstractclipjob.h
+++ b/src/projecttree/abstractclipjob.h
@@ -33,7 +33,7 @@ class AbstractClipJob : public QObject
     Q_OBJECT
 
 public:
-    AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, QStringList parameters);    virtual ~ AbstractClipJob();
+    AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, const QStringList &parameters);    virtual ~ AbstractClipJob();
     CLIPTYPE clipType;
     JOBTYPE jobType;
     QString description;

diff --git a/src/projecttree/cutclipjob.cpp b/src/projecttree/cutclipjob.cpp
index 1635721ea541b9293577531c4514c7e7258516ed..e423bc9b5a4d36d2002162b98a56fdff0fa56180 100644 (file)
--- a/src/projecttree/cutclipjob.cpp
+++ b/src/projecttree/cutclipjob.cpp
@@ -25,7 +25,7 @@
 #include <KDebug>
 #include <KLocale>
 
-CutClipJob::CutClipJob(CLIPTYPE cType, const QString &id, QStringList parameters) : AbstractClipJob(CUTJOB, cType, id, parameters)
+CutClipJob::CutClipJob(CLIPTYPE cType, const QString &id, const QStringList &parameters) : AbstractClipJob(CUTJOB, cType, id, parameters)
 {
     m_jobStatus = JOBWAITING;
     m_dest = parameters.at(0);

diff --git a/src/projecttree/cutclipjob.h b/src/projecttree/cutclipjob.h
index e76c54cdc365db75d2a4a67e9e9956af79aed2b5..8a9011694a91be75f5c09413a87833ba0ffaaf83 100644 (file)
--- a/src/projecttree/cutclipjob.h
+++ b/src/projecttree/cutclipjob.h
@@ -32,7 +32,7 @@ class CutClipJob : public AbstractClipJob
     Q_OBJECT
 
 public:
-    CutClipJob(CLIPTYPE cType, const QString &id, QStringList parameters);
+    CutClipJob(CLIPTYPE cType, const QString &id, const QStringList &parameters);
     virtual ~ CutClipJob();
     const QString destination() const;
     void startJob();

diff --git a/src/rotoscoping/rotowidget.cpp b/src/rotoscoping/rotowidget.cpp
index 6af6a67be366221b4d616c5d67ca50bdad4a7d91..86080a29983091e1f3906f795a58a3d1fcb9afa7 100644 (file)
--- a/src/rotoscoping/rotowidget.cpp
+++ b/src/rotoscoping/rotowidget.cpp
@@ -44,7 +44,7 @@ void tracking_finished(mlt_service *owner, RotoWidget *self, char *data)
         self->setSpline(QString(data));
 }
 
-RotoWidget::RotoWidget(QString data, Monitor *monitor, ItemInfo info, Timecode t, QWidget* parent) :
+RotoWidget::RotoWidget(const QString &data, Monitor *monitor, ItemInfo info, Timecode t, QWidget* parent) :
         QWidget(parent),
         m_monitor(monitor),
         m_showScene(true),
@@ -355,7 +355,7 @@ void RotoWidget::setupTrackingListen(ItemInfo info)
     delete clip;
 }
 
-void RotoWidget::setSpline(QString spline, bool notify)
+void RotoWidget::setSpline(const QString &spline, bool notify)
 {
     QJson::Parser parser;
     bool ok;

diff --git a/src/rotoscoping/rotowidget.h b/src/rotoscoping/rotowidget.h
index 91d53d2f4685b0646f8e657603e0a6965d5e6c46..090e98f27e170926575d9446f9eef6e9bec7fe71 100644 (file)
--- a/src/rotoscoping/rotowidget.h
+++ b/src/rotoscoping/rotowidget.h
@@ -42,14 +42,14 @@ class RotoWidget : public QWidget
     Q_OBJECT
 
 public:
-    RotoWidget(QString data, Monitor *monitor, ItemInfo info, Timecode t, QWidget* parent = 0);
+    RotoWidget(const QString &data, Monitor *monitor, ItemInfo info, Timecode t, QWidget* parent = 0);
     virtual ~RotoWidget();
 
     /** @brief Returns the spline(s) in the JSON format used by filter_rotoscoping (MLT). */
     QString getSpline();
 
     /** @brief Replaces current data with \param spline (JSON). */
-    void setSpline(QString spline, bool notify = true);
+    void setSpline(const QString &spline, bool notify = true);
 
     /** @brief Passed on to the keyframe timeline. Switches between frames and hh:mm:ss:ff timecode. */
     void updateTimecodeFormat();

diff --git a/src/simplekeyframes/simpletimelinewidget.cpp b/src/simplekeyframes/simpletimelinewidget.cpp
index ab181e0b99b9420108a88fb1d90b3af7e2414b5d..8b9843c72d5ef6339facaf65a19700d193732e60 100644 (file)
--- a/src/simplekeyframes/simpletimelinewidget.cpp
+++ b/src/simplekeyframes/simpletimelinewidget.cpp
@@ -47,7 +47,7 @@ SimpleTimelineWidget::SimpleTimelineWidget(QWidget* parent) :
     m_colKeyframeBg = scheme.shade(KColorScheme::MidShade);
 }
 
-void SimpleTimelineWidget::setKeyframes(QList <int> keyframes)
+void SimpleTimelineWidget::setKeyframes(const QList<int> &keyframes)
 {
     m_keyframes = keyframes;
     qSort(m_keyframes);

diff --git a/src/simplekeyframes/simpletimelinewidget.h b/src/simplekeyframes/simpletimelinewidget.h
index a71210a862a773b599010c8e389328844196d6a3..25dbde978f68bddabb88fe79dabed5b903de8409 100644 (file)
--- a/src/simplekeyframes/simpletimelinewidget.h
+++ b/src/simplekeyframes/simpletimelinewidget.h
@@ -28,7 +28,7 @@ class SimpleTimelineWidget : public QWidget
 
 public:
     SimpleTimelineWidget(QWidget* parent = 0);
-    void setKeyframes(QList <int> keyframes);
+    void setKeyframes(const QList <int>& keyframes);
     void setDuration(int dur);
 
 public slots:

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index eb203f13fc07bb092900393a81793cc3eba7e234..c2a54452fec57cc10979aa32aca9bc4ae12e9ba0 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -112,9 +112,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
 
 SlideshowClip::~SlideshowClip()
 {
-    if (m_thumbJob) {
-        delete m_thumbJob;
-    }
+    delete m_thumbJob;
 }
 
 void SlideshowClip::slotEnableLuma(int state)

diff --git a/src/spacerdialog.cpp b/src/spacerdialog.cpp
index 2b21e019baa36c3a7fe03a54ea11ddecb89776dc..a638ed07c001d6a05b12eee4e298bd7ded531b59 100644 (file)
--- a/src/spacerdialog.cpp
+++ b/src/spacerdialog.cpp
@@ -26,7 +26,7 @@
 #include <KDebug>
 
 
-SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, QList <TrackInfo> tracks, QWidget * parent) :
+SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, const QList<TrackInfo> &tracks, QWidget * parent) :
         QDialog(parent),
         m_in(tc)
 {

diff --git a/src/spacerdialog.h b/src/spacerdialog.h
index 8c0dcb9c8656fcb39fd45bd5e9d4aec7cd2fe292..854b104da15ed24e344cad88932b2a2aa4cd8160 100644 (file)
--- a/src/spacerdialog.h
+++ b/src/spacerdialog.h
@@ -38,7 +38,7 @@ class SpacerDialog : public QDialog, public Ui::SpacerDialog_UI
     Q_OBJECT
 
 public:
-    SpacerDialog(const GenTime duration, Timecode tc, int track, QList <TrackInfo> tracks, QWidget * parent = 0);
+    SpacerDialog(const GenTime duration, Timecode tc, int track, const QList <TrackInfo>& tracks, QWidget * parent = 0);
     GenTime selectedDuration();
     int selectedTrack();
 

diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp
index 517664df3c8802e116a547e281bfcaa780ea0327..866d6f273958b940588449d431a036c1adb617f2 100644 (file)
--- a/src/stopmotion/stopmotion.cpp
+++ b/src/stopmotion/stopmotion.cpp
@@ -50,7 +50,7 @@ MyLabel::MyLabel(QWidget* parent) :
 {
 }
 
-void MyLabel::setImage(QImage img)
+void MyLabel::setImage(const QImage& img)
 {
     m_img = img;
 }
@@ -139,7 +139,7 @@ void StopmotionMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
 {
 }
 
-StopmotionWidget::StopmotionWidget(MonitorManager *manager, KUrl projectFolder, QList< QAction* > actions, QWidget* parent) :
+StopmotionWidget::StopmotionWidget(MonitorManager *manager, const KUrl &projectFolder, QList< QAction* > actions, QWidget* parent) :
     QDialog(parent)
     , Ui::Stopmotion_UI()
     , m_projectFolder(projectFolder)

diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h
index 96500a9535aaf8112e179fd6ddae41ef532fddab..7d89befd151a2ebc69741e2208f22fe1c6b0239a 100644 (file)
--- a/src/stopmotion/stopmotion.h
+++ b/src/stopmotion/stopmotion.h
@@ -37,7 +37,7 @@ class MyLabel : public QLabel
     Q_OBJECT
 public:
     MyLabel(QWidget* parent = 0);
-    void setImage(QImage img);
+    void setImage(const QImage &img);
 
 protected:
     virtual void paintEvent(QPaintEvent* event);
@@ -92,7 +92,7 @@ public:
      * @param projectFolder The current project folder, where captured files will be stored.
      * @param actions The actions for this widget that can have a keyboard shortcut.
      * @param parent (optional) parent widget */
-    StopmotionWidget(MonitorManager *manager, KUrl projectFolder, QList< QAction* > actions, QWidget* parent = 0);
+    StopmotionWidget(MonitorManager *manager, const KUrl &projectFolder, QList< QAction* > actions, QWidget* parent = 0);
     virtual ~StopmotionWidget();
 
 protected:

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index ccef836098657448b7b362e00fcdba1c9e704e93..45f7580a0d3c8ae2fdea1e31adac25414507d72c 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -64,7 +64,7 @@ const int BLUREFFECT = 1;
 const int SHADOWEFFECT = 2;
 const int TYPEWRITEREFFECT = 3;
 
-TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render *render, QWidget *parent) :
+TitleWidget::TitleWidget(const KUrl &url, Timecode tc, const QString &projectTitlePath, Render *render, QWidget *parent) :
         QDialog(parent),
         Ui::TitleWidget_UI(),
         m_startViewport(NULL),

diff --git a/src/titlewidget.h b/src/titlewidget.h
index dfc537b60181505384302a22c3cb9e5ecb7ad653..5da2d6ee53fd0f091f65617f95f16ffd5b9b49cf 100644 (file)
--- a/src/titlewidget.h
+++ b/src/titlewidget.h
@@ -63,7 +63,7 @@ public:
      * @param projectPath default path to save to or load from title documents
      * @param render project renderer
      * @param parent (optional) parent widget */
-    TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render *render, QWidget *parent = 0);
+    TitleWidget(const KUrl &url, Timecode tc, const QString &projectTitlePath, Render *render, QWidget *parent = 0);
     virtual ~TitleWidget();
     QDomDocument xml();
     void setXml(QDomDocument doc);

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index 9ab4a9a7c5b5e381b4b03ed511ecdd785721c6ca..fcd3d495435fd9f2583b3b2c1839003a6eb12e69 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -259,7 +259,7 @@ void TransitionSettings::slotCheckMonitorPosition(int renderPos)
     }
 }
 
-void TransitionSettings::setKeyframes(const QString data, int maximum)
+void TransitionSettings::setKeyframes(const QString &data, int maximum)
 {
     m_effectEdit->setKeyframes(data, maximum);
 }

diff --git a/src/transitionsettings.h b/src/transitionsettings.h
index d331e0312e47d52cf90ca779a0a9d105bd912fe2..f236f8495f1ed29e17ec2f290292aeeccb1ef61d 100644 (file)
--- a/src/transitionsettings.h
+++ b/src/transitionsettings.h
@@ -36,7 +36,7 @@ public:
     void raiseWindow(QWidget*);
     void updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info);
     void updateTimecodeFormat();
-    void setKeyframes(const QString data, int maximum);
+    void setKeyframes(const QString &data, int maximum);
 
 private:
     EffectStackEdit *m_effectEdit;

diff --git a/src/utils/archiveorg.cpp b/src/utils/archiveorg.cpp
index d973d337f0ee98222ec2ea0f32ab8ebf75d666ec..988c02454b65a361dbe5d8e8d5aa65c8b7a813b2 100644 (file)
--- a/src/utils/archiveorg.cpp
+++ b/src/utils/archiveorg.cpp
@@ -49,7 +49,7 @@ ArchiveOrg::ArchiveOrg(QListWidget *listWidget, QObject *parent) :
 
 ArchiveOrg::~ArchiveOrg()
 {
-    if (m_previewProcess) delete m_previewProcess;
+    delete m_previewProcess;
 }
 
 void ArchiveOrg::slotStartSearch(const QString searchText, int page)

diff --git a/src/utils/freesound.cpp b/src/utils/freesound.cpp
index 57a1c99dd86a6f914aa5098c6227880cd284ba83..b2daf89eb1b5bf2e84242d5a64bfda33e131162a 100644 (file)
--- a/src/utils/freesound.cpp
+++ b/src/utils/freesound.cpp
@@ -47,7 +47,7 @@ FreeSound::FreeSound(QListWidget *listWidget, QObject *parent) :
 
 FreeSound::~FreeSound()
 {
-    if (m_previewProcess) delete m_previewProcess;
+    delete m_previewProcess;
 }
 
 void FreeSound::slotStartSearch(const QString searchText, int page)

diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index bace39db92fe683bbd10e9214a0baeb045d29b06..9748b4e862a142ccbe001c9a62b35ce2d08c5f86 100644 (file)
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -113,7 +113,7 @@ ResourceWidget::ResourceWidget(const QString & folder, QWidget * parent) :
 
 ResourceWidget::~ResourceWidget()
 {
-    if (m_currentService) delete m_currentService;
+    delete m_currentService;
     KIO::NetAccess::removeTempFile(m_tmpThumbFile);
 }
 

diff --git a/src/v4l/v4lcapture.cpp b/src/v4l/v4lcapture.cpp
index c3b3e9d0d35c660aff54495d5cee645698182a4a..d95bf702b5aff638990f28fb7173ca004cc05b4c 100644 (file)
--- a/src/v4l/v4lcapture.cpp
+++ b/src/v4l/v4lcapture.cpp
@@ -51,8 +51,8 @@ QStringList V4lCaptureHandler::getDeviceName(QString input)
     QString pixelformatdescription;
     int fd = open(src, O_RDWR | O_NONBLOCK);
     if(fd < 0) {
-       free(src);
-       return QStringList();
+        free(src);
+        return QStringList();
     }
     struct v4l2_capability cap;
 

diff --git a/src/videoglwidget.h b/src/videoglwidget.h
index 860156227fe691ba7d99cec8f48a9cfe15334cfd..a7cd3b215afcdce87caf7612adc9f6360c49bb48 100644 (file)
--- a/src/videoglwidget.h
+++ b/src/videoglwidget.h
@@ -9,13 +9,13 @@ class VideoGLWidget : public QGLWidget
     Q_OBJECT
 
 public:
-    VideoGLWidget(QWidget *parent = 0);
+    explicit VideoGLWidget(QWidget *parent = 0);
     ~VideoGLWidget();
     void activateMonitor();
     QSize minimumSizeHint() const;
     QSize sizeHint() const;
     void setImageAspectRatio(double ratio);
-    void setBackgroundColor(QColor color) {
+    void setBackgroundColor(const QColor &color) {
         m_backgroundColor = color;
     }