[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src: Coding style
From: Montel Laurent <montel () kde ! org>
Date: 2016-12-09 13:02:27
Message-ID: E1cFKol-00080T-CG () code ! kde ! org
[Download RAW message or body]
Git commit 214a4bda8d2dc4d82936f314646a39673b916cca by Montel Laurent.
Committed on 09/12/2016 at 13:02.
Pushed by mlaurent into branch 'master'.
Coding style
M +1 -1 src/bin/bin.cpp
M +1 -1 src/dialogs/renderwidget.cpp
M +1 -1 src/doc/documentchecker.cpp
M +2 -2 src/effectslist/initeffects.cpp
M +1 -1 src/effectstack/widgets/animationwidget.cpp
M +1 -1 src/library/librarywidget.h
M +1 -1 src/mainwindow.cpp
M +6 -6 src/project/jobs/cutclipjob.cpp
M +3 -3 src/project/jobs/cutclipjob.h
M +2 -2 src/project/jobs/filterjob.cpp
M +1 -1 src/project/jobs/filterjob.h
M +1 -1 src/project/jobs/jobmanager.cpp
M +2 -2 src/project/jobs/proxyclipjob.cpp
M +1 -1 src/project/jobs/proxyclipjob.h
M +1 -1 src/renderer.cpp
M +1 -1 src/scopes/abstractscopewidget.cpp
M +1 -1 src/scopes/colorscopes/colorplaneexport.cpp
M +1 -1 src/scopes/colorscopes/vectorscope.cpp
M +1 -1 src/stopmotion/stopmotion.cpp
M +1 -1 src/timeline/customtrackview.cpp
M +1 -0 src/timeline/managers/previewmanager.cpp
M +1 -1 src/titler/titledocument.cpp
https://commits.kde.org/kdenlive/214a4bda8d2dc4d82936f314646a39673b916cca
diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
index f1c8021bc..3bc98a979 100644
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@ -2123,7 +2123,7 @@ void Bin::setupGeneratorMenu()
m_menu->insertSeparator(m_deleteAction);
}
-void Bin::setupMenu(QMenu *addMenu, QAction *defaultAction, const QHash <QString, \
QAction *> &actions) +void Bin::setupMenu(QMenu *addMenu, QAction *defaultAction, \
const QHash<QString, QAction *> &actions) {
// Setup actions
QAction *first = m_toolbar->actions().at(0);
diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index f9bf1cac4..433243f17 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -2723,7 +2723,7 @@ void RenderWidget::adjustSpeed(int speedIndex)
void RenderWidget::checkCodecs()
{
Mlt::Profile p;
- Mlt::Consumer *consumer = new Mlt::Consumer(p, "avformat");;
+ Mlt::Consumer *consumer = new Mlt::Consumer(p, "avformat");
if (consumer) {
consumer->set("vcodec", "list");
consumer->set("acodec", "list");
diff --git a/src/doc/documentchecker.cpp b/src/doc/documentchecker.cpp
index 99853d63b..e50fbc25e 100644
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@ -655,7 +655,7 @@ QString DocumentChecker::searchPathRecursively(const QDir &dir, \
const QString &f if (type == SlideShow) {
return searchDir.absoluteFilePath(fileName);
}
- return searchDir.absoluteFilePath(filesAndDirs.at(0));;
+ return searchDir.absoluteFilePath(filesAndDirs.at(0));
}
searchDir.setNameFilters(QStringList());
filesAndDirs = searchDir.entryList(QDir::Dirs | QDir::Readable | \
QDir::Executable | QDir::NoDotAndDotDot);
diff --git a/src/effectslist/initeffects.cpp b/src/effectslist/initeffects.cpp
index a245afe26..dea59ff97 100644
--- a/src/effectslist/initeffects.cpp
+++ b/src/effectslist/initeffects.cpp
@@ -452,7 +452,7 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, \
EffectsList *au effects = doc.elementsByTagName(QStringLiteral("effect"));
int i = effects.count();
if (i == 0) {
- qCDebug(KDENLIVE_LOG) << "+++++++++++++\nEffect broken: " << name << \
"\n+++++++++++";; + qCDebug(KDENLIVE_LOG) << "+++++++++++++\nEffect broken: " \
<< name << "\n+++++++++++"; return;
}
@@ -919,7 +919,7 @@ void initEffects::parseTransitionFile(EffectsList \
*transitionList, const QString effects = \
doc.elementsByTagName(QStringLiteral("transition")); int i = effects.count();
if (i == 0) {
- qCDebug(KDENLIVE_LOG) << "+++++++++++++Transition broken: " << name << \
"\n+++++++++++";; + qCDebug(KDENLIVE_LOG) << "+++++++++++++Transition broken: \
" << name << "\n+++++++++++"; return;
}
diff --git a/src/effectstack/widgets/animationwidget.cpp \
b/src/effectstack/widgets/animationwidget.cpp index fe239dad0..4ce2e3f30 100644
--- a/src/effectstack/widgets/animationwidget.cpp
+++ b/src/effectstack/widgets/animationwidget.cpp
@@ -804,7 +804,7 @@ void AnimationWidget::buildRectWidget(const QString ¶mTag, \
const QDomElement
QAction *alignvcenter = new \
QAction(KoIconUtils::themedIcon(QStringLiteral("kdenlive-align-vert")), i18n("Center \
vertically"), this);
connect(alignvcenter, &QAction::triggered, this, &AnimationWidget::slotCenterV);
QAction *alignbottom = new \
QAction(KoIconUtils::themedIcon(QStringLiteral("kdenlive-align-bottom")), i18n("Align \
bottom"), this);
- connect(alignbottom, &QAction::triggered, this, \
&AnimationWidget::slotMoveBottom);; + connect(alignbottom, &QAction::triggered, \
this, &AnimationWidget::slotMoveBottom);
QHBoxLayout *alignLayout = new QHBoxLayout;
alignLayout->setSpacing(0);
diff --git a/src/library/librarywidget.h b/src/library/librarywidget.h
index b99de5248..0e25d0439 100644
--- a/src/library/librarywidget.h
+++ b/src/library/librarywidget.h
@@ -115,7 +115,7 @@ public:
QFont font = painter->font();
font.setBold(true);
painter->setFont(font);
- int decoWidth = 2 * textMargin + r1.height() * 1.8;;
+ int decoWidth = 2 * textMargin + r1.height() * 1.8;
r.setWidth(r1.height() * 1.8);
// Draw thumbnail
opt.icon.paint(painter, r);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2ca4c9253..f790683fb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1567,7 +1567,7 @@ void MainWindow::setupActions()
addAction(QStringLiteral("switch_all_track_lock"), i18n("Toggle All Track \
Lock"), pCore->projectManager(), SLOT(slotSwitchAllTrackLock()), QIcon(), Qt::CTRL + \
Qt::SHIFT + Qt::Key_L); addAction(QStringLiteral("switch_track_target"), \
i18n("Toggle Track Target"), pCore->projectManager(), SLOT(slotSwitchTrackTarget()), \
QIcon(), Qt::SHIFT + Qt::Key_T);
- QHash <QString, QAction *> actions;
+ QHash<QString, QAction *> actions;
actions.insert(QStringLiteral("locate"), locateClip);
actions.insert(QStringLiteral("reload"), reloadClip);
actions.insert(QStringLiteral("duplicate"), duplicateClip);
diff --git a/src/project/jobs/cutclipjob.cpp b/src/project/jobs/cutclipjob.cpp
index babba2386..66966b307 100644
--- a/src/project/jobs/cutclipjob.cpp
+++ b/src/project/jobs/cutclipjob.cpp
@@ -269,9 +269,9 @@ QList<ProjectClip *> CutClipJob::filterClips(const \
QList<ProjectClip *> &clips,
// static
-QHash <ProjectClip *, AbstractClipJob *> CutClipJob::prepareCutClipJob(double fps, \
double originalFps, ProjectClip *clip) +QHash<ProjectClip *, AbstractClipJob *> \
CutClipJob::prepareCutClipJob(double fps, double originalFps, ProjectClip *clip) {
- QHash <ProjectClip *, AbstractClipJob *> jobs;
+ QHash<ProjectClip *, AbstractClipJob *> jobs;
if (!clip) {
return jobs;
}
@@ -349,9 +349,9 @@ QHash <ProjectClip *, AbstractClipJob *> \
CutClipJob::prepareCutClipJob(double fp }
// static
-QHash <ProjectClip *, AbstractClipJob *> CutClipJob::prepareTranscodeJob(double fps, \
const QList<ProjectClip *> &clips, const QStringList ¶meters) +QHash<ProjectClip \
*, AbstractClipJob *> CutClipJob::prepareTranscodeJob(double fps, const \
QList<ProjectClip *> &clips, const QStringList ¶meters) {
- QHash <ProjectClip *, AbstractClipJob *> jobs;
+ QHash<ProjectClip *, AbstractClipJob *> jobs;
QString params = parameters.at(0);
QString desc;
if (parameters.count() > 1) {
@@ -428,12 +428,12 @@ QHash <ProjectClip *, AbstractClipJob *> \
CutClipJob::prepareTranscodeJob(double }
// static
-QHash <ProjectClip *, AbstractClipJob *> CutClipJob::prepareAnalyseJob(double fps, \
const QList<ProjectClip *> &clips, const QStringList ¶meters) +QHash<ProjectClip \
*, AbstractClipJob *> CutClipJob::prepareAnalyseJob(double fps, const \
QList<ProjectClip *> &clips, const QStringList ¶meters) {
// Might be useful some day
Q_UNUSED(parameters);
- QHash <ProjectClip *, AbstractClipJob *> jobs;
+ QHash<ProjectClip *, AbstractClipJob *> jobs;
foreach (ProjectClip *clip, clips) {
QString source = clip->url().toLocalFile();
QStringList jobParams;
diff --git a/src/project/jobs/cutclipjob.h b/src/project/jobs/cutclipjob.h
index 2505790a7..4ea3ea997 100644
--- a/src/project/jobs/cutclipjob.h
+++ b/src/project/jobs/cutclipjob.h
@@ -48,9 +48,9 @@ public:
stringMap cancelProperties() Q_DECL_OVERRIDE;
const QString statusMessage() Q_DECL_OVERRIDE;
bool isExclusive() Q_DECL_OVERRIDE;
- static QHash <ProjectClip *, AbstractClipJob *> prepareTranscodeJob(double fps, \
const QList<ProjectClip *> &ids, const QStringList ¶meters);
- static QHash <ProjectClip *, AbstractClipJob *> prepareCutClipJob(double fps, \
double originalFps, ProjectClip *clip);
- static QHash <ProjectClip *, AbstractClipJob *> prepareAnalyseJob(double fps, \
const QList<ProjectClip *> &clips, const QStringList ¶meters); + static \
QHash<ProjectClip *, AbstractClipJob *> prepareTranscodeJob(double fps, const \
QList<ProjectClip *> &ids, const QStringList ¶meters); + static \
QHash<ProjectClip *, AbstractClipJob *> prepareCutClipJob(double fps, double \
originalFps, ProjectClip *clip); + static QHash<ProjectClip *, AbstractClipJob *> \
prepareAnalyseJob(double fps, const QList<ProjectClip *> &clips, const QStringList \
¶meters);
static QList<ProjectClip *> filterClips(const QList<ProjectClip *> &clips, const \
QStringList ¶ms);
private:
diff --git a/src/project/jobs/filterjob.cpp b/src/project/jobs/filterjob.cpp
index bb4d424ad..e53d41502 100644
--- a/src/project/jobs/filterjob.cpp
+++ b/src/project/jobs/filterjob.cpp
@@ -57,9 +57,9 @@ QList<ProjectClip *> FilterJob::filterClips(const QList<ProjectClip \
*> &clips, c return result;
}
-QHash <ProjectClip *, AbstractClipJob *> FilterJob::prepareJob(const \
QList<ProjectClip *> &clips, const QStringList ¶meters) +QHash<ProjectClip *, \
AbstractClipJob *> FilterJob::prepareJob(const QList<ProjectClip *> &clips, const \
QStringList ¶meters) {
- QHash <ProjectClip *, AbstractClipJob *> jobs;
+ QHash<ProjectClip *, AbstractClipJob *> jobs;
QStringList sources;
sources.reserve(clips.count());
for (int i = 0; i < clips.count(); i++) {
diff --git a/src/project/jobs/filterjob.h b/src/project/jobs/filterjob.h
index b83757cb2..958bfe1d9 100644
--- a/src/project/jobs/filterjob.h
+++ b/src/project/jobs/filterjob.h
@@ -33,7 +33,7 @@ class FilterJob
public:
static QList<ProjectClip *> filterClips(const QList<ProjectClip *> &clips, const \
QStringList ¶ms);
- static QHash <ProjectClip *, AbstractClipJob *> prepareJob(const \
QList<ProjectClip *> &clips, const QStringList ¶meters); + static \
QHash<ProjectClip *, AbstractClipJob *> prepareJob(const QList<ProjectClip *> &clips, \
const QStringList ¶meters); };
#endif
diff --git a/src/project/jobs/jobmanager.cpp b/src/project/jobs/jobmanager.cpp
index db8522e5c..b7fffa5cf 100644
--- a/src/project/jobs/jobmanager.cpp
+++ b/src/project/jobs/jobmanager.cpp
@@ -260,7 +260,7 @@ void JobManager::prepareJobs(const QList<ProjectClip *> &clips, \
double fps, Abst
m_bin->doDisplayMessage(i18n("No valid clip to process"), \
KMessageWidget::Information); return;
}
- QHash <ProjectClip *, AbstractClipJob *> jobs;
+ QHash<ProjectClip *, AbstractClipJob *> jobs;
if (jobType == AbstractClipJob::TRANSCODEJOB) {
jobs = CutClipJob::prepareTranscodeJob(fps, matching, params);
} else if (jobType == AbstractClipJob::CUTJOB) {
diff --git a/src/project/jobs/proxyclipjob.cpp b/src/project/jobs/proxyclipjob.cpp
index 9c161ea24..23c5cf4b2 100644
--- a/src/project/jobs/proxyclipjob.cpp
+++ b/src/project/jobs/proxyclipjob.cpp
@@ -302,9 +302,9 @@ QList<ProjectClip *> ProxyJob::filterClips(const \
QList<ProjectClip *> &clips) }
// static
-QHash <ProjectClip *, AbstractClipJob *> ProxyJob::prepareJob(Bin *bin, const \
QList<ProjectClip *> &clips) +QHash<ProjectClip *, AbstractClipJob *> \
ProxyJob::prepareJob(Bin *bin, const QList<ProjectClip *> &clips) {
- QHash <ProjectClip *, AbstractClipJob *> jobs;
+ QHash<ProjectClip *, AbstractClipJob *> jobs;
QSize renderSize = bin->getRenderSize();
QString params = \
bin->getDocumentProperty(QStringLiteral("proxyparams")).simplified(); for (int i = \
0; i < clips.count(); i++) {
diff --git a/src/project/jobs/proxyclipjob.h b/src/project/jobs/proxyclipjob.h
index ae916e5f1..590ee0fa0 100644
--- a/src/project/jobs/proxyclipjob.h
+++ b/src/project/jobs/proxyclipjob.h
@@ -40,7 +40,7 @@ public:
const QString statusMessage() Q_DECL_OVERRIDE;
void processLogInfo() Q_DECL_OVERRIDE;
static QList<ProjectClip *> filterClips(const QList<ProjectClip *> &clips);
- static QHash <ProjectClip *, AbstractClipJob *> prepareJob(Bin *bin, const \
QList<ProjectClip *> &clips); + static QHash<ProjectClip *, AbstractClipJob *> \
prepareJob(Bin *bin, const QList<ProjectClip *> &clips);
private:
QString m_dest;
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 972a3bd85..aa0fb42cc 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1590,7 +1590,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox \
*devicelist, bool force) Mlt::Consumer bm(profile, "decklink");
int found_devices = 0;
if (bm.is_valid()) {
- bm.set("list_devices", 1);;
+ bm.set("list_devices", 1);
found_devices = bm.get_int("devices");
} else {
KdenliveSettings::setDecklink_device_found(false);
diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp
index 9170e8e70..4263de1c6 100644
--- a/src/scopes/abstractscopewidget.cpp
+++ b/src/scopes/abstractscopewidget.cpp
@@ -493,7 +493,7 @@ void AbstractScopeWidget::slotBackgroundRenderingFinished(uint \
mseconds, uint ol
qCDebug(KDENLIVE_LOG) << "Trying to start a new background thread for " << \
m_widgetName
<< ". New frames/updates: " << m_newBackgroundFrames \
<< '/' << m_newBackgroundUpdates; #endif
- prodBackgroundThread();;
+ prodBackgroundThread();
}
}
diff --git a/src/scopes/colorscopes/colorplaneexport.cpp \
b/src/scopes/colorscopes/colorplaneexport.cpp index add3383e8..5c63a9384 100644
--- a/src/scopes/colorscopes/colorplaneexport.cpp
+++ b/src/scopes/colorscopes/colorplaneexport.cpp
@@ -97,7 +97,7 @@ void ColorPlaneExport::slotUpdateDisplays()
switch (cbColorspace->itemData(cbColorspace->currentIndex()).toInt()) {
case CPE_RGB_CURVE:
- lblScaleNr->setText(QChar(0xb1) + QString::number(sliderScaling->value(), \
'f', 2));; + lblScaleNr->setText(QChar(0xb1) + \
QString::number(sliderScaling->value(), 'f', 2)); break;
case CPE_HSV_HUESHIFT:
lblScaleNr->setText(QString::number(sliderScaling->value()));
diff --git a/src/scopes/colorscopes/vectorscope.cpp \
b/src/scopes/colorscopes/vectorscope.cpp index 01fa1f701..7e8c76ce0 100644
--- a/src/scopes/colorscopes/vectorscope.cpp
+++ b/src/scopes/colorscopes/vectorscope.cpp
@@ -70,7 +70,7 @@ Vectorscope::Vectorscope(QWidget *parent) :
///// Build context menu /////
- m_menu->addSeparator()->setText(i18n("Tools"));;
+ m_menu->addSeparator()->setText(i18n("Tools"));
m_aExportBackground = new QAction(i18n("Export background"), this);
m_menu->addAction(m_aExportBackground);
diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp
index 736facada..0ba415e4e 100644
--- a/src/stopmotion/stopmotion.cpp
+++ b/src/stopmotion/stopmotion.cpp
@@ -754,7 +754,7 @@ void StopmotionWidget::slotShowSelectedFrame()
{
QListWidgetItem *item = frame_list->currentItem();
if (item) {
- //int ix = item->data(Qt::UserRole).toInt();;
+ //int ix = item->data(Qt::UserRole).toInt();
slotShowFrame(item->toolTip());
}
}
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 4499eca17..2aa38709c 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -8524,7 +8524,7 @@ void CustomTrackView::exportTimelineSelection(QString path)
} else if (item->type() == TransitionWidget) {
Transition *tr = static_cast<Transition *>(item);
int a_track = qBound(0, tr->transitionEndTrack() - firstTrack, lastTrack \
- firstTrack + 1);
- int b_track = qBound(0, tr->track() - firstTrack, lastTrack - firstTrack \
+ 1);; + int b_track = qBound(0, tr->track() - firstTrack, lastTrack - \
firstTrack + 1); m_timeline->transitionHandler->duplicateTransitionOnPlaylist(tr->startPos().frames(m_document->fps()) \
- startOffest, tr->endPos().frames(m_document->fps()) - startOffest, \
tr->transitionTag(), tr->toXML(), a_track, b_track, field); }
}
diff --git a/src/timeline/managers/previewmanager.cpp \
b/src/timeline/managers/previewmanager.cpp index b84c8397f..094c07e7f 100644
--- a/src/timeline/managers/previewmanager.cpp
+++ b/src/timeline/managers/previewmanager.cpp
@@ -130,6 +130,7 @@ void PreviewManager::loadChunks(const QStringList &previewChunks, \
QStringList di }
if (!dirtyChunks.isEmpty()) {
QList<int> list;
+ list.reserve(dirtyChunks.count());
foreach (const QString &i, dirtyChunks) {
list << i.toInt();
}
diff --git a/src/titler/titledocument.cpp b/src/titler/titledocument.cpp
index b38f21ede..8eea4b691 100644
--- a/src/titler/titledocument.cpp
+++ b/src/titler/titledocument.cpp
@@ -656,7 +656,7 @@ QColor TitleDocument::stringToColor(const QString &s)
if (l.size() < 4) {
return QColor();
}
- return QColor(l.at(0).toInt(), l.at(1).toInt(), l.at(2).toInt(), \
l.at(3).toInt());; + return QColor(l.at(0).toInt(), l.at(1).toInt(), \
l.at(2).toInt(), l.at(3).toInt()); }
QTransform TitleDocument::stringToTransform(const QString &s)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic