[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src: Fix GCC warnings (variable masking)
From: Vincent Pinon <null () kde ! org>
Date: 2017-02-28 23:03:40
Message-ID: E1ciqo0-0003Xj-6g () code ! kde ! org
[Download RAW message or body]
Git commit cc849dd09095fa799279da79cb78516a6246ed88 by Vincent Pinon.
Committed on 28/02/2017 at 22:29.
Pushed by vpinon into branch 'master'.
Fix GCC warnings (variable masking)
M +21 -21 src/doc/documentvalidator.cpp
M +11 -11 src/effectstack/collapsibleeffect.cpp
M +3 -3 src/effectstack/collapsibleeffect.h
M +9 -9 src/effectstack/effectstackedit.cpp
M +3 -3 src/effectstack/effectstackedit.h
M +3 -5 src/effectstack/effectstackview2.cpp
M +2 -2 src/effectstack/effectstackview2.h
M +18 -18 src/effectstack/parametercontainer.cpp
M +6 -6 src/effectstack/widgets/animationwidget.cpp
M +1 -1 src/effectstack/widgets/choosecolorwidget.cpp
M +1 -1 src/project/clipmanager.cpp
M +6 -6 src/project/cliptranscode.cpp
M +5 -5 src/project/dialogs/archivewidget.cpp
M +10 -10 src/project/dialogs/projectsettings.cpp
M +10 -9 src/project/dialogs/slideshowclip.cpp
M +1 -1 src/project/jobs/filterjob.cpp
M +11 -11 src/project/transitionsettings.cpp
M +2 -2 src/project/transitionsettings.h
M +2 -2 src/statusbarmessagelabel.h
M +2 -2 src/timeline/abstractgroupitem.cpp
M +47 -47 src/timeline/customtrackview.cpp
M +2 -2 src/timeline/customtrackview.h
M +1 -1 src/timeline/effectmanager.cpp
M +3 -4 src/timeline/managers/movemanager.cpp
M +2 -2 src/timeline/timeline.cpp
M +6 -6 src/timeline/track.cpp
M +1 -1 src/timeline/track.h
M +13 -18 src/timeline/transitionhandler.cpp
https://commits.kde.org/kdenlive/cc849dd09095fa799279da79cb78516a6246ed88
diff --git a/src/doc/documentvalidator.cpp b/src/doc/documentvalidator.cpp
index dde9be1f4..6030d5c13 100644
--- a/src/doc/documentvalidator.cpp
+++ b/src/doc/documentvalidator.cpp
@@ -535,9 +535,9 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) QDomAttr a = attrs.item(j).toAttr();
if (!a.isNull()) {
//qCDebug(KDENLIVE_LOG) << " FILTER; adding :" << \
a.name() << ':' << a.value();
- QDomElement e = \
m_doc.createElement(QStringLiteral("property")); + e = \
m_doc.createElement(QStringLiteral("property"));
e.setAttribute(QStringLiteral("name"), a.name());
- QDomText value = m_doc.createTextNode(a.value());
+ value = m_doc.createTextNode(a.value());
e.appendChild(value);
filt.appendChild(e);
@@ -1121,9 +1121,9 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion)
QDomNodeList markers = m_doc.elementsByTagName(QStringLiteral("marker"));
for (int i = 0; i < markers.count(); ++i) {
QDomElement marker = markers.at(i).toElement();
- QDomElement prop = m_doc.createElement(QStringLiteral("property"));
+ prop = m_doc.createElement(QStringLiteral("property"));
prop.setAttribute(QStringLiteral("name"), \
QStringLiteral("kdenlive:marker.") + marker.attribute(QStringLiteral("id")) + \
QLatin1Char(':') + marker.attribute(QStringLiteral("time")));
- QDomText val = \
m_doc.createTextNode(marker.attribute(QStringLiteral("type")) + QLatin1Char(':') + \
marker.attribute(QStringLiteral("comment"))); + val = \
m_doc.createTextNode(marker.attribute(QStringLiteral("type")) + QLatin1Char(':') + \
marker.attribute(QStringLiteral("comment"))); prop.appendChild(val);
main_playlist.appendChild(prop);
}
@@ -1132,9 +1132,9 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion)
QDomNodeList guides = m_doc.elementsByTagName(QStringLiteral("guide"));
for (int i = 0; i < guides.count(); ++i) {
QDomElement guide = guides.at(i).toElement();
- QDomElement prop = m_doc.createElement(QStringLiteral("property"));
+ prop = m_doc.createElement(QStringLiteral("property"));
prop.setAttribute(QStringLiteral("name"), \
QStringLiteral("kdenlive:guide.") + \
guide.attribute(QStringLiteral("time")));
- QDomText val = \
m_doc.createTextNode(guide.attribute(QStringLiteral("comment"))); + val = \
m_doc.createTextNode(guide.attribute(QStringLiteral("comment"))); \
prop.appendChild(val); main_playlist.appendChild(prop);
}
@@ -1143,9 +1143,9 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion)
QDomNodeList folders = m_doc.elementsByTagName(QStringLiteral("folder"));
for (int i = 0; i < folders.count(); ++i) {
QDomElement folder = folders.at(i).toElement();
- QDomElement prop = m_doc.createElement(QStringLiteral("property"));
+ prop = m_doc.createElement(QStringLiteral("property"));
prop.setAttribute(QStringLiteral("name"), \
QStringLiteral("kdenlive:folder.-1.") + \
folder.attribute(QStringLiteral("id")));
- QDomText val = \
m_doc.createTextNode(folder.attribute(QStringLiteral("name"))); + val = \
m_doc.createTextNode(folder.attribute(QStringLiteral("name"))); \
prop.appendChild(val); main_playlist.appendChild(prop);
}
@@ -1334,26 +1334,26 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) originalProd.removeAttribute(QStringLiteral("cutzones"));
int type = prod.attribute(QStringLiteral("type")).toInt();
- QString mlt_service;
+ QString mltService;
switch (type) {
case 4:
- mlt_service = QStringLiteral("colour");
+ mltService = QStringLiteral("colour");
break;
case 5:
case 7:
- mlt_service = QStringLiteral("qimage");
+ mltService = QStringLiteral("qimage");
break;
case 6:
- mlt_service = QStringLiteral("kdenlivetitle");
+ mltService = QStringLiteral("kdenlivetitle");
break;
case 9:
- mlt_service = QStringLiteral("xml");
+ mltService = QStringLiteral("xml");
break;
default:
- mlt_service = QStringLiteral("avformat");
+ mltService = QStringLiteral("avformat");
break;
}
- EffectsList::setProperty(originalProd, \
QStringLiteral("mlt_service"), mlt_service); + \
EffectsList::setProperty(originalProd, QStringLiteral("mlt_service"), \
mltService);
EffectsList::setProperty(originalProd, QStringLiteral("mlt_type"), \
QStringLiteral("producer"));
QDomElement entry = m_doc.createElement(QStringLiteral("entry"));
entry.setAttribute(QStringLiteral("in"), QStringLiteral("0"));
@@ -1382,9 +1382,9 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) if (mltprod.attribute(QStringLiteral("id")) == id) {
if (!folder.isEmpty()) {
// We have found our producer, set folder info
- QDomElement prop = \
m_doc.createElement(QStringLiteral("property")); + prop = \
m_doc.createElement(QStringLiteral("property"));
prop.setAttribute(QStringLiteral("name"), \
QStringLiteral("kdenlive:folderid"));
- QDomText val = m_doc.createTextNode(folder);
+ val = m_doc.createTextNode(folder);
prop.appendChild(val);
mltprod.appendChild(prop);
}
@@ -1407,9 +1407,9 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) original.setAttribute(QStringLiteral("in"), 0);
original.setAttribute(QStringLiteral("out"), \
prod.attribute(QStringLiteral("duration")).toInt() - 1); \
original.setAttribute(QStringLiteral("id"), id);
- QDomElement prop = \
m_doc.createElement(QStringLiteral("property")); + prop = \
m_doc.createElement(QStringLiteral("property"));
prop.setAttribute(QStringLiteral("name"), \
QStringLiteral("resource"));
- QDomText val = \
m_doc.createTextNode(prod.attribute(QStringLiteral("resource"))); + \
val = m_doc.createTextNode(prod.attribute(QStringLiteral("resource"))); \
prop.appendChild(val); original.appendChild(prop);
QDomElement prop2 = \
m_doc.createElement(QStringLiteral("property")); @@ -1503,7 +1503,7 @@ bool \
DocumentValidator::upgrade(double version, const double currentVersion) }
// Remove deprecated Kdenlive extra info from xml doc before sending it to \
MLT
- QDomElement infoXml = mlt.firstChildElement(QStringLiteral("kdenlivedoc"));
+ infoXml = mlt.firstChildElement(QStringLiteral("kdenlivedoc"));
if (!infoXml.isNull()) {
mlt.removeChild(infoXml);
}
@@ -2117,7 +2117,7 @@ void DocumentValidator::checkOrphanedProducers()
for (int j = 0; j < max; j++) {
// Search for a similar producer
QDomElement binProd = producers.at(j).toElement();
- QString binId = \
binProd.attribute(QStringLiteral("id")).section(QLatin1Char('_'), 0, 0); + \
binId = \
binProd.attribute(QStringLiteral("id")).section(QLatin1Char('_'), 0, \
0);
if (service != QLatin1String("timewarp") && \
(binId.startsWith(QLatin1String("slowmotion")) || !binProducers.contains(binId))) { \
continue; }
diff --git a/src/effectstack/collapsibleeffect.cpp \
b/src/effectstack/collapsibleeffect.cpp index b667d565c..181182bc6 100644
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -516,10 +516,10 @@ void CollapsibleEffect::updateFrameInfo()
}
}
-void CollapsibleEffect::setActiveKeyframe(int frame)
+void CollapsibleEffect::setActiveKeyframe(int kf)
{
if (m_paramWidget) {
- m_paramWidget->setActiveKeyframe(frame);
+ m_paramWidget->setActiveKeyframe(kf);
}
}
@@ -634,18 +634,18 @@ void CollapsibleEffect::dragLeaveEvent(QDragLeaveEvent \
*/*event*/) frame->setStyleSheet(frame->styleSheet());
}
-void CollapsibleEffect::importKeyframes(const QString &keyframes)
+void CollapsibleEffect::importKeyframes(const QString &kf)
{
- QMap<QString, QString> data;
- if (keyframes.contains(QLatin1Char('\n'))) {
- const QStringList params = keyframes.split(QLatin1Char('\n'), \
QString::SkipEmptyParts); + QMap<QString, QString> keyframes;
+ if (kf.contains(QLatin1Char('\n'))) {
+ const QStringList params = kf.split(QLatin1Char('\n'), \
QString::SkipEmptyParts); for (const QString ¶m : params) {
- data.insert(param.section(QLatin1Char('='), 0, 0), \
param.section(QLatin1Char('='), 1)); + \
keyframes.insert(param.section(QLatin1Char('='), 0, 0), \
param.section(QLatin1Char('='), 1)); }
} else {
- data.insert(keyframes.section(QLatin1Char('='), 0, 0), \
keyframes.section(QLatin1Char('='), 1)); + \
keyframes.insert(kf.section(QLatin1Char('='), 0, 0), kf.section(QLatin1Char('='), \
1)); }
- emit importClipKeyframes(AVWidget, m_itemInfo, m_effect.cloneNode().toElement(), \
data); + emit importClipKeyframes(AVWidget, m_itemInfo, \
m_effect.cloneNode().toElement(), keyframes); }
void CollapsibleEffect::dropEvent(QDropEvent *event)
@@ -740,9 +740,9 @@ void CollapsibleEffect::setRange(int inPoint, int outPoint)
m_paramWidget->setRange(inPoint, outPoint);
}
-void CollapsibleEffect::setKeyframes(const QString &tag, const QString &data)
+void CollapsibleEffect::setKeyframes(const QString &tag, const QString &keyframes)
{
- m_paramWidget->setKeyframes(tag, data);
+ m_paramWidget->setKeyframes(tag, keyframes);
}
bool CollapsibleEffect::isMovable() const
diff --git a/src/effectstack/collapsibleeffect.h \
b/src/effectstack/collapsibleeffect.h index ad6f7637a..bfc81f59a 100644
--- a/src/effectstack/collapsibleeffect.h
+++ b/src/effectstack/collapsibleeffect.h
@@ -78,11 +78,11 @@ public:
/** @brief Set clip in / out points. */
void setRange(int inPoint, int outPoint);
/** @brief Import keyframes from a clip's data. */
- void setKeyframes(const QString &tag, const QString &data);
+ void setKeyframes(const QString &tag, const QString &keyframes);
/** @brief Pass frame size info (dar, etc). */
void updateFrameInfo();
/** @brief Select active keyframe. */
- void setActiveKeyframe(int frame);
+ void setActiveKeyframe(int kf);
/** @brief Returns true if effect can be moved (false for speed effect). */
bool isMovable() const;
@@ -157,7 +157,7 @@ signals:
void unGroup(CollapsibleEffect *);
void createRegion(int, const QUrl &);
void deleteGroup(const QDomDocument &);
- void importClipKeyframes(GraphicsRectItem, ItemInfo, QDomElement, const \
QMap<QString, QString> &data = QMap<QString, QString>()); + void \
importClipKeyframes(GraphicsRectItem, ItemInfo, QDomElement, const QMap<QString, \
QString> &keyframes = QMap<QString, QString>()); };
#endif
diff --git a/src/effectstack/effectstackedit.cpp \
b/src/effectstack/effectstackedit.cpp index d62f130a7..b0a485af7 100644
--- a/src/effectstack/effectstackedit.cpp
+++ b/src/effectstack/effectstackedit.cpp
@@ -181,12 +181,12 @@ MonitorSceneType EffectStackEdit::needsMonitorEffectScene() \
const return m_paramWidget->needsMonitorEffectScene();
}
-void EffectStackEdit::setKeyframes(const QString &tag, const QString &data)
+void EffectStackEdit::setKeyframes(const QString &tag, const QString &keyframes)
{
if (!m_paramWidget) {
return;
}
- m_paramWidget->setKeyframes(tag, data);
+ m_paramWidget->setKeyframes(tag, keyframes);
}
bool EffectStackEdit::doesAcceptDrops() const
@@ -197,16 +197,16 @@ bool EffectStackEdit::doesAcceptDrops() const
return m_paramWidget->doesAcceptDrops();
}
-void EffectStackEdit::importKeyframes(const QString &keyframes)
+void EffectStackEdit::importKeyframes(const QString &kf)
{
- QMap<QString, QString> data;
- if (keyframes.contains(QLatin1Char('\n'))) {
- const QStringList params = keyframes.split(QLatin1Char('\n'), \
QString::SkipEmptyParts); + QMap<QString, QString> keyframes;
+ if (kf.contains(QLatin1Char('\n'))) {
+ const QStringList params = kf.split(QLatin1Char('\n'), \
QString::SkipEmptyParts); for (const QString ¶m : params) {
- data.insert(param.section(QLatin1Char('='), 0, 0), \
param.section(QLatin1Char('='), 1)); + \
keyframes.insert(param.section(QLatin1Char('='), 0, 0), \
param.section(QLatin1Char('='), 1)); }
} else {
- data.insert(keyframes.section(QLatin1Char('='), 0, 0), \
keyframes.section(QLatin1Char('='), 1)); + \
keyframes.insert(kf.section(QLatin1Char('='), 0, 0), kf.section(QLatin1Char('='), \
1)); }
- emit importClipKeyframes(TransitionWidget, data);
+ emit importClipKeyframes(TransitionWidget, keyframes);
}
diff --git a/src/effectstack/effectstackedit.h b/src/effectstack/effectstackedit.h
index fcfa9802f..c1a5f33ab 100644
--- a/src/effectstack/effectstackedit.h
+++ b/src/effectstack/effectstackedit.h
@@ -52,7 +52,7 @@ public:
/** @brief Returns type of monitor scene requested by this transition. */
MonitorSceneType needsMonitorEffectScene() const;
/** @brief Set keyframes for this transition. */
- void setKeyframes(const QString &tag, const QString &data);
+ void setKeyframes(const QString &tag, const QString &keyframes);
void updatePalette();
/** @brief Emit geometry settings. */
void initEffectScene(int pos);
@@ -72,7 +72,7 @@ public slots:
private slots:
/** @brief Import keyframes for the transition. */
- void importKeyframes(const QString &keyframes);
+ void importKeyframes(const QString &kf);
signals:
void parameterChanged(const QDomElement &, const QDomElement &, int);
@@ -86,7 +86,7 @@ signals:
void effectStateChanged(bool enabled);
/** @brief Start an MLT filter job on this clip. */
void startFilterJob(QMap<QString, QString> &, QMap<QString, QString> &, \
QMap<QString, QString> &);
- void importClipKeyframes(GraphicsRectItem = AVWidget, const QMap<QString, \
QString> &data = QMap<QString, QString>()); + void \
importClipKeyframes(GraphicsRectItem = AVWidget, const QMap<QString, QString> \
&keyframes = QMap<QString, QString>()); };
#endif
diff --git a/src/effectstack/effectstackview2.cpp \
b/src/effectstack/effectstackview2.cpp index a7fc58f77..923481740 100644
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -592,9 +592,7 @@ void EffectStackView2::startDrag()
QDrag *drag = new QDrag(this);
drag->setPixmap(pixmap);
QMimeData *mime = new QMimeData;
- QByteArray data;
- data.append(doc.toString().toUtf8());
- mime->setData(QStringLiteral("kdenlive/effectslist"), data);
+ mime->setData(QStringLiteral("kdenlive/effectslist"), doc.toString().toUtf8());
// Assign ownership of the QMimeData object to the QDrag object.
drag->setMimeData(mime);
@@ -1227,11 +1225,11 @@ void EffectStackView2::dropEvent(QDropEvent *event)
processDroppedEffect(doc.documentElement(), event);
}
-void EffectStackView2::setKeyframes(const QString &tag, const QString &data)
+void EffectStackView2::setKeyframes(const QString &tag, const QString &keyframes)
{
for (int i = 0; i < m_effects.count(); ++i) {
if (m_effects.at(i)->isActive()) {
- m_effects.at(i)->setKeyframes(tag, data);
+ m_effects.at(i)->setKeyframes(tag, keyframes);
break;
}
}
diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h
index cc514a5f1..0604d0eb4 100644
--- a/src/effectstack/effectstackview2.h
+++ b/src/effectstack/effectstackview2.h
@@ -80,7 +80,7 @@ public:
static const QString getStyleSheet();
/** @brief Import keyframes from the clip metadata */
- void setKeyframes(const QString &tag, const QString &data);
+ void setKeyframes(const QString &tag, const QString &keyframes);
/** @brief Returns the transition setting widget for signal/slot connections */
TransitionSettings *transitionConfig();
@@ -284,7 +284,7 @@ signals:
void showComments(bool show);
void startFilterJob(const ItemInfo &info, const QString &clipId, QMap<QString, \
QString> &, QMap<QString, QString> &, QMap<QString, QString> &); void \
addEffect(ClipItem *, const QDomElement &, int);
- void importClipKeyframes(GraphicsRectItem, ItemInfo, const QDomElement &, const \
QMap<QString, QString> &data = QMap<QString, QString>()); + void \
importClipKeyframes(GraphicsRectItem, ItemInfo, const QDomElement &, const \
QMap<QString, QString> &keyframes = QMap<QString, QString>()); };
#endif
diff --git a/src/effectstack/parametercontainer.cpp \
b/src/effectstack/parametercontainer.cpp index 4bbc2cf1d..a48bcc858 100644
--- a/src/effectstack/parametercontainer.cpp
+++ b/src/effectstack/parametercontainer.cpp
@@ -233,15 +233,15 @@ ParameterContainer::ParameterContainer(const QDomElement \
&effect, const ItemInfo
listitems = \
MainWindow::m_lumaFiles.value(QStringLiteral("PAL")); }
lswid->addItem(i18n("None (Dissolve)"));
- for (int i = 0; i < listitems.count(); ++i) {
- QString entry = listitems.at(i);
- lswid->addItem(listitems.at(i).section(QStringLiteral("/"), \
-1), entry); + for (int j = 0; j < listitems.count(); ++j) {
+ QString entry = listitems.at(j);
+ lswid->addItem(listitems.at(j).section(QStringLiteral("/"), \
-1), entry);
if (!entry.isEmpty() && \
(entry.endsWith(QLatin1String(".png")) || \
entry.endsWith(QLatin1String(".pgm")))) {
if (!MainWindow::m_lumacache.contains(entry)) {
QImage pix(entry);
MainWindow::m_lumacache.insert(entry, pix.scaled(50, \
30, Qt::KeepAspectRatio, Qt::SmoothTransformation)); }
- lswid->setItemIcon(i + 1, \
QPixmap::fromImage(MainWindow::m_lumacache.value(entry))); + \
lswid->setItemIcon(j + 1, QPixmap::fromImage(MainWindow::m_lumacache.value(entry))); \
} }
lswid->setCurrentText(pa.attribute(QStringLiteral("default")));
@@ -264,8 +264,8 @@ ParameterContainer::ParameterContainer(const QDomElement &effect, \
const ItemInfo if (listitemsdisplay.count() != listitems.count()) {
listitemsdisplay = listitems;
}
- for (int i = 0; i < listitems.count(); ++i) {
- lswid->addItem(listitemsdisplay.at(i), listitems.at(i));
+ for (int j = 0; j < listitems.count(); ++j) {
+ lswid->addItem(listitemsdisplay.at(j), listitems.at(j));
}
if (!value.isEmpty() && listitems.contains(value)) {
lswid->setCurrentIndex(listitems.indexOf(value));
@@ -429,9 +429,9 @@ ParameterContainer::ParameterContainer(const QDomElement &effect, \
const ItemInfo QList<QPointF> points;
int number;
double version = 0;
- QDomElement namenode = \
effect.firstChildElement(QStringLiteral("version"));
- if (!namenode.isNull()) {
- version = locale.toDouble(namenode.text());
+ QDomElement versionnode = \
effect.firstChildElement(QStringLiteral("version")); + if \
(!versionnode.isNull()) { + version = \
locale.toDouble(versionnode.text()); }
if (version > 0.2) {
// Rounding gives really weird results. (int) (10 * 0.3) gives \
2! So for now, add 0.5 to get correct result @@ -579,8 +579,8 @@ \
ParameterContainer::ParameterContainer(const QDomElement &effect, const ItemInfo if \
(keyworddisplaylist.count() != keywordlist.count()) { keyworddisplaylist = \
keywordlist; }
- for (int i = 0; i < keywordlist.count(); ++i) {
- kval->comboboxwidget->addItem(keyworddisplaylist.at(i), \
keywordlist.at(i)); + for (int j = 0; j < keywordlist.count(); ++j) {
+ kval->comboboxwidget->addItem(keyworddisplaylist.at(j), \
keywordlist.at(j)); }
// Add disabled user prompt at index 0
kval->comboboxwidget->insertItem(0, i18n("<select a keyword>"), "");
@@ -1028,9 +1028,9 @@ void ParameterContainer::slotCollectAllParameters()
int off = pa.attribute(QStringLiteral("min")).toInt();
int end = pa.attribute(QStringLiteral("max")).toInt();
double version = 0;
- QDomElement namenode = \
m_effect.firstChildElement(QStringLiteral("version"));
- if (!namenode.isNull()) {
- version = locale.toDouble(namenode.text());
+ QDomElement versionnode = \
m_effect.firstChildElement(QStringLiteral("version")); + if \
(!versionnode.isNull()) { + version = \
locale.toDouble(versionnode.text()); }
if (version > 0.2) {
EffectsList::setParameter(m_effect, number, \
locale.toString(points.count() / 10.)); @@ -1239,8 +1239,8 @@ void \
ParameterContainer::slotStartFilterJobAction() // Fill filter params
QStringList filterList = filterattributes.split(' ');
QString param;
- for (int i = 0; i < filterList.size(); ++i) {
- param = filterList.at(i);
+ for (int j = 0; j < filterList.size(); ++j) {
+ param = filterList.at(j);
if (param != QLatin1String("%params")) {
filterParams.insert(param.section(QLatin1Char('='), 0, 0), \
param.section(QLatin1Char('='), 1)); }
@@ -1257,8 +1257,8 @@ void ParameterContainer::slotStartFilterJobAction()
// Fill consumer params
QString consumerattributes = \
pa.attribute(QStringLiteral("consumerparams")); QStringList consumerList = \
consumerattributes.split(' ');
- for (int i = 0; i < consumerList.size(); ++i) {
- param = consumerList.at(i);
+ for (int j = 0; j < consumerList.size(); ++j) {
+ param = consumerList.at(j);
if (param != QLatin1String("%params")) {
consumerParams.insert(param.section(QLatin1Char('='), 0, 0), \
param.section(QLatin1Char('='), 1)); }
diff --git a/src/effectstack/widgets/animationwidget.cpp \
b/src/effectstack/widgets/animationwidget.cpp index aa2623fce..b6e1cd051 100644
--- a/src/effectstack/widgets/animationwidget.cpp
+++ b/src/effectstack/widgets/animationwidget.cpp
@@ -469,9 +469,9 @@ void AnimationWidget::updateToolbar()
}
if (m_animController.is_key(pos)) {
QList<QAction *> types = m_selectType->actions();
- for (int i = 0; i < types.count(); i++) {
- if (types.at(i)->data().toInt() == (int) \
m_animController.keyframe_type(pos)) {
- m_selectType->setCurrentAction(types.at(i));
+ for (int j = 0; j < types.count(); j++) {
+ if (types.at(j)->data().toInt() == (int) \
m_animController.keyframe_type(pos)) { + \
m_selectType->setCurrentAction(types.at(j)); break;
}
}
@@ -562,9 +562,9 @@ void AnimationWidget::updateSlider(int pos)
m_endAttach->setChecked(m_attachedToEnd > -2 && pos >= \
m_attachedToEnd);
mlt_keyframe_type currentType = m_animController.keyframe_type(pos);
QList<QAction *> types = m_selectType->actions();
- for (int i = 0; i < types.count(); i++) {
- if ((mlt_keyframe_type) types.at(i)->data().toInt() == \
currentType) {
- m_selectType->setCurrentAction(types.at(i));
+ for (int j = 0; j < types.count(); j++) {
+ if ((mlt_keyframe_type) types.at(j)->data().toInt() == \
currentType) { + m_selectType->setCurrentAction(types.at(j));
break;
}
}
diff --git a/src/effectstack/widgets/choosecolorwidget.cpp \
b/src/effectstack/widgets/choosecolorwidget.cpp index 2754e0c78..b28586410 100644
--- a/src/effectstack/widgets/choosecolorwidget.cpp
+++ b/src/effectstack/widgets/choosecolorwidget.cpp
@@ -30,7 +30,7 @@ static QColor stringToColor(QString strColor)
{
bool ok = false;
QColor color("black");
- int intval = 0;
+ uint intval = 0;
if (strColor.startsWith(QLatin1String("0x"))) {
if (strColor.length() == 10) {
// 0xRRGGBBAA
diff --git a/src/project/clipmanager.cpp b/src/project/clipmanager.cpp
index f9040a75f..37d14937c 100644
--- a/src/project/clipmanager.cpp
+++ b/src/project/clipmanager.cpp
@@ -251,7 +251,7 @@ void ClipManager::slotAddTextTemplateClip(const QString \
&titleName, const QUrl & doc.appendChild(prod);
prod.setAttribute(QStringLiteral("name"), titleName);
prod.setAttribute(QStringLiteral("resource"), path.toLocalFile());
- uint id = pCore->bin()->getFreeClipId();
+ int id = pCore->bin()->getFreeClipId();
prod.setAttribute(QStringLiteral("id"), QString::number(id));
if (!group.isEmpty()) {
prod.setAttribute(QStringLiteral("groupname"), group);
diff --git a/src/project/cliptranscode.cpp b/src/project/cliptranscode.cpp
index 23c956d3b..3afe4de45 100644
--- a/src/project/cliptranscode.cpp
+++ b/src/project/cliptranscode.cpp
@@ -84,10 +84,10 @@ ClipTranscode::ClipTranscode(const QStringList &urls, const \
QString ¶ms, con QMapIterator<QString, QString> i(profiles);
while (i.hasNext()) {
i.next();
- QStringList data = i.value().split(QLatin1Char(';'));
- profile_list->addItem(i.key(), data.at(0));
- if (data.count() > 1) {
- profile_list->setItemData(profile_list->count() - 1, data.at(1), \
Qt::UserRole + 1); + QStringList list = i.value().split(QLatin1Char(';'));
+ profile_list->addItem(i.key(), list.at(0));
+ if (list.count() > 1) {
+ profile_list->setItemData(profile_list->count() - 1, list.at(1), \
Qt::UserRole + 1); }
}
connect(profile_list, SIGNAL(currentIndexChanged(int)), this, \
SLOT(slotUpdateParams(int))); @@ -188,8 +188,8 @@ void \
ClipTranscode::slotShowTranscodeInfo() QString log = \
QString::fromLatin1(m_transcodeProcess.readAll()); if (m_duration == 0) {
if (log.contains(QStringLiteral("Duration:"))) {
- QString data = log.section(QStringLiteral("Duration:"), 1, \
1).section(QLatin1Char(','), 0, 0).simplified();
- QStringList numbers = data.split(QLatin1Char(':'));
+ QString duration = log.section(QStringLiteral("Duration:"), 1, \
1).section(QLatin1Char(','), 0, 0).simplified(); + QStringList numbers = \
duration.split(QLatin1Char(':')); if (numbers.size() < 3) {
return;
}
diff --git a/src/project/dialogs/archivewidget.cpp \
b/src/project/dialogs/archivewidget.cpp index 1f27cb3ab..971a79d61 100644
--- a/src/project/dialogs/archivewidget.cpp
+++ b/src/project/dialogs/archivewidget.cpp
@@ -382,11 +382,11 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, \
const QStringList }
} else if (filesList.contains(fileName)) {
// we have 2 files with same name
- int ix = 0;
- QString newFileName = fileName.section(QLatin1Char('.'), 0, -2) + \
QLatin1Char('_') + QString::number(ix) + QLatin1Char('.') + \
fileName.section(QLatin1Char('.'), -1); + int i = 0;
+ QString newFileName = fileName.section(QLatin1Char('.'), 0, -2) + \
QLatin1Char('_') + QString::number(i) + QLatin1Char('.') + \
fileName.section(QLatin1Char('.'), -1); while (filesList.contains(newFileName)) {
- ix ++;
- newFileName = fileName.section(QLatin1Char('.'), 0, -2) + \
QLatin1Char('_') + QString::number(ix) + QLatin1Char('.') + \
fileName.section(QLatin1Char('.'), -1); + i ++;
+ newFileName = fileName.section(QLatin1Char('.'), 0, -2) + \
QLatin1Char('_') + QString::number(i) + QLatin1Char('.') + \
fileName.section(QLatin1Char('.'), -1); }
fileName = newFileName;
item->setData(0, Qt::UserRole, fileName);
@@ -687,7 +687,7 @@ void ArchiveWidget::slotArchivingFinished(KJob *job, bool \
finished)
void ArchiveWidget::slotArchivingProgress(KJob *, qulonglong size)
{
- progressBar->setValue((int) 100 * size / m_requestedSize);
+ progressBar->setValue(100 * size / m_requestedSize);
}
bool ArchiveWidget::processProjectFile()
diff --git a/src/project/dialogs/projectsettings.cpp \
b/src/project/dialogs/projectsettings.cpp index 246810b6f..0f2c1e0c3 100644
--- a/src/project/dialogs/projectsettings.cpp
+++ b/src/project/dialogs/projectsettings.cpp
@@ -573,14 +573,14 @@ QStringList ProjectSettings::extractSlideshowUrls(const QString \
&url) } else {
// this is a pattern slideshow, like sequence%4d.jpg
QString filter = QFileInfo(url).fileName();
- QString ext = filter.section(QLatin1Char('.'), -1);
+ ext = filter.section(QLatin1Char('.'), -1);
filter = filter.section(QLatin1Char('%'), 0, -2);
QString regexp = QLatin1Char('^') + filter + QStringLiteral("\\d+\\.") + ext \
+ QLatin1Char('$'); QRegExp rx(regexp);
int count = 0;
const QStringList result = dir.entryList(QDir::Files);
- for (const QString &path : result) {
- if (rx.exactMatch(path)) {
+ for (const QString &p: result) {
+ if (rx.exactMatch(p)) {
count++;
}
}
@@ -595,15 +595,15 @@ void ProjectSettings::slotExportToText()
if (savePath.isEmpty()) {
return;
}
- QString data;
- data.append(i18n("Project folder: %1", project_folder->url().toLocalFile()) + \
QLatin1Char('\n'));
- data.append(i18n("Project profile: %1", m_pw->selectedProfile()) + \
QLatin1Char('\n'));
- data.append(i18n("Total clips: %1 (%2 used in timeline).", files_count->text(), \
used_count->text()) + QStringLiteral("\n\n")); + QString text;
+ text.append(i18n("Project folder: %1", project_folder->url().toLocalFile()) + \
'\n'); + text.append(i18n("Project profile: %1", m_pw->selectedProfile()) + \
'\n'); + text.append(i18n("Total clips: %1 (%2 used in timeline).", \
files_count->text(), used_count->text()) + "\n\n"); for (int i = 0; i < \
files_list->topLevelItemCount(); ++i) { if \
(files_list->topLevelItem(i)->childCount() > 0) {
- data.append(QLatin1Char('\n') + files_list->topLevelItem(i)->text(0) + \
QStringLiteral(":\n\n")); + text.append('\n' + \
files_list->topLevelItem(i)->text(0) + ":\n\n");
for (int j = 0; j < files_list->topLevelItem(i)->childCount(); ++j) {
- data.append(files_list->topLevelItem(i)->child(j)->text(0) + \
QLatin1Char('\n')); + \
text.append(files_list->topLevelItem(i)->child(j)->text(0) + '\n'); }
}
}
@@ -616,7 +616,7 @@ void ProjectSettings::slotExportToText()
if (!xmlf.open(QIODevice::WriteOnly)) {
return;
}
- xmlf.write(data.toUtf8());
+ xmlf.write(text.toUtf8());
if (xmlf.error() != QFile::NoError) {
xmlf.close();
return;
diff --git a/src/project/dialogs/slideshowclip.cpp \
b/src/project/dialogs/slideshowclip.cpp index e833ad74d..85c8d26f8 100644
--- a/src/project/dialogs/slideshowclip.cpp
+++ b/src/project/dialogs/slideshowclip.cpp
@@ -245,8 +245,8 @@ void SlideshowClip::parseFolder()
result = dir.entryList(QDir::Files);
} else {
int offset = 0;
- QString path = m_view.pattern_url->text();
- QDir dir = QFileInfo(m_view.pattern_url->text()).absoluteDir();
+ path = m_view.pattern_url->text();
+ dir = QFileInfo(m_view.pattern_url->text()).absoluteDir();
result = dir.entryList(QDir::Files);
// find pattern
if (path.contains(QLatin1Char('?'))) {
@@ -274,23 +274,24 @@ void SlideshowClip::parseFolder()
QRegExp rx(regexp);
QStringList entries;
int ix;
- foreach (const QString &path, result) {
- if (rx.exactMatch(path)) {
+ foreach (const QString &p, result) {
+ if (rx.exactMatch(p)) {
if (offset > 0) {
// make sure our image is in the range we want (> begin)
- ix = path.section(filter, 1).section(QLatin1Char('.'), 0, \
0).toInt(); + ix = p.section(filter, 1).section(QLatin1Char('.'), \
0, 0).toInt(); + ix = p.section(filter, 1).section('.', 0, \
0).toInt(); if (ix < offset) {
continue;
}
}
- entries << path;
+ entries << p;
}
}
result = entries;
}
- foreach (const QString &path, result) {
- QListWidgetItem *item = new QListWidgetItem(unknownicon, path);
- item->setData(Qt::UserRole, dir.filePath(path));
+ foreach (const QString &p, result) {
+ QListWidgetItem *item = new QListWidgetItem(unknownicon, p);
+ item->setData(Qt::UserRole, dir.filePath(p));
m_view.icon_list->addItem(item);
}
m_count = m_view.icon_list->count();
diff --git a/src/project/jobs/filterjob.cpp b/src/project/jobs/filterjob.cpp
index 0a25d8c98..bd5f7ec8d 100644
--- a/src/project/jobs/filterjob.cpp
+++ b/src/project/jobs/filterjob.cpp
@@ -218,7 +218,7 @@ QHash<ProjectClip *, AbstractClipJob *> \
FilterJob::prepareJob(const QList<Projec
// in and out
int in = 0;
- int out = -1;
+ out = -1;
ProjectClip *clip = clips.at(i);
if (extraParams.contains(QStringLiteral("zoneonly"))) {
// Analyse clip zone only, remove in / out and replace with zone
diff --git a/src/project/transitionsettings.cpp b/src/project/transitionsettings.cpp
index c64a72e47..8448907b9 100644
--- a/src/project/transitionsettings.cpp
+++ b/src/project/transitionsettings.cpp
@@ -63,11 +63,11 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget \
*parent) : }
ix = 0;
foreach (const QStringList &value, transitionsList) {
- QStringList data = value;
- if (!data.isEmpty()) {
- data.removeLast();
+ QStringList list = value;
+ if (!list.isEmpty()) {
+ list.removeLast();
}
- transitionList->addItem(value.at(0), data);
+ transitionList->addItem(value.at(0), list);
transitionList->setItemData(ix, \
MainWindow::transitions.getInfoFromIndex(value.last().toInt()), Qt::ToolTipRole); \
++ix; }
@@ -77,9 +77,9 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget \
*parent) :
connect(m_effectEdit, &EffectStackEdit::parameterChanged, this, \
&TransitionSettings::slotUpdateEffectParams); }
-void TransitionSettings::prepareImportClipKeyframes(GraphicsRectItem, const \
QMap<QString, QString> &data) +void \
TransitionSettings::prepareImportClipKeyframes(GraphicsRectItem, const QMap<QString, \
QString> &keyframes) {
- emit importClipKeyframes(TransitionWidget, m_usedTransition->info(), \
m_usedTransition->toXML(), data); + emit importClipKeyframes(TransitionWidget, \
m_usedTransition->info(), m_usedTransition->toXML(), keyframes); }
void TransitionSettings::refreshIcons()
@@ -120,9 +120,9 @@ void TransitionSettings::dropEvent(QDropEvent *event)
{
if (event->mimeData()->hasFormat(QStringLiteral("kdenlive/geometry"))) {
QString itemData = \
QString::fromLatin1(event->mimeData()->data(QStringLiteral("kdenlive/geometry")));
- QMap<QString, QString> data;
- data.insert(i18n("Geometry"), itemData);
- emit importClipKeyframes(TransitionWidget, m_usedTransition->info(), \
m_usedTransition->toXML(), data); + QMap<QString, QString> keyframes;
+ keyframes.insert(i18n("Geometry"), itemData);
+ emit importClipKeyframes(TransitionWidget, m_usedTransition->info(), \
m_usedTransition->toXML(), keyframes); }
}
@@ -338,9 +338,9 @@ void TransitionSettings::slotCheckMonitorPosition(int renderPos)
}
}
-void TransitionSettings::setKeyframes(const QString &tag, const QString &data)
+void TransitionSettings::setKeyframes(const QString &tag, const QString &keyframes)
{
- m_effectEdit->setKeyframes(tag, data);
+ m_effectEdit->setKeyframes(tag, keyframes);
}
void TransitionSettings::updatePalette()
diff --git a/src/project/transitionsettings.h b/src/project/transitionsettings.h
index 8b277b155..f3fcac897 100644
--- a/src/project/transitionsettings.h
+++ b/src/project/transitionsettings.h
@@ -65,12 +65,12 @@ private slots:
void slotRenderPos(int pos);
void slotSeekTimeline(int pos);
void slotCheckMonitorPosition(int renderPos);
- void prepareImportClipKeyframes(GraphicsRectItem, const QMap<QString, QString> \
&data); + void prepareImportClipKeyframes(GraphicsRectItem, const QMap<QString, \
QString> &keyframes);
signals:
void transitionUpdated(Transition *, const QDomElement &);
void seekTimeline(int);
- void importClipKeyframes(GraphicsRectItem, const ItemInfo &, const QDomElement \
&, const QMap<QString, QString> &data = QMap<QString, QString>()); + void \
importClipKeyframes(GraphicsRectItem, const ItemInfo &, const QDomElement &, const \
QMap<QString, QString> &keyframes = QMap<QString, QString>()); };
#endif
diff --git a/src/statusbarmessagelabel.h b/src/statusbarmessagelabel.h
index 68e2d4a49..3d0aae2fd 100644
--- a/src/statusbarmessagelabel.h
+++ b/src/statusbarmessagelabel.h
@@ -67,8 +67,8 @@ struct StatusBarMessageItem {
return (type == MltError && !confirmed);
}
- StatusBarMessageItem(const QString &text = QString(), MessageType type = \
DefaultMessage, int timeoutMS = 0) :
- text(text), type(type), timeoutMillis(timeoutMS), confirmed(false) {}
+ StatusBarMessageItem(const QString &messageText = QString(), MessageType \
messageType = DefaultMessage, int timeoutMS = 0) : + text(messageText), \
type(messageType), timeoutMillis(timeoutMS), confirmed(false) {}
bool operator ==(const StatusBarMessageItem &other) const
{
diff --git a/src/timeline/abstractgroupitem.cpp b/src/timeline/abstractgroupitem.cpp
index 32f95e6f1..c7108941f 100644
--- a/src/timeline/abstractgroupitem.cpp
+++ b/src/timeline/abstractgroupitem.cpp
@@ -339,7 +339,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, \
const QVariant }
if (!collidingItems.isEmpty()) {
bool forwardMove = xpos > start.x();
- int offset = 0;
+ offset = 0;
for (int i = 0; i < collidingItems.count(); ++i) {
QGraphicsItem *collision = collidingItems.at(i);
if (collision->type() == AVWidget) {
@@ -399,7 +399,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, \
const QVariant return newPos;
} else {
bool forwardMove = xpos > start.x();
- int offset = 0;
+ offset = 0;
for (int i = 0; i < collidingItems.count(); ++i) {
QGraphicsItem *collision = collidingItems.at(i);
if (collision->type() == TransitionWidget) {
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 1ccfacb6d..5efb3dfff 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -1697,10 +1697,10 @@ void CustomTrackView::displayContextMenu(QPoint pos, \
AbstractClipItem *clip)
int offset = (item->startPos() - \
item->cropStart()).frames(m_document->fps()); if (!markers.isEmpty()) {
for (int i = 0; i < markers.count(); ++i) {
- int pos = (int) \
markers.at(i).time().frames(m_document->timecode().fps()); + \
int frame = (int) \
markers.at(i).time().frames(m_document->timecode().fps());
QString position = \
m_document->timecode().getTimecode(markers.at(i).time()) + QLatin1Char(' ') + \
markers.at(i).comment(); QAction *go = m_markerMenu->addAction(position);
- go->setData(pos + offset);
+ go->setData(frame + offset);
}
}
m_markerMenu->setEnabled(!m_markerMenu->isEmpty());
@@ -1785,9 +1785,9 @@ void CustomTrackView::insertClipCut(const QString &id, int in, \
int out) selectClip(true, false);
}
-bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos)
+bool CustomTrackView::insertDropClips(const QMimeData *mimeData, const QPoint &pos)
{
- m_clipDrag = data->hasFormat(QStringLiteral("kdenlive/clip")) || \
data->hasFormat(QStringLiteral("kdenlive/producerslist")); + m_clipDrag = \
mimeData->hasFormat(QStringLiteral("kdenlive/clip")) || \
mimeData->hasFormat(QStringLiteral("kdenlive/producerslist")); // This is not a clip \
drag, maybe effect or other... if (!m_clipDrag) {
return false;
@@ -1804,8 +1804,8 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, \
const QPoint &pos)
if (track <= 0 || track > m_timeline->tracksCount() - 1 || \
m_timeline->getTrackInfo(track).isLocked) { return true;
}
- if (data->hasFormat(QStringLiteral("kdenlive/clip"))) {
- QStringList list = \
QString(data->data(QStringLiteral("kdenlive/clip"))).split(QLatin1Char(';')); + if \
(mimeData->hasFormat(QStringLiteral("kdenlive/clip"))) { + QStringList list = \
QString(mimeData->data(QStringLiteral("kdenlive/clip"))).split(QLatin1Char(';')); \
ProjectClip *clip = m_document->getBinClip(list.at(0)); if (clip == nullptr) {
//qCDebug(KDENLIVE_LOG) << " WARNING))))))))) CLIP NOT FOUND : " << \
list.at(0); @@ -1858,8 +1858,8 @@ bool CustomTrackView::insertDropClips(const \
QMimeData *data, const QPoint &pos) m_selectionGroup->setPos(framePos);
scene()->addItem(m_selectionGroup);
m_selectionGroup->setSelected(true);
- } else if (data->hasFormat(QStringLiteral("kdenlive/producerslist"))) {
- QStringList ids = \
QString(data->data(QStringLiteral("kdenlive/producerslist"))).split(QLatin1Char(';'));
+ } else if (mimeData->hasFormat(QStringLiteral("kdenlive/producerslist"))) {
+ QStringList ids = \
QString(mimeData->data(QStringLiteral("kdenlive/producerslist"))).split(QLatin1Char(';'));
QList<GenTime> offsetList;
QList<ItemInfo> infoList;
GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps());
@@ -3049,9 +3049,9 @@ void CustomTrackView::slotAddTransitionToSelectedClips(const \
QDomElement &transi
QRectF r(info.startPos.frames(m_document->fps()), startY, \
(info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); \
QList<QGraphicsItem *> selection = m_scene->items(r); bool transitionAccepted = \
true;
- for (int i = 0; i < selection.count(); ++i) {
- if (selection.at(i)->type() == TransitionWidget) {
- Transition *tr = static_cast <Transition \
*>(selection.at(i)); + for (int j = 0; j < selection.count(); ++j) {
+ if (selection.at(j)->type() == TransitionWidget) {
+ Transition *tr = static_cast <Transition \
*>(selection.at(j));
if (tr->startPos() - info.startPos > GenTime(5, \
m_document->fps())) { if (tr->startPos() < info.endPos) {
info.endPos = tr->startPos();
@@ -4016,9 +4016,9 @@ void CustomTrackView::slotRemoveSpace(bool multiTrack)
}
createGroupForSelectedItems(selection);
QList<AbstractClipItem *> items;
- foreach (QGraphicsItem *item, selection) {
- if (item->type() == AVWidget || item->type() == TransitionWidget) {
- items << (AbstractClipItem *) item;
+ foreach (QGraphicsItem *i, selection) {
+ if (i->type() == AVWidget || i->type() == TransitionWidget) {
+ items << (AbstractClipItem *) i;
}
}
GenTime timeOffset(-length, m_document->fps());
@@ -4763,8 +4763,8 @@ void CustomTrackView::groupClips(bool group, \
QList<QGraphicsItem *> itemList, bo
new GroupClipsCommand(this, clipInfos, transitionInfos, group, doIt, \
metaCommand); m_commandStack->push(metaCommand);
} else {
- GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, \
transitionInfos, group, doIt);
- m_commandStack->push(command);
+ GroupClipsCommand *groupCommand = new GroupClipsCommand(this, \
clipInfos, transitionInfos, group, doIt); + \
m_commandStack->push(groupCommand); }
}
if (!doIt) {
@@ -5343,8 +5343,8 @@ void CustomTrackView::moveGroup(QList<ItemInfo> startClip, \
QList<ItemInfo> start }
m_timeline->track(info.track)->add(info.startPos.seconds(), prod, \
info.cropStart.seconds(), (info.cropStart + info.cropDuration).seconds(), \
clip->clipState(), true, m_scene->editMode());
- for (int i = 0; i < clip->effectsCount(); ++i) {
- \
m_timeline->track(info.track)->addEffect(info.startPos.seconds(), \
EffectsController::getEffectArgs(m_document->getProfileInfo(), clip->effect(i))); + \
for (int j = 0; j < clip->effectsCount(); ++j) { + \
m_timeline->track(info.track)->addEffect(info.startPos.seconds(), \
EffectsController::getEffectArgs(m_document->getProfileInfo(), clip->effect(j))); }
} else if (item->type() == TransitionWidget) {
Transition *tr = static_cast <Transition *>(item);
@@ -5720,14 +5720,14 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem \
*item, const ItemInf } else {
// Check transition keyframes
QDomElement old = transition->toXML();
- ItemInfo info = transition->info();
- if (transition->updateKeyframes(oldInfo, info)) {
+ ItemInfo newInfo = transition->info();
+ if (transition->updateKeyframes(oldInfo, newInfo)) {
QDomElement xml = transition->toXML();
m_timeline->transitionHandler->updateTransition(xml.attribute(QStringLiteral("tag")), \
xml.attribute(QStringLiteral("tag")), \
xml.attribute(QStringLiteral("transition_btrack")).toInt(), \
xml.attribute(QStringLiteral("transition_atrack")).toInt(), transition->startPos(), \
transition->endPos(), xml);
new EditTransitionCommand(this, transition->track(), \
transition->startPos(), old, xml, false, command); }
- updateTransitionWidget(transition, info);
- new MoveTransitionCommand(this, oldInfo, info, false, true, command);
+ updateTransitionWidget(transition, newInfo);
+ new MoveTransitionCommand(this, oldInfo, newInfo, false, true, command);
}
}
if (item->parentItem() && item->parentItem() != m_selectionGroup) {
@@ -5959,7 +5959,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem \
*selected, QList<GenTime
// add guides
for (int i = 0; i < m_guides.count(); ++i) {
- GenTime pos = m_guides.at(i)->position();
+ pos = m_guides.at(i)->position();
if (!snaps.contains(pos)) {
snaps.append(pos);
}
@@ -6061,11 +6061,11 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
QMap<double, QString> CustomTrackView::guidesData() const
{
- QMap<double, QString> data;
+ QMap<double, QString> gData;
for (int i = 0; i < m_guides.count(); ++i) {
- data.insert(m_guides.at(i)->position().seconds(), m_guides.at(i)->label());
+ gData.insert(m_guides.at(i)->position().seconds(), m_guides.at(i)->label());
}
- return data;
+ return gData;
}
void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const \
QString &comment) @@ -6301,7 +6301,7 @@ void CustomTrackView::setScale(double \
scaleFactor, double verticalScale, bool zo if (zoomOnMouse) {
// Zoom on mouse position
centerOn(QPointF(lastMousePos, verticalPos));
- int diff = scaleFactor * (getMousePos() - lastMousePos);
+ diff = scaleFactor * (getMousePos() - lastMousePos);
horizontalScrollBar()->setValue(horizontalScrollBar()->value() - diff);
} else {
centerOn(QPointF(cursorPos(), verticalPos));
@@ -7556,9 +7556,9 @@ bool CustomTrackView::doSplitAudio(const GenTime &pos, int \
track, int destTrack, }
// re-add audio effects
- for (int i = 0; i < effects.count(); ++i) {
- if (effects.at(i).attribute(QStringLiteral("type")) == \
QLatin1String("audio")) {
- addEffect(track, pos, effects.at(i));
+ for (int j = 0; j < effects.count(); ++j) {
+ if (effects.at(j).attribute(QStringLiteral("type")) == \
QLatin1String("audio")) { + addEffect(track, pos, \
effects.at(j)); }
}
@@ -7818,9 +7818,9 @@ void CustomTrackView::reloadTransitionLumas()
transitionitem = static_cast <Transition *>(itemList.at(i));
transitionXml = transitionitem->toXML();
if (transitionXml.attribute(QStringLiteral("id")) == \
QLatin1String("luma") && transitionXml.attribute(QStringLiteral("tag")) == \
QLatin1String("luma")) {
- QDomNodeList params = \
transitionXml.elementsByTagName(QStringLiteral("parameter"));
- for (int i = 0; i < params.count(); ++i) {
- QDomElement e = params.item(i).toElement();
+ params = \
transitionXml.elementsByTagName(QStringLiteral("parameter")); + for \
(int j = 0; j < params.count(); ++j) { + QDomElement e = \
params.item(j).toElement();
if (e.attribute(QStringLiteral("tag")) == \
QLatin1String("resource")) {
e.setAttribute(QStringLiteral("paramlistdisplay"), \
lumaNames);
e.setAttribute(QStringLiteral("paramlist"), lumaFiles);
@@ -7829,9 +7829,9 @@ void CustomTrackView::reloadTransitionLumas()
}
}
if (transitionXml.attribute(QStringLiteral("id")) == \
QLatin1String("composite") && transitionXml.attribute(QStringLiteral("tag")) == \
QLatin1String("composite")) {
- QDomNodeList params = \
transitionXml.elementsByTagName(QStringLiteral("parameter"));
- for (int i = 0; i < params.count(); ++i) {
- QDomElement e = params.item(i).toElement();
+ params = \
transitionXml.elementsByTagName(QStringLiteral("parameter")); + for \
(int j = 0; j < params.count(); ++j) { + QDomElement e = \
params.item(j).toElement();
if (e.attribute(QStringLiteral("tag")) == QLatin1String("luma")) \
{
e.setAttribute(QStringLiteral("paramlistdisplay"), \
lumaNames);
e.setAttribute(QStringLiteral("paramlist"), lumaFiles);
@@ -8355,11 +8355,11 @@ void CustomTrackView::slotGotFilterJobResults(const QString \
&/*id*/, int startPo }
}
-void CustomTrackView::slotImportClipKeyframes(GraphicsRectItem type, const ItemInfo \
&info, const QDomElement &xml, QMap<QString, QString> data) +void \
CustomTrackView::slotImportClipKeyframes(GraphicsRectItem type, const ItemInfo &info, \
const QDomElement &xml, QMap<QString, QString> keyframes) {
ClipItem *item = nullptr;
ItemInfo srcInfo;
- if (data.isEmpty()) {
+ if (keyframes.isEmpty()) {
if (type == TransitionWidget) {
// We want to import keyframes to a transition
if (!m_selectionGroup) {
@@ -8385,13 +8385,13 @@ void \
CustomTrackView::slotImportClipKeyframes(GraphicsRectItem type, const ItemI emit \
displayMessage(i18n("No clip found"), ErrorMessage); return;
}
- data = item->binClip()->analysisData();
+ keyframes = item->binClip()->analysisData();
}
- if (data.isEmpty()) {
+ if (keyframes.isEmpty()) {
emit displayMessage(i18n("No keyframe data found in clip"), ErrorMessage);
return;
}
- QPointer<KeyframeImport>import = new KeyframeImport(srcInfo, info, data, \
m_document->timecode(), xml, m_document->getProfileInfo(), this); + \
QPointer<KeyframeImport>import = new KeyframeImport(srcInfo, info, keyframes, \
m_document->timecode(), xml, m_document->getProfileInfo(), this); if (import->exec() \
!= QDialog::Accepted) { delete import;
return;
@@ -8768,9 +8768,9 @@ void CustomTrackView::dropTransitionGeometry(Transition *trans, \
const QString &g updateTimelineSelection();
}
emit transitionItemSelected(trans);
- QMap<QString, QString> data;
- data.insert(i18n("Dropped Geometry"), geometry);
- slotImportClipKeyframes(TransitionWidget, trans->info(), trans->toXML(), data);
+ QMap<QString, QString> keyframes;
+ keyframes.insert(i18n("Dropped Geometry"), geometry);
+ slotImportClipKeyframes(TransitionWidget, trans->info(), trans->toXML(), \
keyframes); }
void CustomTrackView::dropClipGeometry(ClipItem *clip, const QString &geometry)
@@ -8787,14 +8787,14 @@ void CustomTrackView::dropClipGeometry(ClipItem *clip, const \
QString &geometry)
emit displayMessage(i18n("No keyframes to import"), InformationMessage);
return;
}
- QMap<QString, QString> data;
- data.insert(geometry.section(QLatin1Char('='), 0, 0), \
geometry.section(QLatin1Char('='), 1)); + QMap<QString, QString> keyframes;
+ keyframes.insert(geometry.section(QLatin1Char('='), 0, 0), \
geometry.section(QLatin1Char('='), 1));
QDomElement currentEffect = clip->getEffectAtIndex(clip->selectedEffectIndex());
if (currentEffect.isNull()) {
emit displayMessage(i18n("No effect to import keyframes"), \
InformationMessage); return;
}
- slotImportClipKeyframes(AVWidget, clip->info(), \
currentEffect.cloneNode().toElement(), data); + slotImportClipKeyframes(AVWidget, \
clip->info(), currentEffect.cloneNode().toElement(), keyframes); }
void CustomTrackView::breakLockedGroups(const QList<ItemInfo> &clipsToMove, const \
QList<ItemInfo> &transitionsToMove, QUndoCommand *masterCommand, bool \
doIt)
diff --git a/src/timeline/customtrackview.h b/src/timeline/customtrackview.h
index f92047589..c1bfd5dfc 100644
--- a/src/timeline/customtrackview.h
+++ b/src/timeline/customtrackview.h
@@ -399,7 +399,7 @@ public slots:
void updateSnapPoints(AbstractClipItem *selected, QList<GenTime> offsetList = \
QList<GenTime> (), bool skipSelectedItems = false);
void slotAddEffect(ClipItem *clip, const QDomElement &effect, int track = -1);
- void slotImportClipKeyframes(GraphicsRectItem type, const ItemInfo &info, const \
QDomElement &xml, QMap<QString, QString> data = QMap<QString, QString>()); + void \
slotImportClipKeyframes(GraphicsRectItem type, const ItemInfo &info, const \
QDomElement &xml, QMap<QString, QString> keyframes = QMap<QString, QString>());
/** @brief Move playhead to mouse curser position if defined key is pressed */
void slotAlignPlayheadToMousePos();
@@ -521,7 +521,7 @@ private:
ClipItem *m_audioAlignmentReference;
void updatePositionEffects(ClipItem *item, const ItemInfo &info, bool standalone \
= true);
- bool insertDropClips(const QMimeData *data, const QPoint &pos);
+ bool insertDropClips(const QMimeData *mimeData, const QPoint &pos);
bool canBePastedTo(const QList<ItemInfo> &infoList, int type) const;
bool canBePasted(const QList<AbstractClipItem *> &items, GenTime offset, int \
trackOffset, QList<AbstractClipItem *>excluded = QList<AbstractClipItem *>()) const; \
ClipItem *getClipUnderCursor() const;
diff --git a/src/timeline/effectmanager.cpp b/src/timeline/effectmanager.cpp
index 7c78009b4..54508f6dc 100644
--- a/src/timeline/effectmanager.cpp
+++ b/src/timeline/effectmanager.cpp
@@ -124,7 +124,7 @@ bool EffectManager::addEffect(const EffectsParameterList ¶ms, \
int duration) bool success = doAddFilter(params, duration);
// re-add following filters
for (int i = 0; i < filtersList.count(); ++i) {
- Mlt::Filter *filter = filtersList.at(i);
+ filter = filtersList.at(i);
if (updateIndex) {
filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1);
}
diff --git a/src/timeline/managers/movemanager.cpp \
b/src/timeline/managers/movemanager.cpp index 0d8935277..dacff0402 100644
--- a/src/timeline/managers/movemanager.cpp
+++ b/src/timeline/managers/movemanager.cpp
@@ -186,7 +186,7 @@ void MoveManager::mouseRelease(QMouseEvent *, GenTime pos)
}
\
m_view->adjustTimelineTransitions(m_view->sceneEditMode(), startTransition, \
moveCommand);
if (startTransition->updateKeyframes(startTrInfo, \
newStartTrInfo)) {
- QDomElement old = startTransition->toXML();
+ old = startTransition->toXML();
QDomElement xml = startTransition->toXML();
\
m_transitionHandler->updateTransition(xml.attribute(QStringLiteral("tag")), \
xml.attribute(QStringLiteral("tag")), \
xml.attribute(QStringLiteral("transition_btrack")).toInt(), \
xml.attribute(QStringLiteral("transition_atrack")).toInt(), newStartTrInfo.startPos, \
newStartTrInfo.endPos, xml); }
@@ -339,12 +339,11 @@ void MoveManager::mouseRelease(QMouseEvent *, GenTime pos)
continue;
}
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
- ItemInfo info = item->info();
if (item->type() == AVWidget) {
- clipsToMove.append(info);
+ clipsToMove.append(item->info());
updatedClipsToMove << item->info();
} else {
- transitionsToMove.append(info);
+ transitionsToMove.append(item->info());
updatedTransitionsToMove << item->info();
}
}
diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp
index fe010bfeb..71e6cc93f 100644
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@ -1207,8 +1207,8 @@ void Timeline::getSubfilters(Mlt::Filter *effect, QDomElement \
¤teffect) //get effect parameters (prefixed by subfilter name)
QDomNodeList params = \
subclipeffect.elementsByTagName(QStringLiteral("parameter")); ProfileInfo info = \
m_doc->getProfileInfo();
- for (int i = 0; i < params.count(); ++i) {
- QDomElement param = params.item(i).toElement();
+ for (int j = 0; j < params.count(); ++j) {
+ QDomElement param = params.item(j).toElement();
setParam(info, param, effect->get((name + QLatin1Char('.') + \
param.attribute(QStringLiteral("name"))).toUtf8().constData())); }
currenteffect.appendChild(currenteffect.ownerDocument().importNode(subclipeffect, \
true));
diff --git a/src/timeline/track.cpp b/src/timeline/track.cpp
index 2c371a66c..120f03a15 100644
--- a/src/timeline/track.cpp
+++ b/src/timeline/track.cpp
@@ -30,9 +30,9 @@
#include "kdenlive_debug.h"
#include <math.h>
-Track::Track(int index, const QList<QAction *> &actions, Mlt::Playlist &playlist, \
TrackType type, int height, QWidget *parent) : +Track::Track(int index, const \
QList<QAction *> &actions, Mlt::Playlist &playlist, TrackType trackType, int height, \
QWidget *parent) : effectsList(EffectsList(true)),
- type(type),
+ type(trackType),
trackHeader(nullptr),
m_index(index),
m_playlist(playlist)
@@ -646,10 +646,10 @@ void Track::updateClipProperties(const QString &id, const \
QMap<QString, QString> QString current = p->parent().get("id");
QStringList processed;
if (!processed.contains(current) && (current == idForTrack || current == \
idForAudioTrack || current == idForVideoTrack)) {
- QMapIterator<QString, QString> i(properties);
- while (i.hasNext()) {
- i.next();
- p->parent().set(i.key().toUtf8().constData(), \
i.value().toUtf8().constData()); + QMapIterator<QString, QString> \
j(properties); + while (j.hasNext()) {
+ j.next();
+ p->parent().set(j.key().toUtf8().constData(), \
j.value().toUtf8().constData()); }
processed << current;
}
diff --git a/src/timeline/track.h b/src/timeline/track.h
index 510aae46f..10484ed41 100644
--- a/src/timeline/track.h
+++ b/src/timeline/track.h
@@ -51,7 +51,7 @@ public:
/** @brief Track constructor
* @param playlist is the MLT object used for monitor/render
* @param fps is the read speed (frames per seconds) */
- explicit Track(int index, const QList<QAction *> &actions, Mlt::Playlist \
&playlist, TrackType type, int height, QWidget *parent = nullptr); + explicit \
Track(int index, const QList<QAction *> &actions, Mlt::Playlist &playlist, TrackType \
trackType, int height, QWidget *parent = nullptr); ~Track();
struct SlowmoInfo {
diff --git a/src/timeline/transitionhandler.cpp b/src/timeline/transitionhandler.cpp
index bc0c7f8de..14ff64669 100644
--- a/src/timeline/transitionhandler.cpp
+++ b/src/timeline/transitionhandler.cpp
@@ -155,13 +155,13 @@ QMap<QString, QString> \
TransitionHandler::getTransitionParamsFromXml(const QDomE if (!values.isEmpty()) {
txtNeu << (int)values[0].toDouble();
}
- int i = 0;
- for (i = 0; i < separators.size() && i + 1 < values.size(); ++i) {
- txtNeu << separators[i];
- txtNeu << (int)(values[i + 1].toDouble());
+ int j = 0;
+ for (j = 0; j < separators.size() && j + 1 < values.size(); ++j) {
+ txtNeu << separators[j];
+ txtNeu << (int)(values[j + 1].toDouble());
}
- if (i < separators.size()) {
- txtNeu << separators[i];
+ if (j < separators.size()) {
+ txtNeu << separators[j];
}
map[name] = neu;
}
@@ -462,8 +462,7 @@ Mlt::Transition *TransitionHandler::getTrackTransition(const \
QStringList &names, Mlt::Transition t((mlt_transition) service->get_service());
int internal = t.get_int("internal_added");
if (internal >= 200) {
- QString service = t.get("mlt_service");
- if (names.contains(service) && t.get_b_track() == b_track && \
(a_track == -1 || t.get_a_track() == a_track)) { + if \
(names.contains(t.get("mlt_service")) && t.get_b_track() == b_track && (a_track == -1 \
|| t.get_a_track() == a_track)) { return new Mlt::Transition(t);
}
}
@@ -521,7 +520,6 @@ void TransitionHandler::enableMultiTrack(bool enable)
field->lock();
if (enable) {
// disable track composition (frei0r.cairoblend)
- QScopedPointer<Mlt::Field> field(m_tractor->field());
mlt_service nextservice = mlt_service_get_producer(field->get_service());
mlt_service_type type = mlt_service_identify(nextservice);
while (type == transition_type) {
@@ -529,8 +527,7 @@ void TransitionHandler::enableMultiTrack(bool enable)
nextservice = mlt_service_producer(nextservice);
int added = transition.get_int("internal_added");
if (added == 237) {
- QString mlt_service = transition.get("mlt_service");
- if (compositeService.contains(mlt_service) && \
transition.get_int("disable") == 0) { + if \
(compositeService.contains(transition.get("mlt_service")) && \
transition.get_int("disable") == 0) { transition.set("disable", 1);
transition.set("split_disable", 1);
}
@@ -574,7 +571,6 @@ void TransitionHandler::enableMultiTrack(bool enable)
}
}
} else {
- QScopedPointer<Mlt::Field> field(m_tractor->field());
mlt_service nextservice = mlt_service_get_producer(field->get_service());
mlt_service_type type = mlt_service_identify(nextservice);
while (type == transition_type) {
@@ -585,8 +581,7 @@ void TransitionHandler::enableMultiTrack(bool enable)
field->disconnect_service(transition);
} else if (added == 237) {
// re-enable track compositing
- QString mlt_service = transition.get("mlt_service");
- if (compositeService.contains(mlt_service) && \
transition.get_int("split_disable") == 1) { + if \
(compositeService.contains(transition.get("mlt_service")) && \
transition.get_int("split_disable") == 1) { transition.set("disable", 0);
transition.set("split_disable", (char *) nullptr);
}
@@ -629,12 +624,12 @@ void TransitionHandler::rebuildTransitions(int mode, const \
QList<int> &videoTrac Mlt::Transition t((mlt_transition) service->get_service());
int internal = t.get_int("internal_added");
if (internal == 237) {
- QString service = t.get("mlt_service");
- if (service == QLatin1String("mix")) {
+ QString serviceName = t.get("mlt_service");
+ if (serviceName == QLatin1String("mix")) {
field->disconnect_service(t);
- } else if (compositeService.contains(service)) {
+ } else if (compositeService.contains(serviceName)) {
if (mode < 0) {
- mode = service == QLatin1String("composite") ? 1 : 2;
+ mode = serviceName == QLatin1String("composite") ? 1 : 2;
}
field->disconnect_service(t);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic