[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src/timeline: continue to fix using const'ref
From: Montel Laurent <montel () kde ! org>
Date: 2016-11-30 8:01:40
Message-ID: E1cBzpk-0002Yh-Jp () code ! kde ! org
[Download RAW message or body]
Git commit bcfc2e85f602afcb1e646b649692b63f4f9f282a by Montel Laurent.
Committed on 30/11/2016 at 08:01.
Pushed by mlaurent into branch 'master'.
continue to fix using const'ref
M +1 -1 src/timeline/abstractclipitem.h
M +1 -1 src/timeline/clipitem.cpp
M +1 -1 src/timeline/clipitem.h
M +5 -5 src/timeline/customtrackview.cpp
M +5 -5 src/timeline/customtrackview.h
M +1 -1 src/timeline/managers/abstracttoolmanager.h
M +1 -1 src/timeline/managers/guidemanager.cpp
M +1 -1 src/timeline/managers/guidemanager.h
M +1 -1 src/timeline/managers/movemanager.cpp
M +1 -1 src/timeline/managers/movemanager.h
M +1 -1 src/timeline/managers/razormanager.cpp
M +1 -1 src/timeline/managers/razormanager.h
M +1 -1 src/timeline/managers/resizemanager.cpp
M +1 -1 src/timeline/managers/resizemanager.h
M +1 -1 src/timeline/managers/selectmanager.cpp
M +1 -1 src/timeline/managers/selectmanager.h
M +1 -1 src/timeline/managers/spacermanager.cpp
M +1 -1 src/timeline/managers/spacermanager.h
M +1 -1 src/timeline/managers/trimmanager.cpp
M +1 -1 src/timeline/managers/trimmanager.h
M +1 -1 src/timeline/timeline.cpp
M +1 -1 src/timeline/timeline.h
M +3 -3 src/timeline/transition.cpp
M +3 -3 src/timeline/transition.h
M +1 -1 src/timeline/transitionhandler.cpp
M +1 -1 src/timeline/transitionhandler.h
https://commits.kde.org/kdenlive/bcfc2e85f602afcb1e646b649692b63f4f9f282a
diff --git a/src/timeline/abstractclipitem.h b/src/timeline/abstractclipitem.h
index c061303..29f5c7c 100644
--- a/src/timeline/abstractclipitem.h
+++ b/src/timeline/abstractclipitem.h
@@ -56,7 +56,7 @@ public:
void closeAnimation();
virtual OperationType operationMode(const QPointF &pos, Qt::KeyboardModifiers \
modifiers) = 0;
- virtual void updateKeyframes(QDomElement effect) = 0;
+ virtual void updateKeyframes(const QDomElement &effect) = 0;
virtual GenTime startPos() const ;
virtual GenTime endPos() const ;
virtual int track() const ;
diff --git a/src/timeline/clipitem.cpp b/src/timeline/clipitem.cpp
index 314e912..73fd211 100644
--- a/src/timeline/clipitem.cpp
+++ b/src/timeline/clipitem.cpp
@@ -1983,7 +1983,7 @@ void ClipItem::slotUpdateThumb(QImage img)
update();
}
-void ClipItem::updateKeyframes(QDomElement effect)
+void ClipItem::updateKeyframes(const QDomElement &effect)
{
QLocale locale;
locale.setNumberOptions(QLocale::OmitGroupSeparator);
diff --git a/src/timeline/clipitem.h b/src/timeline/clipitem.h
index 1b12441..7cb71f5 100644
--- a/src/timeline/clipitem.h
+++ b/src/timeline/clipitem.h
@@ -56,7 +56,7 @@ public:
void resizeStart(int posx, bool size = true, bool emitChange = true) \
Q_DECL_OVERRIDE; void resizeEnd(int posx, bool emitChange = true) Q_DECL_OVERRIDE;
OperationType operationMode(const QPointF &pos, Qt::KeyboardModifiers modifiers) \
Q_DECL_OVERRIDE;
- void updateKeyframes(QDomElement effect) Q_DECL_OVERRIDE;
+ void updateKeyframes(const QDomElement &effect) Q_DECL_OVERRIDE;
static int itemHeight();
ClipType clipType() const;
const QString &getBinId() const;
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index fa4f79b..6b46cee 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -2006,7 +2006,7 @@ void CustomTrackView::deleteEffect(int track, const GenTime \
&pos, const QDomElem }
}
-void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem \
*group, AbstractClipItem *dropTarget) +void CustomTrackView::slotAddGroupEffect(const \
QDomElement &effect, AbstractGroupItem *group, AbstractClipItem *dropTarget) {
QList<QGraphicsItem *> itemList = group->childItems();
QUndoCommand *effectCommand = new QUndoCommand();
@@ -2066,7 +2066,7 @@ void CustomTrackView::slotAddEffect(ClipItem *clip, const \
QDomElement &effect, i else slotAddEffect(effect, clip->startPos(), clip->track());
}
-void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime \
pos, int track) +void CustomTrackView::slotDropEffect(ClipItem *clip, const \
QDomElement &effect, GenTime pos, int track) {
if (clip == Q_NULLPTR) return;
slotAddEffect(effect, pos, track);
@@ -2146,12 +2146,12 @@ AbstractToolManager \
*CustomTrackView::toolManager(AbstractToolManager::ToolManag return \
m_toolManagers.value(trimType); }
-void CustomTrackView::slotAddEffectToCurrentItem(QDomElement effect)
+void CustomTrackView::slotAddEffectToCurrentItem(const QDomElement &effect)
{
slotAddEffect(effect, GenTime(), -1);
}
-void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int \
track) +void CustomTrackView::slotAddEffect(const QDomElement &effect, const GenTime \
&pos, int track) {
QList<QGraphicsItem *> itemList;
QUndoCommand *effectCommand = new QUndoCommand();
@@ -2548,7 +2548,7 @@ void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, int \
track, QDomElemen m_commandStack->push(command);
}
-void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString region)
+void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, const QString \
®ion) {
QDomElement effect = clip->getEffectAtIndex(ix);
QDomElement oldeffect = effect.cloneNode().toElement();
diff --git a/src/timeline/customtrackview.h b/src/timeline/customtrackview.h
index 99f7a83..f392769 100644
--- a/src/timeline/customtrackview.h
+++ b/src/timeline/customtrackview.h
@@ -82,14 +82,14 @@ public:
void setScale(double scaleFactor, double verticalScale);
void deleteClip(const QString &clipId, QUndoCommand *deleteCommand);
/** @brief An effect was dropped on @param clip */
- void slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track);
+ void slotDropEffect(ClipItem *clip, const QDomElement &effect, GenTime pos, int \
track); /** @brief A transition was dropped on @param clip */
void slotDropTransition(ClipItem *clip, QDomElement transition, QPointF \
scenePos); /** @brief Add effect to current clip */
- void slotAddEffectToCurrentItem(QDomElement effect);
+ void slotAddEffectToCurrentItem(const QDomElement &effect);
/** @brief Add effect to a clip or selection */
- void slotAddEffect(QDomElement effect, const GenTime &pos, int track);
- void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group, \
AbstractClipItem *dropTarget = Q_NULLPTR); + void slotAddEffect(const QDomElement \
&effect, const GenTime &pos, int track); + void slotAddGroupEffect(const \
QDomElement &effect, AbstractGroupItem *group, AbstractClipItem *dropTarget = \
Q_NULLPTR); void addEffect(int track, GenTime pos, QDomElement effect);
void deleteEffect(int track, const GenTime &pos, const QDomElement &effect);
void updateEffect(int track, GenTime pos, QDomElement insertedEffect, bool \
refreshEffectStack = false, bool replaceEffect = false, bool refreshMonitor = true); \
@@ -342,7 +342,7 @@ public slots:
void slotChangeEffectState(ClipItem *clip, int track, QList <int> effectIndexes, \
bool disable);
void slotChangeEffectPosition(ClipItem *clip, int track, QList <int> currentPos, \
int newPos);
void slotUpdateClipEffect(ClipItem *clip, int track, QDomElement oldeffect, \
QDomElement effect, int ix, bool refreshEffectStack = true);
- void slotUpdateClipRegion(ClipItem *clip, int ix, QString region);
+ void slotUpdateClipRegion(ClipItem *clip, int ix, const QString ®ion);
void slotRefreshEffects(ClipItem *clip);
void setDuration(int duration);
void slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, \
QDomElement transition = QDomElement());
diff --git a/src/timeline/managers/abstracttoolmanager.h \
b/src/timeline/managers/abstracttoolmanager.h index 64fc598..9198943 100644
--- a/src/timeline/managers/abstracttoolmanager.h
+++ b/src/timeline/managers/abstracttoolmanager.h
@@ -47,7 +47,7 @@ public:
GuideType
};
explicit AbstractToolManager(ToolManagerType type, CustomTrackView *view, \
DocUndoStack *commandStack = Q_NULLPTR);
- virtual bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) = 0; + virtual bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) = 0;
virtual bool mouseMove(QMouseEvent *event, int pos = 0, int track = -1);
virtual void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) = 0;
virtual void enterEvent(int pos, double trackHeight);
diff --git a/src/timeline/managers/guidemanager.cpp \
b/src/timeline/managers/guidemanager.cpp index 1183467..5e83032 100644
--- a/src/timeline/managers/guidemanager.cpp
+++ b/src/timeline/managers/guidemanager.cpp
@@ -29,7 +29,7 @@ GuideManager::GuideManager(CustomTrackView *view, DocUndoStack \
*commandStack) : {
}
-bool GuideManager::mousePress(QMouseEvent *, ItemInfo info, QList<QGraphicsItem *> \
list) +bool GuideManager::mousePress(QMouseEvent *, const ItemInfo &info, const \
QList<QGraphicsItem *> &list) {
Q_UNUSED(info);
m_collisionList = list;
diff --git a/src/timeline/managers/guidemanager.h \
b/src/timeline/managers/guidemanager.h index 1d7ba80..8fac177 100644
--- a/src/timeline/managers/guidemanager.h
+++ b/src/timeline/managers/guidemanager.h
@@ -38,7 +38,7 @@ class GuideManager : public AbstractToolManager
public:
explicit GuideManager(CustomTrackView *view, DocUndoStack *commandStack = \
Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos, int) Q_DECL_OVERRIDE;
/** @brief Check if a guide operation is applicable on items under mouse.
diff --git a/src/timeline/managers/movemanager.cpp \
b/src/timeline/managers/movemanager.cpp index 973f567..e04eae5 100644
--- a/src/timeline/managers/movemanager.cpp
+++ b/src/timeline/managers/movemanager.cpp
@@ -42,7 +42,7 @@ MoveManager::MoveManager(TransitionHandler *handler, \
CustomTrackView *view, DocU m_scrollTimer.setSingleShot(true);
}
-bool MoveManager::mousePress(QMouseEvent *event, ItemInfo info, QList<QGraphicsItem \
*>) +bool MoveManager::mousePress(QMouseEvent *event, const ItemInfo &info, const \
QList<QGraphicsItem *> &) {
m_view->setCursor(Qt::ClosedHandCursor);
m_dragMoved = false;
diff --git a/src/timeline/managers/movemanager.h \
b/src/timeline/managers/movemanager.h index bc98d97..d8f2f23 100644
--- a/src/timeline/managers/movemanager.h
+++ b/src/timeline/managers/movemanager.h
@@ -38,7 +38,7 @@ class MoveManager : public AbstractToolManager
public:
explicit MoveManager(TransitionHandler *handler, CustomTrackView *view, \
DocUndoStack *commandStack = Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos, int) Q_DECL_OVERRIDE;
diff --git a/src/timeline/managers/razormanager.cpp \
b/src/timeline/managers/razormanager.cpp index b5020d3..addb4e4 100644
--- a/src/timeline/managers/razormanager.cpp
+++ b/src/timeline/managers/razormanager.cpp
@@ -39,7 +39,7 @@ RazorManager::RazorManager(CustomTrackView *view, DocUndoStack \
*commandStack) : m_cursor = QCursor(razorIcon.pixmap(32, 32));
}
-bool RazorManager::mousePress(QMouseEvent *, ItemInfo info, QList<QGraphicsItem *>)
+bool RazorManager::mousePress(QMouseEvent *, const ItemInfo &info, const \
QList<QGraphicsItem *> &) {
QList<QGraphicsItem *> items;
AbstractClipItem *dragItem = m_view->dragItem();
diff --git a/src/timeline/managers/razormanager.h \
b/src/timeline/managers/razormanager.h index 154b765..551ace5 100644
--- a/src/timeline/managers/razormanager.h
+++ b/src/timeline/managers/razormanager.h
@@ -41,7 +41,7 @@ class RazorManager : public AbstractToolManager
public:
explicit RazorManager(CustomTrackView *view, DocUndoStack *commandStack = \
Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos = 0, int track = -1) Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
void enterEvent(int pos, double trackHeight) Q_DECL_OVERRIDE;
diff --git a/src/timeline/managers/resizemanager.cpp \
b/src/timeline/managers/resizemanager.cpp index f45b987..392279b 100644
--- a/src/timeline/managers/resizemanager.cpp
+++ b/src/timeline/managers/resizemanager.cpp
@@ -32,7 +32,7 @@ ResizeManager::ResizeManager(CustomTrackView *view, DocUndoStack \
*commandStack) {
}
-bool ResizeManager::mousePress(QMouseEvent *event, ItemInfo info, \
QList<QGraphicsItem *>) +bool ResizeManager::mousePress(QMouseEvent *event, const \
ItemInfo &info, const QList<QGraphicsItem *> &) {
m_dragItemInfo = info;
m_controlModifier = event->modifiers();
diff --git a/src/timeline/managers/resizemanager.h \
b/src/timeline/managers/resizemanager.h index 7fd0100..f5e5cc0 100644
--- a/src/timeline/managers/resizemanager.h
+++ b/src/timeline/managers/resizemanager.h
@@ -34,7 +34,7 @@ class ResizeManager : public AbstractToolManager
public:
explicit ResizeManager(CustomTrackView *view, DocUndoStack *commandStack = \
Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos = 0, int track = -1) Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
diff --git a/src/timeline/managers/selectmanager.cpp \
b/src/timeline/managers/selectmanager.cpp index a6de8a4..453e6ab 100644
--- a/src/timeline/managers/selectmanager.cpp
+++ b/src/timeline/managers/selectmanager.cpp
@@ -39,7 +39,7 @@ SelectManager::SelectManager(CustomTrackView *view, DocUndoStack \
*commandStack) {
}
-bool SelectManager::mousePress(QMouseEvent *event, ItemInfo info, \
QList<QGraphicsItem *>) +bool SelectManager::mousePress(QMouseEvent *event, const \
ItemInfo &info, const QList<QGraphicsItem *> &) {
Q_UNUSED(info);
m_view->activateMonitor();
diff --git a/src/timeline/managers/selectmanager.h \
b/src/timeline/managers/selectmanager.h index 8fa1871..ecac47a 100644
--- a/src/timeline/managers/selectmanager.h
+++ b/src/timeline/managers/selectmanager.h
@@ -38,7 +38,7 @@ class SelectManager : public AbstractToolManager
public:
explicit SelectManager(CustomTrackView *view, DocUndoStack *commandStack = \
Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos, int) Q_DECL_OVERRIDE;
/** @brief Check if a guide operation is applicable on items under mouse.
diff --git a/src/timeline/managers/spacermanager.cpp \
b/src/timeline/managers/spacermanager.cpp index 9ccd8b2..524c774 100644
--- a/src/timeline/managers/spacermanager.cpp
+++ b/src/timeline/managers/spacermanager.cpp
@@ -33,7 +33,7 @@ SpacerManager::SpacerManager(CustomTrackView *view, DocUndoStack \
*commandStack) {
}
-bool SpacerManager::mousePress(QMouseEvent *event, ItemInfo info, \
QList<QGraphicsItem *>) +bool SpacerManager::mousePress(QMouseEvent *event, const \
ItemInfo &info, const QList<QGraphicsItem *> &) {
m_view->clearSelection();
m_view->updateClipTypeActions(Q_NULLPTR);
diff --git a/src/timeline/managers/spacermanager.h \
b/src/timeline/managers/spacermanager.h index 92b0e9d..4ad16bb 100644
--- a/src/timeline/managers/spacermanager.h
+++ b/src/timeline/managers/spacermanager.h
@@ -35,7 +35,7 @@ class SpacerManager : public AbstractToolManager
public:
explicit SpacerManager(CustomTrackView *view, DocUndoStack *commandStack = \
Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos = 0, int track = -1) Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
void initTool(double trackHeight) Q_DECL_OVERRIDE;
diff --git a/src/timeline/managers/trimmanager.cpp \
b/src/timeline/managers/trimmanager.cpp index 81c62b4..ca5f39d 100644
--- a/src/timeline/managers/trimmanager.cpp
+++ b/src/timeline/managers/trimmanager.cpp
@@ -40,7 +40,7 @@ TrimManager::TrimManager(CustomTrackView *view, DocUndoStack \
*commandStack) : Ab {
}
-bool TrimManager::mousePress(QMouseEvent *, ItemInfo info, QList<QGraphicsItem *>)
+bool TrimManager::mousePress(QMouseEvent *, const ItemInfo &info, const \
QList<QGraphicsItem *> &) {
return enterTrimMode(info, m_view->prepareMode() == ResizeStart);
}
diff --git a/src/timeline/managers/trimmanager.h \
b/src/timeline/managers/trimmanager.h index 1001758..c152e56 100644
--- a/src/timeline/managers/trimmanager.h
+++ b/src/timeline/managers/trimmanager.h
@@ -40,7 +40,7 @@ class TrimManager : public AbstractToolManager
public:
explicit TrimManager(CustomTrackView *view, DocUndoStack *commandStack = \
Q_NULLPTR);
- bool mousePress(QMouseEvent *event, ItemInfo info = ItemInfo(), \
QList<QGraphicsItem *> list = QList<QGraphicsItem *>()) Q_DECL_OVERRIDE; + bool \
mousePress(QMouseEvent *event, const ItemInfo &info = ItemInfo(), const \
QList<QGraphicsItem *> &list = QList<QGraphicsItem *>()) \
Q_DECL_OVERRIDE;
bool mouseMove(QMouseEvent *event, int pos, int track = -1) Q_DECL_OVERRIDE;
void mouseRelease(QMouseEvent *event, GenTime pos = GenTime()) Q_DECL_OVERRIDE;
bool enterTrimMode(ItemInfo info, bool trimStart);
diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp
index 60d5d02..a176210 100644
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@ -645,7 +645,7 @@ TrackInfo Timeline::getTrackInfo(int ix)
return tk->info();
}
-bool Timeline::isLastClip(ItemInfo info)
+bool Timeline::isLastClip(const ItemInfo &info)
{
Track *tk = track(info.track);
if (tk == Q_NULLPTR) {
diff --git a/src/timeline/timeline.h b/src/timeline/timeline.h
index 28f6a00..aa8334c 100644
--- a/src/timeline/timeline.h
+++ b/src/timeline/timeline.h
@@ -169,7 +169,7 @@ public:
/** @brief Refresh Header Leds */
void updateHeaders();
/** @brief Returns true if position is on the last clip */
- bool isLastClip(ItemInfo info);
+ bool isLastClip(const ItemInfo &info);
/** @brief find lowest video track in timeline. */
int getLowestVideoTrack();
/** @brief Returns the document properties with some added values from timeline. \
*/
diff --git a/src/timeline/transition.cpp b/src/timeline/transition.cpp
index 6fc776e..336a9e8 100644
--- a/src/timeline/transition.cpp
+++ b/src/timeline/transition.cpp
@@ -89,7 +89,7 @@ Transition::~Transition()
if (scene()) scene()->removeItem(this);
}
-Transition *Transition::clone(ItemInfo newInfo)
+Transition *Transition::clone(const ItemInfo &newInfo)
{
const QDomElement xml = toXML().cloneNode().toElement();
Transition *tr = new Transition(newInfo.isValid() ? newInfo : info(), \
transitionEndTrack(), m_fps, xml); @@ -387,7 +387,7 @@ bool Transition::hasGeometry()
return false;
}
-bool Transition::updateKeyframes(ItemInfo oldInfo, ItemInfo newInfo)
+bool Transition::updateKeyframes(const ItemInfo &oldInfo, const ItemInfo &newInfo)
{
QString keyframes;
QDomElement pa;
@@ -482,7 +482,7 @@ bool Transition::updateKeyframes(ItemInfo oldInfo, ItemInfo \
newInfo) return true;
}
-void Transition::updateKeyframes(QDomElement /*effect*/)
+void Transition::updateKeyframes(const QDomElement &/*effect*/)
{
}
diff --git a/src/timeline/transition.h b/src/timeline/transition.h
index 60b08f4..c2005a2 100644
--- a/src/timeline/transition.h
+++ b/src/timeline/transition.h
@@ -55,7 +55,7 @@ public:
QString transitionTag() const;
QStringList transitionInfo() const;
OperationType operationMode(const QPointF &pos, Qt::KeyboardModifiers modifiers) \
Q_DECL_OVERRIDE;
- void updateKeyframes(QDomElement effect) Q_DECL_OVERRIDE;
+ void updateKeyframes(const QDomElement &effect) Q_DECL_OVERRIDE;
static int itemHeight();
static int itemOffset();
//const QMap < QString, QString > transitionParameters() const;
@@ -68,14 +68,14 @@ public:
void updateTransitionEndTrack(int newtrack);
void setForcedTrack(bool force, int track);
bool forcedTrack() const;
- Transition *clone(ItemInfo newInfo = ItemInfo());
+ Transition *clone(const ItemInfo &newInfo = ItemInfo());
bool isAutomatic() const;
void setAutomatic(bool automatic);
bool hasGeometry();
/** @brief When a transition is resized, check if keyframes are out of the \
transition and fix if necessary.
* @param oldEnd the previous transition end, so that when we expand the \
transition, if there is a keyframe at end we move it
*/
- bool updateKeyframes(ItemInfo oldInfo, ItemInfo newInfo);
+ bool updateKeyframes(const ItemInfo &oldInfo, const ItemInfo &newInfo);
bool checkKeyFrames(int width, int height, int previousDuration, int cutPos = \
-1);
protected:
diff --git a/src/timeline/transitionhandler.cpp b/src/timeline/transitionhandler.cpp
index 6274068..8a61a8c 100644
--- a/src/timeline/transitionhandler.cpp
+++ b/src/timeline/transitionhandler.cpp
@@ -579,7 +579,7 @@ const QString TransitionHandler::compositeTransition()
return QStringLiteral("composite");
}
-void TransitionHandler::rebuildTransitions(int mode, QList <int> videoTracks, int \
maxTrack) +void TransitionHandler::rebuildTransitions(int mode, const QList <int> \
&videoTracks, int maxTrack) {
QStringList compositeService { QStringLiteral("qtblend"), \
QStringLiteral("composite"), QStringLiteral("frei0r.cairoblend"), \
QStringLiteral("movit.overlay") }; QList <int> disabled;
diff --git a/src/timeline/transitionhandler.h b/src/timeline/transitionhandler.h
index bf6b4bd..cefcbe9 100644
--- a/src/timeline/transitionhandler.h
+++ b/src/timeline/transitionhandler.h
@@ -56,7 +56,7 @@ public:
/** @brief Returns internal track transition. */
Mlt::Transition *getTrackTransition(const QStringList names, int b_track, int \
a_track) const; /** @brief Switch track compositing mode. */
- void rebuildTransitions(int mode, QList <int> videoTracks, int maxTrack);
+ void rebuildTransitions(int mode, const QList<int> &videoTracks, int maxTrack);
/** @brief Returns the matching composite transition depending on the current \
settings. */ static const QString compositeTransition();
/** @brief Initialize transition settings. */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic