From: Montel Laurent Date: Mon, 13 May 2013 11:33:33 +0000 (+0200) Subject: Use const'ref, change if(foo) delete foo => delete foo not necessary to check it... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3d9ff40b713934e307b6ac7808bd8d56d0bd66f7;p=kdenlive Use const'ref, change if(foo) delete foo => delete foo not necessary to check it, C++ does it for us Add explicit keyword when necessary --- diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp index 69436e26..f761c02e 100644 --- a/src/clipdurationdialog.cpp +++ b/src/clipdurationdialog.cpp @@ -27,7 +27,7 @@ #include -ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, GenTime min, GenTime max, QWidget * parent): +ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, const Timecode &tc, const GenTime &min, const GenTime &max, QWidget * parent): QDialog(parent), m_clip(clip), m_min(min), diff --git a/src/clipdurationdialog.h b/src/clipdurationdialog.h index 27a8ee18..ea09744a 100644 --- a/src/clipdurationdialog.h +++ b/src/clipdurationdialog.h @@ -37,7 +37,7 @@ class ClipDurationDialog : public QDialog, public Ui::ClipDurationDialog_UI Q_OBJECT public: - ClipDurationDialog(AbstractClipItem *clip, Timecode tc, GenTime min, GenTime max, QWidget * parent = 0); + explicit ClipDurationDialog(AbstractClipItem *clip, const Timecode &tc, const GenTime &min, const GenTime &max, QWidget * parent = 0); ~ClipDurationDialog(); GenTime startPos() const; GenTime cropStart() const; diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 479c28c9..e19ef61a 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -42,7 +42,7 @@ static int FRAME_SIZE; -ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) : +ClipItem::ClipItem(DocClipBase *clip, const ItemInfo& info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_startFade(0), diff --git a/src/clipitem.h b/src/clipitem.h index abc7aa95..da52dbde 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -46,7 +46,7 @@ class ClipItem : public AbstractClipItem Q_OBJECT public: - ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs = true); + ClipItem(DocClipBase *clip, const ItemInfo &info, double fps, double speed, int strobe, int frame_width, bool generateThumbs = true); virtual ~ ClipItem(); virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index 8a1c3647..b764ee72 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -464,7 +464,7 @@ DocClipBase *ClipManager::getClipById(QString clipId) return NULL; } -const QList ClipManager::getClipByResource(QString resource) +const QList ClipManager::getClipByResource(const QString &resource) { QList list; QString clipResource; @@ -663,7 +663,7 @@ void ClipManager::slotAddXmlClipFile(const QString &name, const QDomElement &xml m_doc->commandStack()->push(command); } -void ClipManager::slotAddColorClipFile(const QString &name, const QString &color, QString duration, const QString &group, const QString &groupId) +void ClipManager::slotAddColorClipFile(const QString &name, const QString &color, const QString &duration, const QString &group, const QString &groupId) { QDomDocument doc; QDomElement prod = doc.createElement("producer"); @@ -982,7 +982,7 @@ bool ClipManager::isOnRemovableDevice(const KUrl &url) return volumeMatch; } -void ClipManager::projectTreeThumbReady(const QString &id, int frame, QImage img, int type) +void ClipManager::projectTreeThumbReady(const QString &id, int frame, const QImage &img, int type) { switch (type) { case 2: diff --git a/src/clipmanager.h b/src/clipmanager.h index 5165bbd4..2a06970b 100644 --- a/src/clipmanager.h +++ b/src/clipmanager.h @@ -99,10 +99,10 @@ Q_OBJECT public: void slotAddTextClipFile(const QString &titleName, int out, const QString &xml, const QString &group, const QString &groupId); void slotAddTextTemplateClip(QString titleName, const KUrl &path, const QString &group, const QString &groupId); void slotAddXmlClipFile(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId); - void slotAddColorClipFile(const QString &name, const QString &color, QString duration, const QString &group, const QString &groupId); + void slotAddColorClipFile(const QString &name, const QString &color, const QString &duration, const QString &group, const QString &groupId); void slotAddSlideshowClipFile(QMap properties, const QString &group, const QString &groupId); DocClipBase *getClipById(QString clipId); - const QList getClipByResource(QString resource); + const QList getClipByResource(const QString &resource); void slotDeleteClips(QStringList ids); void setThumbsProgress(const QString &message, int progress); void checkAudioThumbs(); @@ -125,7 +125,7 @@ Q_OBJECT public: int clipsCount() const; /** @brief remove a clip id from the queue list. */ void stopThumbs(const QString &id); - void projectTreeThumbReady(const QString &id, int frame, QImage img, int type); + void projectTreeThumbReady(const QString &id, int frame, const QImage &img, int type); #if KDE_IS_VERSION(4,5,0) KImageCache* pixmapCache; diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index 2bc19e62..6f5366c6 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -56,7 +56,7 @@ static const int METATAB = 6; static const int ADVANCEDTAB = 7; -ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent) : +ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps, QWidget * parent) : QDialog(parent) , m_clip(clip) , m_tc(tc) diff --git a/src/clipproperties.h b/src/clipproperties.h index 075e13f0..19b5bc7d 100644 --- a/src/clipproperties.h +++ b/src/clipproperties.h @@ -47,7 +47,7 @@ class ClipProperties : public QDialog Q_OBJECT public: - ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent = 0); + ClipProperties(DocClipBase *clip, const Timecode &tc, double fps, QWidget * parent = 0); ClipProperties(QList cliplist, Timecode tc, QMap commonproperties, QWidget * parent); virtual ~ClipProperties(); QMap properties(); diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp index 9caf4e4a..664eb5fa 100644 --- a/src/cliptranscode.cpp +++ b/src/cliptranscode.cpp @@ -127,7 +127,7 @@ void ClipTranscode::slotStartTransCode() QStringList parameters; QString destination; QString params = ffmpeg_params->toPlainText().simplified(); - if (m_urls.count() > 0 && urls_list->count() > 0) { + if (!m_urls.isEmpty() && urls_list->count() > 0) { // We are processing multiple clips source_url->setUrl(m_urls.takeFirst()); destination = dest_url->url().path(KUrl::AddTrailingSlash) + source_url->url().fileName(); diff --git a/src/complexparameter.cpp b/src/complexparameter.cpp index 7b4d5ff2..da969101 100644 --- a/src/complexparameter.cpp +++ b/src/complexparameter.cpp @@ -114,7 +114,7 @@ void ComplexParameter::slotParameterChanged(const QString& text) updateButtonStatus(); } -void ComplexParameter::setupParam(const QDomElement d, const QString& paramName, int from, int to) +void ComplexParameter::setupParam(const QDomElement &d, const QString& paramName, int from, int to) { m_param = d; m_ui.kplotwidget->setPointLists(d, paramName, from, to); @@ -125,7 +125,7 @@ void ComplexParameter::itemSelectionChanged() //kDebug() << "drop"; } -void ComplexParameter::slotUpdateEffectParams(QDomElement e) +void ComplexParameter::slotUpdateEffectParams(const QDomElement &e) { m_param = e; emit parameterChanged(); diff --git a/src/complexparameter.h b/src/complexparameter.h index 89906054..9c2338ba 100644 --- a/src/complexparameter.h +++ b/src/complexparameter.h @@ -45,8 +45,8 @@ public slots: void slotShowInTimeline(); void slotParameterChanged(const QString&); void itemSelectionChanged(); - void setupParam(const QDomElement, const QString& paramName, int, int); - void slotUpdateEffectParams(QDomElement e); + void setupParam(const QDomElement &, const QString& paramName, int, int); + void slotUpdateEffectParams(const QDomElement &e); void slotUpdateParameterList(const QStringList &); signals: void removeEffect(ClipItem*, QDomElement); diff --git a/src/cornerswidget.cpp b/src/cornerswidget.cpp index d31c091d..aacebe35 100644 --- a/src/cornerswidget.cpp +++ b/src/cornerswidget.cpp @@ -36,7 +36,7 @@ inline int lerp( const int a, const int b, double t ) return a + (b - a) * t; } -CornersWidget::CornersWidget(Monitor *monitor, const QDomElement& e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent) : +CornersWidget::CornersWidget(Monitor *monitor, const QDomElement& e, int minFrame, int maxFrame, const Timecode &tc, int activeKeyframe, QWidget* parent) : KeyframeEdit(e, minFrame, maxFrame, tc, activeKeyframe, parent), m_monitor(monitor), m_showScene(true), diff --git a/src/cornerswidget.h b/src/cornerswidget.h index 1cad4610..4c585cbb 100644 --- a/src/cornerswidget.h +++ b/src/cornerswidget.h @@ -40,7 +40,7 @@ public: * @param isEffect true if used in an effect, false if used in a transition * @param factor Factor by which the parameters differ from the range 0-1 * @param parent (optional) Parent widget */ - explicit CornersWidget(Monitor *monitor, const QDomElement &e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent = 0); + explicit CornersWidget(Monitor *monitor, const QDomElement &e, int minFrame, int maxFrame, const Timecode &tc, int activeKeyframe, QWidget* parent = 0); virtual ~CornersWidget(); virtual void addParameter(QDomElement e, int activeKeyframe = -1); diff --git a/src/databackup/backupwidget.cpp b/src/databackup/backupwidget.cpp index 2aafd7a1..8ff35b07 100644 --- a/src/databackup/backupwidget.cpp +++ b/src/databackup/backupwidget.cpp @@ -99,7 +99,7 @@ void BackupWidget::slotDisplayBackupPreview() backup_preview->setPixmap(QPixmap()); return; } - QString path = backup_list->currentItem()->data(Qt::UserRole).toString(); + const QString path = backup_list->currentItem()->data(Qt::UserRole).toString(); QPixmap pix(path + ".png"); backup_preview->setPixmap(pix); } diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 938cdb7e..61632374 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -218,7 +218,7 @@ const QString DocClipBase::getProperty(const QString &prop) const return m_properties.value(prop); } -void DocClipBase::setDuration(GenTime dur) +void DocClipBase::setDuration(const GenTime &dur) { m_duration = dur; m_properties.insert("duration", QString::number((int) dur.frames(KdenliveSettings::project_fps()))); @@ -380,7 +380,7 @@ QList < CommentedTime > DocClipBase::commentedSnapMarkers() const } -void DocClipBase::addSnapMarker(const CommentedTime marker) +void DocClipBase::addSnapMarker(const CommentedTime &marker) { QList < CommentedTime >::Iterator it = m_snapMarkers.begin(); for (it = m_snapMarkers.begin(); it != m_snapMarkers.end(); ++it) { @@ -397,7 +397,7 @@ void DocClipBase::addSnapMarker(const CommentedTime marker) } } -void DocClipBase::editSnapMarker(const GenTime & time, QString comment) +void DocClipBase::editSnapMarker(const GenTime & time, const QString &comment) { QList < CommentedTime >::Iterator it; for (it = m_snapMarkers.begin(); it != m_snapMarkers.end(); ++it) { diff --git a/src/docclipbase.h b/src/docclipbase.h index 0e22c4da..e4f90fce 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -89,7 +89,7 @@ public: const GenTime & duration() const; const GenTime maxDuration() const; /** returns the duration of this clip */ - void setDuration(GenTime dur); + void setDuration(const GenTime &dur); /** returns clip type (audio, text, image,...) */ const CLIPTYPE & clipType() const; @@ -271,8 +271,8 @@ public slots: GenTime findPreviousSnapMarker(const GenTime & currTime); GenTime hasSnapMarkers(const GenTime & time); QString deleteSnapMarker(const GenTime & time); - void editSnapMarker(const GenTime & time, QString comment); - void addSnapMarker(const CommentedTime marker); + void editSnapMarker(const GenTime & time, const QString &comment); + void addSnapMarker(const CommentedTime &marker); QList < GenTime > snapMarkers() const; QString markerComment(GenTime t) const; CommentedTime markerAt(GenTime t) const; diff --git a/src/doubleparameterwidget.cpp b/src/doubleparameterwidget.cpp index bcbcf509..ce8153a5 100644 --- a/src/doubleparameterwidget.cpp +++ b/src/doubleparameterwidget.cpp @@ -31,7 +31,7 @@ #include -DoubleParameterWidget::DoubleParameterWidget(const QString &name, double value, double min, double max, double defaultValue, const QString &comment, int id, const QString suffix, int decimals, QWidget *parent) : +DoubleParameterWidget::DoubleParameterWidget(const QString &name, double value, double min, double max, double defaultValue, const QString &comment, int id, const QString &suffix, int decimals, QWidget *parent) : QWidget(parent) { setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum); diff --git a/src/doubleparameterwidget.h b/src/doubleparameterwidget.h index 8d85c3ff..7dec6465 100644 --- a/src/doubleparameterwidget.h +++ b/src/doubleparameterwidget.h @@ -48,7 +48,7 @@ public: * @param comment A comment explaining the parameter. Will be shown for the tooltip. * @param suffix (optional) Suffix to display in spinbox * @param parent (optional) Parent Widget */ - DoubleParameterWidget(const QString &name, double value, double min, double max, double defaultValue, const QString &comment, int id, const QString suffix = QString(), int decimals = 0, QWidget* parent = 0); + explicit DoubleParameterWidget(const QString &name, double value, double min, double max, double defaultValue, const QString &comment, int id, const QString &suffix = QString(), int decimals = 0, QWidget* parent = 0); ~DoubleParameterWidget(); /** @brief Gets the parameter's value. */ diff --git a/src/dragvalue.cpp b/src/dragvalue.cpp index cf59b180..21a99aa6 100644 --- a/src/dragvalue.cpp +++ b/src/dragvalue.cpp @@ -43,7 +43,7 @@ #include -DragValue::DragValue(const QString &label, double defaultValue, int decimals, double min, double max, int id, const QString suffix, bool showSlider, QWidget* parent) : +DragValue::DragValue(const QString &label, double defaultValue, int decimals, double min, double max, int id, const QString &suffix, bool showSlider, QWidget* parent) : QWidget(parent), m_maximum(max), m_minimum(min), diff --git a/src/dragvalue.h b/src/dragvalue.h index cfd1f02a..eda130f8 100644 --- a/src/dragvalue.h +++ b/src/dragvalue.h @@ -85,7 +85,7 @@ public: * @param suffix The suffix that will be displayed in the spinbox (for example '%') * @param showSlider If disabled, user can still drag on the label but no progress bar is shown */ - DragValue(const QString &label, double defaultValue, int decimals, double min = 0, double max = 100, int id = -1, const QString suffix = QString(), bool showSlider = true, QWidget* parent = 0); + explicit DragValue(const QString &label, double defaultValue, int decimals, double min = 0, double max = 100, int id = -1, const QString &suffix = QString(), bool showSlider = true, QWidget* parent = 0); virtual ~DragValue(); /** @brief Returns the precision = number of decimals */ diff --git a/src/effectslist.cpp b/src/effectslist.cpp index 4479371c..874790ee 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -163,7 +163,7 @@ QString EffectsList::getEffectInfo(const QDomElement effect) const } // static -bool EffectsList::hasKeyFrames(QDomElement effect) +bool EffectsList::hasKeyFrames(const QDomElement &effect) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -174,7 +174,7 @@ bool EffectsList::hasKeyFrames(QDomElement effect) } // static -bool EffectsList::hasSimpleKeyFrames(QDomElement effect) +bool EffectsList::hasSimpleKeyFrames(const QDomElement &effect) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -185,7 +185,7 @@ bool EffectsList::hasSimpleKeyFrames(QDomElement effect) } // static -bool EffectsList::hasGeometryKeyFrames(QDomElement effect) +bool EffectsList::hasGeometryKeyFrames(const QDomElement &effect) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); ++i) { @@ -233,7 +233,7 @@ void EffectsList::setParameter(QDomElement effect, const QString &name, const QS } // static -QString EffectsList::parameter(QDomElement effect, const QString &name) +QString EffectsList::parameter(const QDomElement &effect, const QString &name) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -393,7 +393,7 @@ void EffectsList::updateIndexes(QDomNodeList effects, int startIndex) } } -void EffectsList::enableEffects(QList indexes, bool disable) +void EffectsList::enableEffects(const QList & indexes, bool disable) { QDomNodeList effects = m_baseElement.childNodes(); QDomElement effect; diff --git a/src/effectslist.h b/src/effectslist.h index 7119448c..9654b5bb 100644 --- a/src/effectslist.h +++ b/src/effectslist.h @@ -72,11 +72,11 @@ public: QDomElement itemFromIndex(int ix) const; QDomElement insert(QDomElement effect); void updateEffect(QDomElement effect); - static bool hasKeyFrames(QDomElement effect); - static bool hasSimpleKeyFrames(QDomElement effect); - static bool hasGeometryKeyFrames(QDomElement effect); + static bool hasKeyFrames(const QDomElement &effect); + static bool hasSimpleKeyFrames(const QDomElement &effect); + static bool hasGeometryKeyFrames(const QDomElement &effect); static void setParameter(QDomElement effect, const QString &name, const QString &value); - static QString parameter(QDomElement effect, const QString &name); + static QString parameter(const QDomElement &effect, const QString &name); /** @brief Change the value of a 'property' element from the effect node. */ static void setProperty(QDomElement effect, const QString &name, const QString &value); /** @brief Rename a 'property' element from the effect node. */ @@ -93,7 +93,7 @@ public: /** @brief Update all effects indexes to make sure they are 1, 2, 3, ... */ void updateIndexes(QDomNodeList effects, int startIndex); /** @brief Enable / disable a list of effects */ - void enableEffects(QList indexes, bool disable); + void enableEffects(const QList &indexes, bool disable); private: QDomElement m_baseElement; diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp index 63f944e1..21317971 100644 --- a/src/effectstack/collapsibleeffect.cpp +++ b/src/effectstack/collapsibleeffect.cpp @@ -41,7 +41,7 @@ #include -CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) : +CollapsibleEffect::CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, const ItemInfo &info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent) : AbstractCollapsibleWidget(parent), m_paramWidget(NULL), m_effect(effect), diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h index ce4672c7..c73cf67b 100644 --- a/src/effectstack/collapsibleeffect.h +++ b/src/effectstack/collapsibleeffect.h @@ -43,7 +43,7 @@ class CollapsibleEffect : public AbstractCollapsibleWidget Q_OBJECT public: - CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, ItemInfo info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0); + explicit CollapsibleEffect(const QDomElement &effect, const QDomElement &original_effect, const ItemInfo &info, EffectMetaInfo *metaInfo, bool lastEffect, QWidget * parent = 0); ~CollapsibleEffect(); QLabel *title; diff --git a/src/effectstack/collapsiblegroup.cpp b/src/effectstack/collapsiblegroup.cpp index 8572b6ec..d0d5d3de 100644 --- a/src/effectstack/collapsiblegroup.cpp +++ b/src/effectstack/collapsiblegroup.cpp @@ -53,7 +53,7 @@ void MyEditableLabel::mouseDoubleClickEvent ( QMouseEvent * e ) } -CollapsibleGroup::CollapsibleGroup(int ix, bool firstGroup, bool lastGroup, EffectInfo info, QWidget * parent) : +CollapsibleGroup::CollapsibleGroup(int ix, bool firstGroup, bool lastGroup, const EffectInfo &info, QWidget * parent) : AbstractCollapsibleWidget(parent) { m_info.groupIndex = ix; diff --git a/src/effectstack/collapsiblegroup.h b/src/effectstack/collapsiblegroup.h index 226e9040..b9ed5237 100644 --- a/src/effectstack/collapsiblegroup.h +++ b/src/effectstack/collapsiblegroup.h @@ -56,7 +56,7 @@ class CollapsibleGroup : public AbstractCollapsibleWidget Q_OBJECT public: - CollapsibleGroup(int ix, bool firstGroup, bool lastGroup, EffectInfo info, QWidget * parent = 0); + CollapsibleGroup(int ix, bool firstGroup, bool lastGroup, const EffectInfo &info, QWidget * parent = 0); ~CollapsibleGroup(); void updateTimecodeFormat(); void setActive(bool activate); diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp index 953bdf5a..67ab5201 100644 --- a/src/effectstack/parametercontainer.cpp +++ b/src/effectstack/parametercontainer.cpp @@ -95,7 +95,7 @@ class Fontval: public QWidget, public Ui::Fontval_UI }; -ParameterContainer::ParameterContainer(const QDomElement &effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent) : +ParameterContainer::ParameterContainer(const QDomElement &effect, const ItemInfo &info, EffectMetaInfo *metaInfo, QWidget * parent) : m_keyframeEditor(NULL), m_geometryWidget(NULL), m_metaInfo(metaInfo), diff --git a/src/effectstack/parametercontainer.h b/src/effectstack/parametercontainer.h index 65c048b4..db489b28 100644 --- a/src/effectstack/parametercontainer.h +++ b/src/effectstack/parametercontainer.h @@ -59,7 +59,7 @@ class ParameterContainer : public QObject Q_OBJECT public: - ParameterContainer(const QDomElement &effect, ItemInfo info, EffectMetaInfo *metaInfo, QWidget * parent = 0); + explicit ParameterContainer(const QDomElement &effect, const ItemInfo &info, EffectMetaInfo *metaInfo, QWidget * parent = 0); ~ParameterContainer(); void updateTimecodeFormat(); void updateProjectFormat(MltVideoProfile profile, Timecode t); diff --git a/src/onmonitoritems/onmonitorcornersitem.cpp b/src/onmonitoritems/onmonitorcornersitem.cpp index db1abb36..9ff9fb7f 100644 --- a/src/onmonitoritems/onmonitorcornersitem.cpp +++ b/src/onmonitoritems/onmonitorcornersitem.cpp @@ -44,7 +44,7 @@ OnMonitorCornersItem::OnMonitorCornersItem(QGraphicsItem* parent) : setAcceptHoverEvents(true); } -OnMonitorCornersItem::cornersActions OnMonitorCornersItem::getMode(QPointF pos, int *corner) +OnMonitorCornersItem::cornersActions OnMonitorCornersItem::getMode(const QPointF &pos, int *corner) { *corner = -1; if (polygon().count() != 4) diff --git a/src/onmonitoritems/onmonitorcornersitem.h b/src/onmonitoritems/onmonitorcornersitem.h index 1e09069b..be1ae581 100644 --- a/src/onmonitoritems/onmonitorcornersitem.h +++ b/src/onmonitoritems/onmonitorcornersitem.h @@ -35,7 +35,7 @@ public: enum cornersActions { Corner, Move, MoveSide, NoAction }; /** @brief Gets The action mode for the area @param pos +- 4. */ - cornersActions getMode(QPointF pos, int *corner); + cornersActions getMode(const QPointF &pos, int *corner); /** @brief Reimplemented to draw the handles. */ virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 ); diff --git a/src/onmonitoritems/onmonitorrectitem.cpp b/src/onmonitoritems/onmonitorrectitem.cpp index de1e661e..d65ca995 100644 --- a/src/onmonitoritems/onmonitorrectitem.cpp +++ b/src/onmonitoritems/onmonitorrectitem.cpp @@ -42,7 +42,7 @@ OnMonitorRectItem::OnMonitorRectItem(const QRectF &rect, double dar, QGraphicsIt setAcceptHoverEvents(true); } -rectActions OnMonitorRectItem::getMode(QPointF pos) +rectActions OnMonitorRectItem::getMode(const QPointF &pos) { // Item mapped coordinates QPolygonF pol(rect().normalized()); diff --git a/src/onmonitoritems/onmonitorrectitem.h b/src/onmonitoritems/onmonitorrectitem.h index 15e93941..576c5a7c 100644 --- a/src/onmonitoritems/onmonitorrectitem.h +++ b/src/onmonitoritems/onmonitorrectitem.h @@ -38,7 +38,7 @@ public: /** @brief Gets The action mode for the area @param pos +- 4. * e.g. pos(0,0) returns ResizeTopLeft */ - rectActions getMode(QPointF pos); + rectActions getMode(const QPointF &pos); /** @brief Reimplemented to draw the handles. */ virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 ); diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp index 6ddaa28f..5abe6176 100644 --- a/src/projecttree/meltjob.cpp +++ b/src/projecttree/meltjob.cpp @@ -35,7 +35,8 @@ static void consumer_frame_render(mlt_consumer, MeltJob * self, mlt_frame frame_ self->emitFrameNumber((int) frame.get_position()); } -MeltJob::MeltJob(CLIPTYPE cType, const QString &id, const QStringList ¶meters, const QMap &extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters), +MeltJob::MeltJob(CLIPTYPE cType, const QString &id, const QStringList ¶meters, const QMap &extraParams) + : AbstractClipJob(MLTJOB, cType, id, parameters), addClipToProject(0), m_consumer(NULL), m_producer(NULL), @@ -52,7 +53,7 @@ MeltJob::MeltJob(CLIPTYPE cType, const QString &id, const QStringList ¶meter if (consum.contains(':')) m_dest = consum.section(':', 1); } -void MeltJob::setProducer(Mlt::Producer *producer, KUrl url) +void MeltJob::setProducer(Mlt::Producer *producer, const KUrl &url) { m_url = QString::fromUtf8(producer->get("resource")); if (m_url == "" || m_url == "" || m_url == "") @@ -189,11 +190,11 @@ void MeltJob::startJob() MeltJob::~MeltJob() { - if (m_showFrameEvent) delete m_showFrameEvent; - if (m_filter) delete m_filter; - if (m_producer) delete m_producer; - if (m_consumer) delete m_consumer; - if (m_profile) delete m_profile; + delete m_showFrameEvent; + delete m_filter; + delete m_producer; + delete m_consumer; + delete m_profile; } const QString MeltJob::destination() const diff --git a/src/projecttree/meltjob.h b/src/projecttree/meltjob.h index 82326d81..6ff927ca 100644 --- a/src/projecttree/meltjob.h +++ b/src/projecttree/meltjob.h @@ -49,7 +49,7 @@ public: bool addClipToProject; const QString statusMessage(); void setStatus(CLIPJOBSTATUS status); - void setProducer(Mlt::Producer *producer, KUrl url); + void setProducer(Mlt::Producer *producer, const KUrl &url); void emitFrameNumber(int pos); /** Make the job work on a project tree clip. */ bool isProjectFilter() const; diff --git a/src/rotoscoping/rotowidget.cpp b/src/rotoscoping/rotowidget.cpp index 86080a29..127df07b 100644 --- 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(const QString &data, Monitor *monitor, ItemInfo info, Timecode t, QWidget* parent) : +RotoWidget::RotoWidget(const QString &data, Monitor *monitor, const ItemInfo &info, const Timecode &t, QWidget* parent) : QWidget(parent), m_monitor(monitor), m_showScene(true), diff --git a/src/rotoscoping/rotowidget.h b/src/rotoscoping/rotowidget.h index 090e98f2..99523b8b 100644 --- a/src/rotoscoping/rotowidget.h +++ b/src/rotoscoping/rotowidget.h @@ -42,7 +42,7 @@ class RotoWidget : public QWidget Q_OBJECT public: - RotoWidget(const QString &data, Monitor *monitor, ItemInfo info, Timecode t, QWidget* parent = 0); + RotoWidget(const QString &data, Monitor *monitor, const ItemInfo &info, const Timecode &t, QWidget* parent = 0); virtual ~RotoWidget(); /** @brief Returns the spline(s) in the JSON format used by filter_rotoscoping (MLT). */ diff --git a/src/scopes/scopemanager.cpp b/src/scopes/scopemanager.cpp index a2e1dfd0..e03c4e73 100644 --- a/src/scopes/scopemanager.cpp +++ b/src/scopes/scopemanager.cpp @@ -129,7 +129,7 @@ void ScopeManager::slotDistributeAudio(QVector sampleData, int freq, in checkActiveAudioScopes(); } -void ScopeManager::slotDistributeFrame(const QImage image) +void ScopeManager::slotDistributeFrame(const QImage &image) { #ifdef DEBUG_SM qDebug() << "ScopeManager: Starting to distribute frame."; @@ -158,7 +158,7 @@ void ScopeManager::slotDistributeFrame(const QImage image) } -void ScopeManager::slotRequestFrame(const QString widgetName) +void ScopeManager::slotRequestFrame(const QString &widgetName) { #ifdef DEBUG_SM qDebug() << "ScopeManager: New frame was requested by " << widgetName; diff --git a/src/scopes/scopemanager.h b/src/scopes/scopemanager.h index d4d98d43..8eace43d 100644 --- a/src/scopes/scopemanager.h +++ b/src/scopes/scopemanager.h @@ -115,12 +115,12 @@ private slots: */ void slotCheckActiveScopes(); - void slotDistributeFrame(const QImage image); + void slotDistributeFrame(const QImage &image); void slotDistributeAudio(QVector sampleData, int freq, int num_channels, int num_samples); /** Allows a scope to explicitly request a new frame, even if the scope's autoRefresh is disabled. */ - void slotRequestFrame(const QString widgetName); + void slotRequestFrame(const QString &widgetName); }; diff --git a/src/simplekeyframes/simplekeyframewidget.cpp b/src/simplekeyframes/simplekeyframewidget.cpp index 51651560..00fee2c9 100644 --- a/src/simplekeyframes/simplekeyframewidget.cpp +++ b/src/simplekeyframes/simplekeyframewidget.cpp @@ -26,7 +26,7 @@ #include #include -SimpleKeyframeWidget::SimpleKeyframeWidget(Timecode t, int duration, QWidget *parent) : +SimpleKeyframeWidget::SimpleKeyframeWidget(const Timecode &t, int duration, QWidget *parent) : QWidget(parent) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); diff --git a/src/simplekeyframes/simplekeyframewidget.h b/src/simplekeyframes/simplekeyframewidget.h index d031717f..d9553ba6 100644 --- a/src/simplekeyframes/simplekeyframewidget.h +++ b/src/simplekeyframes/simplekeyframewidget.h @@ -34,7 +34,7 @@ class SimpleKeyframeWidget : public QWidget Q_OBJECT public: - SimpleKeyframeWidget(Timecode t, int duration, QWidget* parent = 0); + SimpleKeyframeWidget(const Timecode &t, int duration, QWidget* parent = 0); virtual ~SimpleKeyframeWidget(); int getPosition(); diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp index 83060e08..572664a9 100644 --- a/src/stopmotion/stopmotion.cpp +++ b/src/stopmotion/stopmotion.cpp @@ -678,7 +678,7 @@ void StopmotionWidget::slotPrepareThumbs() } -void StopmotionWidget::slotCreateThumbs(QImage img, int ix) +void StopmotionWidget::slotCreateThumbs(const QImage &img, int ix) { if (img.isNull()) { m_future = QtConcurrent::run(this, &StopmotionWidget::slotPrepareThumbs); diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h index bbda1a6f..df5e0d2b 100644 --- a/src/stopmotion/stopmotion.h +++ b/src/stopmotion/stopmotion.h @@ -211,7 +211,7 @@ private slots: void slotGotHDMIMessage(const QString& message); /** @brief Create thumbnails for existing sequence frames. */ - void slotCreateThumbs(QImage img, int ix); + void slotCreateThumbs(const QImage &img, int ix); /** @brief Prepare thumbnails creation. */ void slotPrepareThumbs(); diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp index 9748b4e8..b106764e 100644 --- a/src/utils/resourcewidget.cpp +++ b/src/utils/resourcewidget.cpp @@ -191,7 +191,7 @@ void ResourceWidget::slotLoadThumb(const QString url) } -void ResourceWidget::slotDisplayMetaInfo(QMap metaInfo) +void ResourceWidget::slotDisplayMetaInfo(const QMap &metaInfo) { if (metaInfo.contains("license")) { parseLicense(metaInfo.value("license")); @@ -211,7 +211,7 @@ void ResourceWidget::slotPlaySound() } -void ResourceWidget::slotSaveItem(const QString originalUrl) +void ResourceWidget::slotSaveItem(const QString &originalUrl) { //if (m_currentUrl.isEmpty()) return; QListWidgetItem *item = search_results->currentItem(); @@ -370,25 +370,25 @@ void ResourceWidget::slotOpenLink(const QUrl &url) } } -void ResourceWidget::slotSetDescription(const QString desc) +void ResourceWidget::slotSetDescription(const QString &desc) { m_desc = desc; updateLayout(); } -void ResourceWidget::slotSetMetadata(const QString desc) +void ResourceWidget::slotSetMetadata(const QString &desc) { m_meta = desc; updateLayout(); } -void ResourceWidget::slotSetImage(const QString desc) +void ResourceWidget::slotSetImage(const QString &desc) { m_image = QString("").arg(desc).arg((int) (info_browser->width() * 0.9)); updateLayout(); } -void ResourceWidget::slotSetTitle(const QString desc) +void ResourceWidget::slotSetTitle(const QString &desc) { m_title = desc; updateLayout(); diff --git a/src/utils/resourcewidget.h b/src/utils/resourcewidget.h index 21f06af8..1def7a90 100644 --- a/src/utils/resourcewidget.h +++ b/src/utils/resourcewidget.h @@ -51,8 +51,8 @@ private slots: void slotStartSearch(int page = 0); void slotUpdateCurrentSound(); void slotPlaySound(); - void slotDisplayMetaInfo(QMap metaInfo); - void slotSaveItem(const QString originalUrl = QString()); + void slotDisplayMetaInfo(const QMap & metaInfo); + void slotSaveItem(const QString &originalUrl = QString()); void slotOpenUrl(const QString &url); void slotChangeService(); void slotOnline(); @@ -63,10 +63,10 @@ private slots: void slotLoadThumb(const QString url); /** @brief A file download is finished */ void slotGotFile(KJob *job); - void slotSetMetadata(const QString desc); - void slotSetDescription(const QString desc); - void slotSetImage(const QString desc); - void slotSetTitle(const QString desc); + void slotSetMetadata(const QString &desc); + void slotSetDescription(const QString &desc); + void slotSetImage(const QString &desc); + void slotSetTitle(const QString &desc); void slotSetMaximum(int max); private: