Menu
▾
▴
[Kdenlive-svn] [kdenlive/v0.9] src: const'ref.
|
From: Ed R. <ed....@go...> - 2013-05-20 09:35:57
|
Git commit 05f20eda700fbf0a128cd3867979628a122a462e by Ed Rogalsky, on behalf of Montel Laurent. Committed on 14/05/2013 at 20:10. Pushed by rogalsky into branch 'v0.9'. const'ref. M +2 -3 src/documentchecker.cpp M +2 -2 src/documentchecker.h M +1 -1 src/effectslistview.cpp M +1 -1 src/effectslistview.h M +1 -1 src/effectslistwidget.cpp M +1 -1 src/effectslistwidget.h M +1 -1 src/effectstackedit.cpp M +1 -1 src/effectstackedit.h M +1 -1 src/geometryval.cpp M +1 -1 src/geometryval.h M +2 -2 src/geometrywidget.cpp M +2 -2 src/geometrywidget.h M +1 -1 src/guide.cpp M +1 -1 src/guide.h M +1 -1 src/headertrack.cpp M +1 -1 src/headertrack.h M +2 -2 src/jogshuttle.cpp M +2 -2 src/jogshuttle.h M +1 -1 src/keyframehelper.h M +1 -1 src/markerdialog.cpp M +1 -1 src/markerdialog.h M +1 -1 src/mltdevicecapture.h M +4 -4 src/parameterplotter.cpp M +4 -4 src/parameterplotter.h M +1 -1 src/positionedit.cpp M +1 -1 src/positionedit.h M +6 -6 src/projectlist.cpp M +6 -6 src/projectlist.h M +3 -3 src/projectsettings.cpp M +3 -3 src/projectsettings.h M +1 -1 src/renderer.h M +3 -3 src/renderwidget.cpp M +3 -3 src/renderwidget.h M +2 -2 src/slideshowclip.cpp M +2 -2 src/slideshowclip.h M +1 -1 src/timecode.cpp M +1 -1 src/timecode.h M +2 -2 src/titlewidget.cpp M +2 -2 src/titlewidget.h M +3 -3 src/tracksconfigdialog.cpp M +4 -4 src/trackview.cpp M +4 -4 src/trackview.h M +2 -2 src/transitionsettings.cpp M +2 -2 src/transitionsettings.h M +1 -1 src/unicodedialog.cpp M +1 -1 src/unicodedialog.h M +1 -1 src/videoglwidget.cpp M +1 -1 src/videoglwidget.h http://commits.kde.org/kdenlive/05f20eda700fbf0a128cd3867979628a122a462e diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp index 7504af2..3f82996 100644 --- a/src/documentchecker.cpp +++ b/src/documentchecker.cpp @@ -339,7 +339,6 @@ bool DocumentChecker::hasErrorInClips() for (int i = 0; i < max; i++) { e = missingProxies.at(i).toElement(); - QString clipType; QString realPath = e.attribute("resource"); QString id = e.attribute("id"); // Tell Kdenlive to recreate proxy @@ -448,7 +447,7 @@ QString DocumentChecker::getProperty(QDomElement effect, const QString &name) return QString(); } -void DocumentChecker::setProperty(QDomElement effect, const QString &name, const QString value) +void DocumentChecker::setProperty(QDomElement effect, const QString &name, const QString &value) { QDomNodeList params = effect.elementsByTagName("property"); for (int i = 0; i < params.count(); i++) { @@ -916,7 +915,7 @@ void DocumentChecker::slotDeleteSelected() } } -void DocumentChecker::checkMissingImagesAndFonts(QStringList images, QStringList fonts, const QString &id, const QString &baseClip) +void DocumentChecker::checkMissingImagesAndFonts(const QStringList &images, const QStringList &fonts, const QString &id, const QString &baseClip) { QDomDocument doc; foreach(const QString &img, images) { diff --git a/src/documentchecker.h b/src/documentchecker.h index 03c91ec..60c4fd4 100644 --- a/src/documentchecker.h +++ b/src/documentchecker.h @@ -45,10 +45,10 @@ private slots: void slotPlaceholders(); void slotDeleteSelected(); QString getProperty(QDomElement effect, const QString &name); - void setProperty(QDomElement effect, const QString &name, const QString value); + void setProperty(QDomElement effect, const QString &name, const QString &value); QString searchLuma(const QDir &dir, const QString &file) const; /** @brief Check if images and fonts in this clip exists, returns a list of images that do exist so we don't check twice. */ - void checkMissingImagesAndFonts(QStringList images, QStringList fonts, const QString &id, const QString &baseClip); + void checkMissingImagesAndFonts(const QStringList &images, const QStringList &fonts, const QString &id, const QString &baseClip); void slotCheckButtons(); /** @brief Fix duration mismatch issues. */ void slotFixDuration(); diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index e4c9d6e..0176847 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -184,7 +184,7 @@ void EffectsListView::slotUpdateSearch(QTreeWidgetItem *item, bool hidden) } } -void EffectsListView::slotAutoExpand(QString text) +void EffectsListView::slotAutoExpand(const QString &text) { search_effect->updateSearch(); bool selected = false; diff --git a/src/effectslistview.h b/src/effectslistview.h index c744d08..0efbc74 100644 --- a/src/effectslistview.h +++ b/src/effectslistview.h @@ -87,7 +87,7 @@ private slots: /** @brief Expands folders that match our search. * @param text Current search string */ - void slotAutoExpand(QString text); + void slotAutoExpand(const QString &text); signals: void addEffect(const QDomElement); diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 2e6af1f..2e1229a 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -300,7 +300,7 @@ const QDomElement EffectsListWidget::itemEffect(QTreeWidgetItem *item) const } -QString EffectsListWidget::currentInfo() +QString EffectsListWidget::currentInfo() const { QTreeWidgetItem *item = currentItem(); if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return QString(); diff --git a/src/effectslistwidget.h b/src/effectslistwidget.h index c44d0f6..b3fd80b 100644 --- a/src/effectslistwidget.h +++ b/src/effectslistwidget.h @@ -37,7 +37,7 @@ public: explicit EffectsListWidget(QMenu *contextMenu, QWidget *parent = 0); virtual ~EffectsListWidget(); const QDomElement currentEffect() const; - QString currentInfo(); + QString currentInfo() const; const QDomElement itemEffect(QTreeWidgetItem *item) const; void initList(QMenu *effectsMenu, KActionCategory *effectActions); diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index be66814..c15c0fe 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -69,7 +69,7 @@ Monitor *EffectStackEdit::monitor() return m_metaInfo.monitor; } -void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t) +void EffectStackEdit::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t) { m_metaInfo.profile = profile; m_metaInfo.timecode = t; diff --git a/src/effectstackedit.h b/src/effectstackedit.h index c210b32..dd3bddf 100644 --- a/src/effectstackedit.h +++ b/src/effectstackedit.h @@ -38,7 +38,7 @@ class EffectStackEdit : public QScrollArea public: explicit EffectStackEdit(Monitor *monitor, QWidget *parent = 0); ~EffectStackEdit(); - void updateProjectFormat(MltVideoProfile profile, Timecode t); + void updateProjectFormat(const MltVideoProfile &profile, const Timecode &t); static QMap<QString, QImage> iconCache; /** @brief Sets attribute @param name to @param value. * diff --git a/src/geometryval.cpp b/src/geometryval.cpp index 0d70689..313751b 100644 --- a/src/geometryval.cpp +++ b/src/geometryval.cpp @@ -29,7 +29,7 @@ #include <QTimer> -Geometryval::Geometryval(const MltVideoProfile &profile, Timecode t, const QPoint &frame_size, int startPoint, QWidget* parent) : +Geometryval::Geometryval(const MltVideoProfile &profile, const Timecode &t, const QPoint &frame_size, int startPoint, QWidget* parent) : QWidget(parent), m_profile(profile), m_paramRect(NULL), diff --git a/src/geometryval.h b/src/geometryval.h index 0e00447..96c9f5b 100644 --- a/src/geometryval.h +++ b/src/geometryval.h @@ -40,7 +40,7 @@ class Geometryval : public QWidget, public Ui::Geometryval { Q_OBJECT public: - explicit Geometryval(const MltVideoProfile &profile, Timecode t, const QPoint &frame_size, int startPoint = 0, QWidget* parent = 0); + explicit Geometryval(const MltVideoProfile &profile, const Timecode &t, const QPoint &frame_size, int startPoint = 0, QWidget* parent = 0); virtual ~Geometryval(); QDomElement getParamDesc(); QString getValue() const; diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp index eab0061..b1e0c50 100644 --- a/src/geometrywidget.cpp +++ b/src/geometrywidget.cpp @@ -38,7 +38,7 @@ -GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, bool showRotation, QWidget* parent): +GeometryWidget::GeometryWidget(Monitor* monitor, const Timecode &timecode, int clipPos, bool isEffect, bool showRotation, QWidget* parent): QWidget(parent), m_monitor(monitor), m_timePos(new TimecodeDisplay(timecode)), @@ -378,7 +378,7 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra slotPositionChanged(0, false); } -void GeometryWidget::addParameter(const QDomElement elem) +void GeometryWidget::addParameter(const QDomElement &elem) { Mlt::Geometry *geometry = new Mlt::Geometry(elem.attribute("value").toUtf8().data(), m_outPoint - m_inPoint, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight()); m_extraGeometries.append(geometry); diff --git a/src/geometrywidget.h b/src/geometrywidget.h index aaa82b9..fc5e245 100644 --- a/src/geometrywidget.h +++ b/src/geometrywidget.h @@ -48,7 +48,7 @@ public: * @param isEffect true if used in an effect, false if used in a transition * @param showRotation Should we show or hide the rotation sliders * @param parent (optional) Parent widget */ - GeometryWidget(Monitor *monitor, Timecode timecode, int clipPos, bool isEffect, bool showRotation, QWidget* parent = 0); + GeometryWidget(Monitor *monitor, const Timecode &timecode, int clipPos, bool isEffect, bool showRotation, QWidget* parent = 0); virtual ~GeometryWidget(); /** @brief Gets the geometry as a serialized string. */ QString getValue() const; @@ -57,7 +57,7 @@ public: void updateTimecodeFormat(); /** @brief Sets the size of the original clip. */ void setFrameSize(QPoint size); - void addParameter(const QDomElement elem); + void addParameter(const QDomElement &elem); void importKeyframes(const QString &data, int maximum); int currentPosition() const; diff --git a/src/guide.cpp b/src/guide.cpp index 3d44c62..ba05ec6 100644 --- a/src/guide.cpp +++ b/src/guide.cpp @@ -29,7 +29,7 @@ #include <QGraphicsView> #include <QScrollBar> -Guide::Guide(CustomTrackView *view, GenTime pos, const QString &label, double height) : +Guide::Guide(CustomTrackView *view, const GenTime &pos, const QString &label, double height) : QGraphicsLineItem(), m_position(pos), m_label(label), diff --git a/src/guide.h b/src/guide.h index 5e77c85..6bd392a 100644 --- a/src/guide.h +++ b/src/guide.h @@ -34,7 +34,7 @@ class Guide : public QGraphicsLineItem { public: - Guide(CustomTrackView *view, GenTime pos, const QString &label, double height); + Guide(CustomTrackView *view, const GenTime &pos, const QString &label, double height); GenTime position() const; void updateGuide(const GenTime &newPos, const QString &comment = QString()); QString label() const; diff --git a/src/headertrack.cpp b/src/headertrack.cpp index d1d8f0f..cbf8a6a 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -96,7 +96,7 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, const QList <QAc { }*/ -void HeaderTrack::updateEffectLabel(QStringList effects) +void HeaderTrack::updateEffectLabel(const QStringList &effects) { if (!effects.isEmpty()) { effect_label->setHidden(false); diff --git a/src/headertrack.h b/src/headertrack.h index e262bb9..c2ca783 100644 --- a/src/headertrack.h +++ b/src/headertrack.h @@ -38,7 +38,7 @@ public: void adjustSize(int height); void setSelectedIndex(int ix); /** @brief Update the track label to show if current track has effects or not.*/ - void updateEffectLabel(QStringList effects); + void updateEffectLabel(const QStringList &effects); protected: virtual void mousePressEvent(QMouseEvent * event); diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp index 0e92cb4..e9f5fcb 100644 --- a/src/jogshuttle.cpp +++ b/src/jogshuttle.cpp @@ -265,7 +265,7 @@ void ShuttleThread::jog(unsigned int value) } -JogShuttle::JogShuttle(QString device, QObject *parent) : +JogShuttle::JogShuttle(const QString &device, QObject *parent) : QObject(parent) { initDevice(device); @@ -276,7 +276,7 @@ JogShuttle::~JogShuttle() stopDevice(); } -void JogShuttle::initDevice(QString device) +void JogShuttle::initDevice(const QString &device) { if (m_shuttleProcess.isRunning()) { if (device == m_shuttleProcess.m_device) return; diff --git a/src/jogshuttle.h b/src/jogshuttle.h index 55b4472..6b70be8 100644 --- a/src/jogshuttle.h +++ b/src/jogshuttle.h @@ -55,10 +55,10 @@ private: class JogShuttle: public QObject { Q_OBJECT public: - explicit JogShuttle(QString device, QObject * parent = 0); + explicit JogShuttle(const QString &device, QObject * parent = 0); ~JogShuttle(); void stopDevice(); - void initDevice(QString device); + void initDevice(const QString &device); protected: virtual void customEvent(QEvent * e); diff --git a/src/keyframehelper.h b/src/keyframehelper.h index a3d7b28..6d1f9a3 100644 --- a/src/keyframehelper.h +++ b/src/keyframehelper.h @@ -31,7 +31,7 @@ class KeyframeHelper : public QWidget { Q_OBJECT public: - KeyframeHelper(QWidget *parent = 0); + explicit KeyframeHelper(QWidget *parent = 0); int value() const; int frameLength; diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp index a99d93f..1dc8356 100644 --- a/src/markerdialog.cpp +++ b/src/markerdialog.cpp @@ -26,7 +26,7 @@ #include <KDebug> -MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent) : +MarkerDialog::MarkerDialog(DocClipBase *clip, const CommentedTime &t, const Timecode &tc, const QString &caption, QWidget * parent) : QDialog(parent) , m_producer(NULL) , m_profile(NULL) diff --git a/src/markerdialog.h b/src/markerdialog.h index 710c634..5927868 100644 --- a/src/markerdialog.h +++ b/src/markerdialog.h @@ -44,7 +44,7 @@ class MarkerDialog : public QDialog, public Ui::MarkerDialog_UI Q_OBJECT public: - MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent = 0); + MarkerDialog(DocClipBase *clip, const CommentedTime &t, const Timecode &tc, const QString &caption, QWidget * parent = 0); ~MarkerDialog(); CommentedTime newMarker(); QImage markerImage() const; diff --git a/src/mltdevicecapture.h b/src/mltdevicecapture.h index f572636..032de2c 100644 --- a/src/mltdevicecapture.h +++ b/src/mltdevicecapture.h @@ -51,7 +51,7 @@ Q_OBJECT public: /** @brief Build a MLT 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 capture (default one will be used if empty). */ - MltDeviceCapture(QString profile, VideoSurface *surface, QWidget *parent = 0); + explicit MltDeviceCapture(QString profile, VideoSurface *surface, QWidget *parent = 0); /** @brief Destroy the MLT Renderer. */ ~MltDeviceCapture(); diff --git a/src/parameterplotter.cpp b/src/parameterplotter.cpp index c123be2..45eff43 100644 --- a/src/parameterplotter.cpp +++ b/src/parameterplotter.cpp @@ -282,22 +282,22 @@ void ParameterPlotter::setNewPoints(bool b) m_newPoints = b; } -bool ParameterPlotter::isMoveX() +bool ParameterPlotter::isMoveX() const { return m_moveX; } -bool ParameterPlotter::isMoveY() +bool ParameterPlotter::isMoveY() const { return m_moveY; } -bool ParameterPlotter::isMoveTimeline() +bool ParameterPlotter::isMoveTimeline() const { return m_moveTimeline; } -bool ParameterPlotter::isNewPoints() +bool ParameterPlotter::isNewPoints() const { return m_newPoints; } diff --git a/src/parameterplotter.h b/src/parameterplotter.h index 2961dca..358bed2 100644 --- a/src/parameterplotter.h +++ b/src/parameterplotter.h @@ -32,10 +32,10 @@ public: void setMoveY(bool); void setMoveTimeLine(bool); void setNewPoints(bool); - bool isMoveX(); - bool isMoveY(); - bool isMoveTimeline(); - bool isNewPoints(); + bool isMoveX() const; + bool isMoveY() const; + bool isMoveTimeline() const; + bool isNewPoints() const; void replot(const QString& name = QString()); private: KPlotPoint* m_movepoint; diff --git a/src/positionedit.cpp b/src/positionedit.cpp index 78bcdd3..04c5d60 100644 --- a/src/positionedit.cpp +++ b/src/positionedit.cpp @@ -25,7 +25,7 @@ #include <QSlider> #include <QHBoxLayout> -PositionEdit::PositionEdit(const QString &name, int pos, int min, int max, const Timecode tc, QWidget* parent) : +PositionEdit::PositionEdit(const QString &name, int pos, int min, int max, const Timecode&tc, QWidget* parent) : QWidget(parent) { QHBoxLayout *layout = new QHBoxLayout(this); diff --git a/src/positionedit.h b/src/positionedit.h index ed22ba6..2666a31 100644 --- a/src/positionedit.h +++ b/src/positionedit.h @@ -30,7 +30,7 @@ class PositionEdit : public QWidget { Q_OBJECT public: - explicit PositionEdit(const QString &name, int pos, int min, int max, const Timecode tc, QWidget* parent = 0); + explicit PositionEdit(const QString &name, int pos, int min, int max, const Timecode& tc, QWidget* parent = 0); virtual ~PositionEdit(); int getPosition() const; void setPosition(int pos); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 9c74ef0..f42b186 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -2750,7 +2750,7 @@ void ProjectList::removeClipCut(const QString &id, int in, int out) emit projectModified(); } -SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone) +SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone) { SubProjectItem *sub = NULL; if (clip) { @@ -2778,7 +2778,7 @@ void ProjectList::slotUpdateClipCut(QPoint p) m_commandStack->push(command); } -void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment) +void ProjectList::doUpdateClipCut(const QString &id, const QPoint &oldzone, const QPoint &zone, const QString &comment) { ProjectItem *clip = getItemById(id); SubProjectItem *sub = getSubItem(clip, oldzone); @@ -2798,7 +2798,7 @@ void ProjectList::slotForceProcessing(const QString &id) m_render->forceProcessing(id); } -void ProjectList::slotAddOrUpdateSequence(const QString frameName) +void ProjectList::slotAddOrUpdateSequence(const QString &frameName) { QString fileName = KUrl(frameName).fileName().section('_', 0, -2); QStringList list; @@ -2860,7 +2860,7 @@ QMap <QString, QString> ProjectList::getProxies() return list; } -void ProjectList::slotCreateProxy(const QString id) +void ProjectList::slotCreateProxy(const QString &id) { ProjectItem *item = getItemById(id); if (!item || hasPendingJob(item, PROXYJOB) || item->referencedClip()->isPlaceHolder()) return; @@ -3073,7 +3073,7 @@ void ProjectList::slotCheckJobProcess() if (m_jobThreads.futures().isEmpty() || m_jobThreads.futures().count() < KdenliveSettings::proxythreads()) m_jobThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotProcessJobs)); } -void ProjectList::slotAbortProxy(const QString id, const QString path) +void ProjectList::slotAbortProxy(const QString &id, const QString &path) { Q_UNUSED(path) @@ -3228,7 +3228,7 @@ void ProjectList::updateProxyConfig() else delete command; } -void ProjectList::slotProcessLog(const QString id, int progress, int type, const QString message) +void ProjectList::slotProcessLog(const QString &id, int progress, int type, const QString &message) { ProjectItem *item = getItemById(id); setJobStatus(item, (JOBTYPE) type, JOBWORKING, progress, message); diff --git a/src/projectlist.h b/src/projectlist.h index 04a55f6..32c0ade 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -252,8 +252,8 @@ public: void addClipCut(const QString &id, int in, int out, const QString desc, bool newItem); void removeClipCut(const QString &id, int in, int out); void focusTree() const; - SubProjectItem *getSubItem(ProjectItem *clip, QPoint zone); - void doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment); + SubProjectItem *getSubItem(ProjectItem *clip, const QPoint &zone); + void doUpdateClipCut(const QString &id, const QPoint &oldzone, const QPoint &zone, const QString &comment); bool hasMissingClips(); void deleteProjectFolder(QMap <QString, QString> map); void selectItemById(const QString &clipId); @@ -460,16 +460,16 @@ private slots: /** @brief Try to find a matching profile for given item. */ bool adjustProjectProfileToItem(ProjectItem *item = NULL); /** @brief Add a sequence from the stopmotion widget. */ - void slotAddOrUpdateSequence(const QString frameName); + void slotAddOrUpdateSequence(const QString &frameName); /** @brief A proxy clip was created, update display. */ void slotGotProxy(const QString &proxyPath); void slotGotProxy(ProjectItem *item); /** @brief Enable / disable proxy for current clip. */ void slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy = NULL); /** @brief Put clip in the proxy waiting list. */ - void slotCreateProxy(const QString id); + void slotCreateProxy(const QString &id); /** @brief Stop creation of this clip's proxy. */ - void slotAbortProxy(const QString id, const QString path); + void slotAbortProxy(const QString &id, const QString& path); /** @brief Start creation of clip jobs. */ void slotProcessJobs(); /** @brief Discard running and pending clip jobs. */ @@ -477,7 +477,7 @@ private slots: /** @brief Discard a running clip jobs. */ void slotCancelRunningJob(const QString id, stringMap); /** @brief Update a clip's job status. */ - void slotProcessLog(const QString, int progress, int, const QString = QString()); + void slotProcessLog(const QString&, int progress, int, const QString & tmp= QString()); /** @brief A clip job crashed, inform user. */ void slotUpdateJobStatus(const QString id, int type, int status, const QString label, const QString actionName, const QString details); void slotUpdateJobStatus(ProjectItem *item, int type, int status, const QString &label, const QString &actionName = QString(), const QString details = QString()); diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index e963b28..1778e6b 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -35,7 +35,7 @@ #include <QDir> #include <kmessagebox.h> -ProjectSettings::ProjectSettings(ProjectList *projectlist, QMap <QString, QString> metadata, QStringList lumas, int videotracks, int audiotracks, const QString &projectPath, bool readOnlyTracks, bool savedProject, QWidget * parent) : +ProjectSettings::ProjectSettings(ProjectList *projectlist, QMap <QString, QString> metadata, const QStringList &lumas, int videotracks, int audiotracks, const QString &projectPath, bool readOnlyTracks, bool savedProject, QWidget * parent) : QDialog(parent), m_savedProject(savedProject), m_projectList(projectlist), m_lumas(lumas) { setupUi(this); @@ -482,7 +482,7 @@ QString ProjectSettings::proxyExtension() const } //static -QStringList ProjectSettings::extractPlaylistUrls(QString path) +QStringList ProjectSettings::extractPlaylistUrls(const QString &path) { QStringList urls; QDomDocument doc; @@ -535,7 +535,7 @@ QStringList ProjectSettings::extractPlaylistUrls(QString path) //static -QStringList ProjectSettings::extractSlideshowUrls(KUrl url) +QStringList ProjectSettings::extractSlideshowUrls(const KUrl &url) { QStringList urls; QString path = url.directory(KUrl::AppendTrailingSlash); diff --git a/src/projectsettings.h b/src/projectsettings.h index 7ff2729..06cdc8a 100644 --- a/src/projectsettings.h +++ b/src/projectsettings.h @@ -32,7 +32,7 @@ class ProjectSettings : public QDialog, public Ui::ProjectSettings_UI Q_OBJECT public: - ProjectSettings(ProjectList *projectlist, QMap <QString, QString> metadata, QStringList lumas, int videotracks, int audiotracks, const QString& projectPath, bool readOnlyTracks, bool unsavedProject, QWidget * parent = 0); + ProjectSettings(ProjectList *projectlist, QMap <QString, QString> metadata, const QStringList &lumas, int videotracks, int audiotracks, const QString& projectPath, bool readOnlyTracks, bool unsavedProject, QWidget * parent = 0); QString selectedProfile() const; KUrl selectedFolder() const; QPoint tracks(); @@ -46,8 +46,8 @@ public: QString proxyParams() const; QString proxyExtension() const; const QMap <QString, QString> metadata() const; - static QStringList extractPlaylistUrls(QString path); - static QStringList extractSlideshowUrls(KUrl url); + static QStringList extractPlaylistUrls(const QString &path); + static QStringList extractSlideshowUrls(const KUrl &url); public slots: virtual void accept(); diff --git a/src/renderer.h b/src/renderer.h index d0c7d34..e44e59a 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -82,7 +82,7 @@ bool operator==(const requestClipInfo &a) class MltErrorEvent : public QEvent { public: - MltErrorEvent(QString message) : QEvent(QEvent::User), m_message(message) {} + MltErrorEvent(const QString &message) : QEvent(QEvent::User), m_message(message) {} QString message() const { return m_message; } diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index fbc9c11..9bba7f5 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -134,7 +134,7 @@ const QString RenderJobItem::metadata() const } -RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, MltVideoProfile profile, QWidget * parent) : +RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, const MltVideoProfile &profile, QWidget * parent) : QDialog(parent), m_projectFolder(projectfolder), m_profile(profile), @@ -1183,7 +1183,7 @@ int RenderWidget::waitingJobsCount() const return count; } -void RenderWidget::setProfile(MltVideoProfile profile) +void RenderWidget::setProfile(const MltVideoProfile &profile) { m_view.scanning_list->setCurrentIndex(0); m_view.rescale_width->setValue(KdenliveSettings::defaultrescalewidth()); @@ -2019,7 +2019,7 @@ void RenderWidget::slotHideLog() m_view.error_box->setVisible(false); } -void RenderWidget::setRenderProfile(QMap <QString, QString> props) +void RenderWidget::setRenderProfile(const QMap<QString, QString> &props) { m_view.scanning_list->setCurrentIndex(props.value("renderscanning").toInt()); int exportAudio = props.value("renderexportaudio").toInt(); diff --git a/src/renderwidget.h b/src/renderwidget.h index 2c0002e..6e74ffa 100644 --- a/src/renderwidget.h +++ b/src/renderwidget.h @@ -114,16 +114,16 @@ class RenderWidget : public QDialog Q_OBJECT public: - explicit RenderWidget(const QString &projectfolder, bool enableProxy, MltVideoProfile profile, QWidget * parent = 0); + explicit RenderWidget(const QString &projectfolder, bool enableProxy, const MltVideoProfile &profile, QWidget * parent = 0); virtual ~RenderWidget(); void setGuides(QDomElement guidesxml, double duration); void focusFirstVisibleItem(const QString &profile = QString()); - void setProfile(MltVideoProfile profile); + void setProfile(const MltVideoProfile& profile); void setRenderJob(const QString &dest, int progress = 0); void setRenderStatus(const QString &dest, int status, const QString &error); void setDocumentPath(const QString &path); void reloadProfiles(); - void setRenderProfile(QMap <QString, QString> props); + void setRenderProfile(const QMap <QString, QString>& props); int waitingJobsCount() const; QString getFreeScriptName(const KUrl &projectName = KUrl(), const QString &prefix = QString()); bool startWaitingRenderJobs(); diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index b9ce196..71d2c2b 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -269,7 +269,7 @@ QString SlideshowClip::selectedPath() } // static -int SlideshowClip::getFrameNumberFromPath(KUrl path) +int SlideshowClip::getFrameNumberFromPath(const KUrl &path) { QString filter = path.fileName(); filter = filter.section('.', 0, -2); @@ -281,7 +281,7 @@ int SlideshowClip::getFrameNumberFromPath(KUrl path) } // static -QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QStringList *list) +QString SlideshowClip::selectedPath(const KUrl &url, bool isMime, QString extension, QStringList *list) { QString folder; if (isMime) { diff --git a/src/slideshowclip.h b/src/slideshowclip.h index b90eda3..fe0134f 100644 --- a/src/slideshowclip.h +++ b/src/slideshowclip.h @@ -50,9 +50,9 @@ public: QString animation() const; /** @brief Get the image frame number from a file path, for example image_047.jpg will return 47. */ - static int getFrameNumberFromPath(KUrl path); + static int getFrameNumberFromPath(const KUrl &path); /** @brief return the url pattern for selected slideshow. */ - static QString selectedPath(KUrl url, bool isMime, QString extension, QStringList *list); + static QString selectedPath(const KUrl &url, bool isMime, QString extension, QStringList *list); /** @brief Convert the selection animation style into an affine geometry string. */ static QString animationToGeometry(const QString &animation, int &ttl); diff --git a/src/timecode.cpp b/src/timecode.cpp index 08d524d..789b286 100644 --- a/src/timecode.cpp +++ b/src/timecode.cpp @@ -117,7 +117,7 @@ bool Timecode::df() const return m_dropFrameTimecode; } -const QString Timecode::mask(GenTime t) const +const QString Timecode::mask(const GenTime& t) const { if (t < GenTime()) { if (m_dropFrameTimecode) return "#99:99:99,99"; diff --git a/src/timecode.h b/src/timecode.h index 35a6f41..2346975 100644 --- a/src/timecode.h +++ b/src/timecode.h @@ -55,7 +55,7 @@ public: const QString getTimecodeFromFrames(int frames) const; double fps() const; bool df() const; - const QString mask(GenTime t = GenTime()) const; + const QString mask(const GenTime &t = GenTime()) const; QString reformatSeparators(QString duration) const; private: diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index a42d0a4..2bda535 100644 --- 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(const KUrl &url, Timecode tc, const QString &projectTitlePath, Render *render, QWidget *parent) : +TitleWidget::TitleWidget(const KUrl &url, const Timecode &tc, const QString &projectTitlePath, Render *render, QWidget *parent) : QDialog(parent), Ui::TitleWidget_UI(), m_startViewport(NULL), @@ -1544,7 +1544,7 @@ void TitleWidget::slotInsertUnicode() m_unicodeDialog->exec(); } -void TitleWidget::slotInsertUnicodeString(QString text) +void TitleWidget::slotInsertUnicodeString(const QString &text) { QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems(); if (l.size() > 0) { diff --git a/src/titlewidget.h b/src/titlewidget.h index 16afcae..4c44b63 100644 --- 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 */ - explicit TitleWidget(const KUrl &url, Timecode tc, const QString &projectTitlePath, Render *render, QWidget *parent = 0); + explicit TitleWidget(const KUrl &url, const Timecode &tc, const QString &projectTitlePath, Render *render, QWidget *parent = 0); virtual ~TitleWidget(); QDomDocument xml(); void setXml(const QDomDocument& doc); @@ -312,7 +312,7 @@ private slots: /** Called whenever text properties change (font e.g.) */ void slotUpdateText(); void slotInsertUnicode(); - void slotInsertUnicodeString(QString); + void slotInsertUnicodeString(const QString&); void displayBackgroundFrame(); diff --git a/src/tracksconfigdialog.cpp b/src/tracksconfigdialog.cpp index ad0665f..7d40b96 100644 --- a/src/tracksconfigdialog.cpp +++ b/src/tracksconfigdialog.cpp @@ -44,7 +44,7 @@ void TracksDelegate::setEditorData(QWidget *editor, const QModelIndex &index) co QComboBox *comboBox = qobject_cast<QComboBox *>(editor); if (!comboBox) return; - int pos = comboBox->findText(index.model()->data(index).toString(), Qt::MatchExactly); + const int pos = comboBox->findText(index.model()->data(index).toString(), Qt::MatchExactly); comboBox->setCurrentIndex(pos); } @@ -106,7 +106,7 @@ const QList <TrackInfo> TracksConfigDialog::tracksList() { QList <TrackInfo> tracks; TrackInfo info; - for (int i = table->rowCount() - 1; i >= 0; i--) { + for (int i = table->rowCount() - 1; i >= 0; --i) { info.trackName = table->item(i, 0)->text(); QTableWidgetItem *item = table->item(i, 1); if (item->text() == i18n("Audio")) { @@ -134,7 +134,7 @@ void TracksConfigDialog::setupOriginal(int selected) QStringList numbers; TrackInfo info; - for (int i = m_doc->tracksCount() - 1; i >= 0; i--) { + for (int i = m_doc->tracksCount() - 1; i >= 0; --i) { numbers << QString::number(i); info = m_doc->trackInfoAt(m_doc->tracksCount() - i - 1); table->setItem(i, 0, new QTableWidgetItem(info.trackName)); diff --git a/src/trackview.cpp b/src/trackview.cpp index b2303ec..6bc3d64 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -179,7 +179,7 @@ int TrackView::outPoint() const return m_ruler->outPoint(); } -void TrackView::slotSetZone(QPoint p, bool updateDocumentProperties) +void TrackView::slotSetZone(const QPoint &p, bool updateDocumentProperties) { m_ruler->setZone(p); if (updateDocumentProperties) m_doc->setZone(p.x(), p.y()); @@ -1011,7 +1011,7 @@ QDomElement TrackView::getEffectByTag(const QString &effecttag, const QString &e } -DocClipBase *TrackView::getMissingProducer(const QString id) const +DocClipBase *TrackView::getMissingProducer(const QString &id) const { QDomElement missingXml; QDomDocument doc = m_doc->toXml(); @@ -1130,7 +1130,7 @@ void TrackView::updateProjectFps() m_trackview->updateProjectFps(); } -void TrackView::slotRenameTrack(int ix, QString name) +void TrackView::slotRenameTrack(int ix, const QString &name) { int tracknumber = m_doc->tracksCount() - ix; QList <TrackInfo> tracks = m_doc->tracksList(); @@ -1168,7 +1168,7 @@ void TrackView::slotUpdateTrackEffectState(int ix) widgets.at(m_doc->tracksCount() - ix - 1)->updateEffectLabel(m_doc->trackInfoAt(ix).effectsList.effectNames()); } -void TrackView::slotSaveTimelinePreview(const QString path) +void TrackView::slotSaveTimelinePreview(const QString &path) { QImage img(width(), height(), QImage::Format_ARGB32_Premultiplied); img.fill(palette().base().color().rgb()); diff --git a/src/trackview.h b/src/trackview.h index b46ec00..49399b6 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -86,9 +86,9 @@ public slots: void slotDeleteClip(const QString &clipId); void slotChangeZoom(int horizontal, int vertical = -1); void setDuration(int dur); - void slotSetZone(QPoint p, bool updateDocumentProperties = true); + void slotSetZone(const QPoint &p, bool updateDocumentProperties = true); /** @brief Save a snapshot image of current timeline view */ - void slotSaveTimelinePreview(const QString path); + void slotSaveTimelinePreview(const QString &path); private: CustomRuler *m_ruler; CustomTrackView *m_trackview; @@ -107,7 +107,7 @@ private: void parseDocument(const QDomDocument &doc); int slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNodeList producers); - DocClipBase *getMissingProducer(const QString id) const; + DocClipBase *getMissingProducer(const QString &id) const; void adjustTrackHeaders(); /** @brief Add effects from the xml. Returns true if some effect was upgraded, false if everything went fine.*/ void slotAddProjectEffects(QDomNodeList effects, QDomElement parentNode, ClipItem *clip, int trackIndex); @@ -132,7 +132,7 @@ private slots: /** @brief Changes the name of a track. * @param ix Number of the track * @param name New name */ - void slotRenameTrack(int ix, QString name); + void slotRenameTrack(int ix, const QString &name); void slotRepaintTracks(); /** @brief Adjusts the margins of the header area. diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 55655f3..0d45c20 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -69,7 +69,7 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) : connect(m_effectEdit, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateEffectParams(QDomElement,QDomElement))); } -void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList<TrackInfo> &info) +void TransitionSettings::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t, const QList<TrackInfo> &info) { m_effectEdit->updateProjectFormat(profile, t); m_tracks = info; @@ -159,7 +159,7 @@ void TransitionSettings::slotTransitionTrackChanged() m_effectEdit->updateParameter("transition_btrack", QString::number(ix)); } -void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update) +void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, const QPoint &p, bool update) { setEnabled(t != NULL); m_effectEdit->setFrameSize(p); diff --git a/src/transitionsettings.h b/src/transitionsettings.h index 769e94b..ddda5c9 100644 --- a/src/transitionsettings.h +++ b/src/transitionsettings.h @@ -34,7 +34,7 @@ class TransitionSettings : public QWidget, public Ui::TransitionSettings_UI public: explicit TransitionSettings(Monitor *monitor, QWidget* parent = 0); void raiseWindow(QWidget*); - void updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo>& info); + void updateProjectFormat(const MltVideoProfile &profile, const Timecode &t, const QList <TrackInfo>& info); void updateTimecodeFormat(); void setKeyframes(const QString &data, int maximum); @@ -48,7 +48,7 @@ private: void updateTrackList(); public slots: - void slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update); + void slotTransitionItemSelected(Transition* t, int nextTrack, const QPoint &p, bool update); void slotTransitionChanged(bool reinit = true, bool updateCurrent = false); void slotUpdateEffectParams(const QDomElement, const QDomElement); diff --git a/src/unicodedialog.cpp b/src/unicodedialog.cpp index 6f0dae0..acea485 100644 --- a/src/unicodedialog.cpp +++ b/src/unicodedialog.cpp @@ -289,7 +289,7 @@ void UnicodeDialog::writeChoices() /** * \brief Validates the entered Unicode number and displays its Unicode character. */ -void UnicodeDialog::slotTextChanged(QString text) +void UnicodeDialog::slotTextChanged(const QString &text) { unicodeNumber->blockSignals(true); diff --git a/src/unicodedialog.h b/src/unicodedialog.h index 74f2cec..b34f3c0 100644 --- a/src/unicodedialog.h +++ b/src/unicodedialog.h @@ -72,7 +72,7 @@ signals: void charSelected(const QString&); private slots: - void slotTextChanged(QString text); + void slotTextChanged(const QString &text); void slotReturnPressed(); void slotNextUnicode(); void slotPrevUnicode(); diff --git a/src/videoglwidget.cpp b/src/videoglwidget.cpp index c613feb..617ef19 100644 --- a/src/videoglwidget.cpp +++ b/src/videoglwidget.cpp @@ -129,7 +129,7 @@ void VideoGLWidget::paintGL() } } -void VideoGLWidget::showImage(const QImage image) +void VideoGLWidget::showImage(const QImage &image) { m_image_width = image.width(); m_image_height = image.height(); diff --git a/src/videoglwidget.h b/src/videoglwidget.h index a7cd3b2..c9016e6 100644 --- a/src/videoglwidget.h +++ b/src/videoglwidget.h @@ -28,7 +28,7 @@ private: Qt::WindowFlags m_baseFlags; public slots: - void showImage(const QImage image); + void showImage(const QImage &image); protected: void initializeGL(); |