[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src/timeline: Use const'ref
From: Montel Laurent <montel () kde ! org>
Date: 2016-11-30 20:32:52
Message-ID: E1cCBYi-0006Jy-6Z () code ! kde ! org
[Download RAW message or body]
Git commit effa6bf49af73127d27d8eac7fef88131da00887 by Montel Laurent.
Committed on 30/11/2016 at 20:32.
Pushed by mlaurent into branch 'master'.
Use const'ref
M +5 -5 src/timeline/customtrackview.cpp
M +5 -5 src/timeline/customtrackview.h
M +3 -3 src/timeline/timeline.cpp
M +3 -3 src/timeline/timeline.h
https://commits.kde.org/kdenlive/effa6bf49af73127d27d8eac7fef88131da00887
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 389c5c7..192eb7f 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -2912,7 +2912,7 @@ void CustomTrackView::deleteTransition(const ItemInfo \
&transitionInfo, int endTr emit transitionItemSelected(Q_NULLPTR);
}
-void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
+void CustomTrackView::slotTransitionUpdated(Transition *tr, const QDomElement &old)
{
////qDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") \
<< ", NEW: " << tr->toXML().attribute("transition_btrack"); QDomElement xml = \
tr->toXML(); @@ -3124,7 +3124,7 @@ void CustomTrackView::dropEvent(QDropEvent * \
event) setFocus();
}
-void CustomTrackView::cutTimeline(int cutPos, QList <ItemInfo> excludedClips, QList \
<ItemInfo> excludedTransitions, QUndoCommand *masterCommand, int track) +void \
CustomTrackView::cutTimeline(int cutPos, const QList <ItemInfo> &excludedClips, const \
QList <ItemInfo> &excludedTransitions, QUndoCommand *masterCommand, int track) {
QRectF rect;
if (track == -1) {
@@ -3188,7 +3188,7 @@ void CustomTrackView::cutTimeline(int cutPos, QList <ItemInfo> \
excludedClips, QL }
}
-void CustomTrackView::extractZone(QPoint z, bool closeGap, QList <ItemInfo> \
excludedClips, QUndoCommand *masterCommand, int track) +void \
CustomTrackView::extractZone(QPoint z, bool closeGap, const QList <ItemInfo> \
&excludedClips, QUndoCommand *masterCommand, int track) {
// remove track zone and close gap
if (closeGap && m_timeline->getTrackInfo(m_selectedTrack).isLocked) {
@@ -3859,7 +3859,7 @@ void CustomTrackView::insertTimelineSpace(GenTime startPos, \
GenTime duration, in }
}
-void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> \
transToMove, int track, const GenTime &duration, const GenTime &offset) +void \
CustomTrackView::insertSpace(const QList<ItemInfo> &clipsToMove, const \
QList<ItemInfo> &transToMove, int track, const GenTime &duration, const GenTime \
&offset) {
int diff = duration.frames(m_document->fps());
resetSelectionGroup();
@@ -5259,7 +5259,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* \
item, const ItemI }
}
-void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldInfo, \
int pos, bool check, QUndoCommand *command) +void \
CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, const ItemInfo \
&oldInfo, int pos, bool check, QUndoCommand *command) {
if (pos == oldInfo.endPos.frames(m_document->fps()))
return;
diff --git a/src/timeline/customtrackview.h b/src/timeline/customtrackview.h
index 60116f3..8ca4777 100644
--- a/src/timeline/customtrackview.h
+++ b/src/timeline/customtrackview.h
@@ -135,7 +135,7 @@ public:
void slotInsertSpace();
/** @brief Prepares removing space. */
void slotRemoveSpace(bool multiTrack = false);
- void insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> transToMove, int \
track, const GenTime &duration, const GenTime &offset); + void insertSpace(const \
QList<ItemInfo> &clipsToMove, const QList<ItemInfo> &transToMove, int track, const \
GenTime &duration, const GenTime &offset);
ClipItem *getActiveClipUnderCursor(bool allowOutsideCursor = false) const;
void deleteTimelineTrack(int ix, TrackInfo trackinfo);
void saveThumbnails();
@@ -292,10 +292,10 @@ public:
* @param pos New endPos
* @param check (optional, default = false) Whether to check for collisions
* @param command (optional) Will be used as parent command (for undo history) */
- void prepareResizeClipEnd(AbstractClipItem *item, ItemInfo oldInfo, int pos, \
bool check = false, QUndoCommand *command = Q_NULLPTR); + void \
prepareResizeClipEnd(AbstractClipItem *item, const ItemInfo &oldInfo, int pos, bool \
check = false, QUndoCommand *command = Q_NULLPTR); AbstractClipItem *dragItem();
/** @brief Cut clips in all non locked tracks. */
- void cutTimeline(int cutPos, QList <ItemInfo> excludedClips, QList <ItemInfo> \
excludedTransitions, QUndoCommand *masterCommand, int track = -1); + void \
cutTimeline(int cutPos, const QList<ItemInfo> &excludedClips, const QList<ItemInfo> \
&excludedTransitions, QUndoCommand *masterCommand, int track = -1); void \
updateClipTypeActions(ClipItem *clip); void setOperationMode(OperationType mode);
OperationType operationMode() const;
@@ -347,7 +347,7 @@ public slots:
void setDuration(int duration);
void slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, \
QDomElement transition = QDomElement());
void slotAddTransitionToSelectedClips(QDomElement transition, \
QList<QGraphicsItem *> itemList = QList<QGraphicsItem *>());
- void slotTransitionUpdated(Transition *, QDomElement);
+ void slotTransitionUpdated(Transition *, const QDomElement &);
void slotSwitchTrackLock(int ix, bool enable, bool applyToAll = false);
void slotUpdateClip(const QString &clipId, bool reload = true);
@@ -411,7 +411,7 @@ public slots:
/** @brief Export part of the playlist in an xml file */
void exportTimelineSelection(QString path = QString());
/** Remove zone from current track */
- void extractZone(QPoint z, bool closeGap, QList <ItemInfo> excludedClips = QList \
<ItemInfo>(), QUndoCommand *masterCommand = Q_NULLPTR, int track = -1); + void \
extractZone(QPoint z, bool closeGap, const QList<ItemInfo> &excludedClips = QList \
<ItemInfo>(), QUndoCommand *masterCommand = Q_NULLPTR, int track = -1); /** @brief \
Select an item in timeline. */ void slotSelectItem(AbstractClipItem *item);
/** @brief Cycle through timeline trim modes */
diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp
index db7e4ad..ce46040 100644
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@ -1149,7 +1149,7 @@ void Timeline::getSubfilters(Mlt::Filter *effect, QDomElement \
¤teffect) { }
//static
-void Timeline::setParam(ProfileInfo info, QDomElement param, QString value) {
+void Timeline::setParam(ProfileInfo info, QDomElement param, const QString &value) {
QLocale locale;
locale.setNumberOptions(QLocale::OmitGroupSeparator);
//get Kdenlive scaling parameters
@@ -1539,7 +1539,7 @@ void Timeline::updateClipProperties(const QString &id, QMap \
<QString, QString> p }
}
-int Timeline::changeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, \
PlaylistState::ClipState state, double speed, int strobe, Mlt::Producer \
*originalProd, bool removeEffect) +int Timeline::changeClipSpeed(const ItemInfo \
&info, const ItemInfo &speedIndependantInfo, PlaylistState::ClipState state, double \
speed, int strobe, Mlt::Producer *originalProd, bool removeEffect) {
QLocale locale;
QString url = QString::fromUtf8(originalProd->get("resource"));
@@ -1612,7 +1612,7 @@ void Timeline::disableTimelineEffects(bool disable)
}
}
-void Timeline::importPlaylist(ItemInfo info, QMap <QString, QString> idMaps, \
QDomDocument doc, QUndoCommand *command) +void Timeline::importPlaylist(ItemInfo \
info, const QMap <QString, QString> &idMaps, const QDomDocument &doc, QUndoCommand \
*command) {
projectView()->importPlaylist(info, idMaps, doc, command);
}
diff --git a/src/timeline/timeline.h b/src/timeline/timeline.h
index bcf6b5b..b442695 100644
--- a/src/timeline/timeline.h
+++ b/src/timeline/timeline.h
@@ -137,9 +137,9 @@ public:
* Returns -1 if track is shorter, 0 if not blank and > 0 for blank length */
int getTrackSpaceLength(int trackIndex, int pos, bool fromBlankStart);
void updateClipProperties(const QString &id, QMap <QString, QString> \
properties);
- int changeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, \
PlaylistState::ClipState state, double speed, int strobe, Mlt::Producer \
*originalProd, bool removeEffect = false); + int changeClipSpeed(const ItemInfo \
&info, const ItemInfo &speedIndependantInfo, PlaylistState::ClipState state, double \
speed, int strobe, Mlt::Producer *originalProd, bool removeEffect = false); /** \
@brief Set an effect's XML accordingly to MLT::filter values. */
- static void setParam(ProfileInfo info, QDomElement param, QString value);
+ static void setParam(ProfileInfo info, QDomElement param, const QString &value);
int getTracks();
void getTransitions();
void refreshTractor();
@@ -154,7 +154,7 @@ public:
void getSubfilters(Mlt::Filter *effect, QDomElement ¤teffect);
static bool isSlide(QString geometry);
/** @brief Import amultitrack MLT playlist in timeline */
- void importPlaylist(ItemInfo info, QMap <QString, QString> idMaps, QDomDocument \
doc, QUndoCommand *command); + void importPlaylist(ItemInfo info, const \
QMap<QString, QString> &idMaps, const QDomDocument &doc, QUndoCommand *command); /** \
@brief Creates an overlay track with a filtered clip */ bool \
createOverlay(Mlt::Filter *filter, int tk, int startPos); /** @brief Creates an \
overlay track with a ripple transition*/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic