[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 6:47:34
Message-ID: E1cFExy-0006u3-Do () code ! kde ! org
[Download RAW message or body]
Git commit 5f7ac07e0b11cb73354c4897176da162c290dfee by Montel Laurent.
Committed on 09/12/2016 at 06:47.
Pushed by mlaurent into branch 'master'.
Coding style
M +27 -27 src/bin/bin.cpp
M +2 -2 src/bin/bin.h
M +11 -11 src/bin/projectclip.cpp
M +3 -3 src/bin/projectclip.h
M +2 -2 src/bin/projectfolder.cpp
M +1 -1 src/bin/projectfolder.h
M +1 -1 src/capture/mltdevicecapture.cpp
M +1 -1 src/definitions.h
M +1 -1 src/dialogs/clipcreationdialog.cpp
M +2 -2 src/dialogs/profilesdialog.cpp
M +1 -1 src/dialogs/profilesdialog.h
M +2 -2 src/dialogs/renderwidget.cpp
M +2 -2 src/doc/documentchecker.cpp
M +1 -1 src/doc/documentchecker.h
M +6 -6 src/doc/documentvalidator.cpp
M +1 -1 src/doc/documentvalidator.h
M +4 -4 src/doc/kdenlivedoc.cpp
M +1 -1 src/doc/kdenlivedoc.h
M +2 -2 src/dvdwizard/dvdwizard.cpp
M +1 -1 src/dvdwizard/dvdwizard.h
M +1 -1 src/dvdwizard/dvdwizardchapters.cpp
M +2 -2 src/dvdwizard/dvdwizardmenu.cpp
M +1 -1 src/dvdwizard/dvdwizardmenu.h
M +1 -1 src/dvdwizard/dvdwizardvob.h
M +2 -2 src/effectslist/effectslistview.cpp
M +2 -2 src/effectslist/effectslistwidget.cpp
M +1 -1 src/effectslist/effectslistwidget.h
M +2 -2 src/effectstack/collapsibleeffect.h
M +2 -2 src/effectstack/collapsiblegroup.cpp
M +2 -2 src/effectstack/collapsiblegroup.h
M +2 -2 src/effectstack/effectstackview2.cpp
M +1 -1 src/effectstack/effectstackview2.h
M +1 -1 src/effectstack/graphicsscenerectmove.cpp
M +2 -2 src/effectstack/keyframeedit.cpp
M +1 -1 src/effectstack/keyframeedit.h
M +2 -2 src/effectstack/keyframehelper.h
M +2 -2 src/effectstack/widgets/animationwidget.cpp
M +2 -2 src/effectstack/widgets/animationwidget.h
M +1 -1 src/effectstack/widgets/bezier/cubicbezierspline.cpp
M +2 -2 src/effectstack/widgets/bezier/cubicbezierspline.h
M +1 -1 src/effectstack/widgets/geometrywidget.h
M +1 -1 src/effectstack/widgets/keyframeimport.cpp
M +1 -1 src/effectstack/widgets/keyframeimport.h
M +2 -2 src/effectstack/widgets/lumaliftgain.cpp
M +3 -3 src/hidetitlebars.cpp
M +6 -6 src/library/librarywidget.cpp
M +1 -1 src/library/librarywidget.h
M +25 -25 src/mainwindow.cpp
M +5 -5 src/mainwindow.h
M +5 -5 src/mltcontroller/bincontroller.cpp
M +3 -3 src/mltcontroller/bincontroller.h
M +6 -6 src/mltcontroller/clipcontroller.cpp
M +3 -3 src/mltcontroller/clipcontroller.h
M +7 -7 src/mltcontroller/clippropertiescontroller.cpp
M +1 -1 src/mltcontroller/effectscontroller.cpp
M +1 -1 src/mltcontroller/effectscontroller.h
M +3 -3 src/mltcontroller/producerqueue.cpp
M +1 -1 src/mltcontroller/producerqueue.h
M +6 -6 src/monitor/monitor.cpp
M +2 -2 src/monitor/monitor.h
M +1 -1 src/monitor/monitormanager.h
M +2 -2 src/monitor/recmanager.cpp
M +1 -1 src/monitor/recmanager.h
M +2 -2 src/monitor/smallruler.h
M +3 -3 src/onmonitoritems/onmonitorcornersitem.cpp
M +1 -1 src/onmonitoritems/onmonitorcornersitem.h
M +1 -1 src/onmonitoritems/onmonitorpathitem.cpp
M +2 -2 src/onmonitoritems/onmonitorpathitem.h
M +1 -1 src/onmonitoritems/rotoscoping/bpointitem.cpp
M +18 -18 src/onmonitoritems/rotoscoping/rotowidget.cpp
M +1 -1 src/onmonitoritems/rotoscoping/rotowidget.h
M +4 -4 src/onmonitoritems/rotoscoping/splineitem.cpp
M +3 -3 src/onmonitoritems/rotoscoping/splineitem.h
M +3 -3 src/project/clipmanager.cpp
M +4 -4 src/project/clipmanager.h
M +1 -1 src/project/dialogs/archivewidget.cpp
M +3 -3 src/project/dialogs/archivewidget.h
M +9 -9 src/project/dialogs/profilewidget.cpp
M +10 -10 src/project/dialogs/profilewidget.h
M +2 -2 src/project/dialogs/projectsettings.cpp
M +1 -1 src/project/dialogs/temporarydata.cpp
M +2 -2 src/project/dialogs/temporarydata.h
M +4 -4 src/project/jobs/cutclipjob.cpp
M +2 -2 src/project/jobs/cutclipjob.h
M +3 -3 src/project/jobs/filterjob.cpp
M +2 -2 src/project/jobs/filterjob.h
M +4 -4 src/project/jobs/jobmanager.cpp
M +3 -3 src/project/jobs/jobmanager.h
M +3 -3 src/project/jobs/proxyclipjob.cpp
M +2 -2 src/project/jobs/proxyclipjob.h
M +1 -1 src/project/projectcommands.cpp
M +3 -3 src/project/projectcommands.h
M +2 -2 src/project/projectmanager.cpp
M +1 -1 src/project/transitionsettings.h
M +1 -1 src/qt-oauth-lib/oauth2.cpp
M +4 -4 src/renderer.cpp
M +2 -2 src/renderer.h
M +1 -1 src/statusbarmessagelabel.cpp
M +1 -1 src/stopmotion/stopmotion.cpp
M +2 -2 src/timeline/abstractclipitem.cpp
M +8 -8 src/timeline/abstractgroupitem.cpp
M +1 -1 src/timeline/abstractgroupitem.h
M +8 -8 src/timeline/clipitem.cpp
M +3 -3 src/timeline/clipitem.h
M +1 -1 src/timeline/customtrackscene.cpp
M +2 -2 src/timeline/customtrackscene.h
M +85 -85 src/timeline/customtrackview.cpp
M +11 -11 src/timeline/customtrackview.h
M +6 -6 src/timeline/effectmanager.cpp
M +1 -1 src/timeline/headertrack.cpp
M +1 -1 src/timeline/headertrack.h
M +4 -4 src/timeline/keyframeview.cpp
M +2 -2 src/timeline/keyframeview.h
M +8 -8 src/timeline/managers/movemanager.cpp
M +5 -5 src/timeline/managers/resizemanager.cpp
M +1 -1 src/timeline/managers/resizemanager.h
M +1 -1 src/timeline/spacerdialog.h
M +4 -4 src/timeline/timeline.cpp
M +5 -5 src/timeline/timeline.h
M +7 -7 src/timeline/timelinecommands.cpp
M +16 -16 src/timeline/timelinecommands.h
M +6 -6 src/timeline/track.cpp
M +3 -3 src/timeline/track.h
M +2 -2 src/timeline/tracksconfigdialog.cpp
M +1 -1 src/timeline/tracksconfigdialog.h
M +1 -1 src/timeline/transition.h
M +1 -1 src/timeline/transitionhandler.cpp
M +1 -1 src/timeline/transitionhandler.h
M +2 -2 src/titler/gradientwidget.cpp
M +1 -1 src/titler/gradientwidget.h
M +3 -3 src/titler/titlewidget.cpp
M +7 -7 src/utils/archiveorg.cpp
M +6 -6 src/utils/freesound.cpp
https://commits.kde.org/kdenlive/5f7ac07e0b11cb73354c4897176da162c290dfee
diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
index 245ea6af8..f1c8021bc 100644
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@ -814,7 +814,7 @@ void Bin::slotDeleteClip()
ProjectSubClip *sub;
QPoint zone;
// check folders, remove child folders if there is any
- QList <ProjectFolder *> topFolders;
+ QList<ProjectFolder *> topFolders;
foreach (const QModelIndex &ix, indexes) {
if (!ix.isValid() || ix.column() != 0) {
continue;
@@ -851,7 +851,7 @@ void Bin::slotDeleteClip()
if (isChild) {
continue;
}
- QList <ProjectFolder *> childFolders;
+ QList<ProjectFolder *> childFolders;
// parse all folders to check for children
foreach (ProjectFolder *f, topFolders) {
if (current->folder(f->clipId())) {
@@ -870,7 +870,7 @@ void Bin::slotDeleteClip()
foldersIds << f->clipId();
}
- QList <ProjectFolder *> topClips;
+ QList<ProjectFolder *> topClips;
// Check if clips are in already selected folders
foreach (const QModelIndex &ix, indexes) {
if (!ix.isValid() || ix.column() != 0) {
@@ -1487,11 +1487,11 @@ void Bin::autoSelect()
}*/
}
-QList <ProjectClip *> Bin::selectedClips()
+QList<ProjectClip *> Bin::selectedClips()
{
//TODO: handle clips inside folders
QModelIndexList indexes = m_proxyModel->selectionModel()->selectedIndexes();
- QList <ProjectClip *> list;
+ QList<ProjectClip *> list;
foreach (const QModelIndex &ix, indexes) {
if (!ix.isValid() || ix.column() != 0) {
continue;
@@ -1967,14 +1967,14 @@ void Bin::slotProducerReady(const requestClipInfo &info, \
ClipController *control
int width = \
clip->getProducerIntProperty(QStringLiteral("meta.media.width")); if \
(m_doc->autoGenerateProxy(width)) { // Start proxy
- m_doc->slotProxyCurrentItem(true, QList <ProjectClip *>() << \
clip); + m_doc->slotProxyCurrentItem(true, QList<ProjectClip \
*>() << clip); }
} else if (t == Playlist) {
// always proxy playlists
- m_doc->slotProxyCurrentItem(true, QList <ProjectClip *>() << \
clip); + m_doc->slotProxyCurrentItem(true, QList<ProjectClip *>() \
<< clip);
} else if (t == Image && \
m_doc->autoGenerateImageProxy(clip->getProducerIntProperty(QStringLiteral("meta.media.width")))) \
{ // Start proxy
- m_doc->slotProxyCurrentItem(true, QList <ProjectClip *>() << \
clip); + m_doc->slotProxyCurrentItem(true, QList<ProjectClip *>() \
<< clip); }
}
} else {
@@ -2203,10 +2203,10 @@ void Bin::slotUpdateJobStatus(const QString &id, int jobType, \
int status, const }
}
-void Bin::doDisplayMessage(const QString &text, KMessageWidget::MessageType type, \
const QList <QAction *> &actions) +void Bin::doDisplayMessage(const QString &text, \
KMessageWidget::MessageType type, const QList<QAction *> &actions) {
// Remove axisting actions if any
- QList <QAction *> acts = m_infoMessage->actions();
+ QList<QAction *> acts = m_infoMessage->actions();
while (!acts.isEmpty()) {
QAction *a = acts.takeFirst();
m_infoMessage->removeAction(a);
@@ -2312,7 +2312,7 @@ void Bin::slotStartCutJob(const QString &id)
void Bin::startJob(const QString &id, AbstractClipJob::JOBTYPE type)
{
- QList <ProjectClip *> clips;
+ QList<ProjectClip *> clips;
ProjectClip *clip = getBinClip(id);
if (clip && !hasPendingJob(id, type)) {
// Launch job
@@ -2846,7 +2846,7 @@ void Bin::startClipJob(const QStringList ¶ms)
return;
}
AbstractClipJob::JOBTYPE jobType = (AbstractClipJob::JOBTYPE) \
data.takeFirst().toInt();
- QList <ProjectClip *>clips = selectedClips();
+ QList<ProjectClip *>clips = selectedClips();
m_jobManager->prepareJobs(clips, m_doc->fps(), jobType, data);
}
@@ -2893,7 +2893,7 @@ void Bin::slotAddClipCut(const QString &id, int in, int out)
m_doc->commandStack()->push(command);
}
-void Bin::loadSubClips(const QString &id, const QMap <QString, QString> &data)
+void Bin::loadSubClips(const QString &id, const QMap<QString, QString> &data)
{
ProjectClip *clip = getBinClip(id);
if (!clip) {
@@ -3128,7 +3128,7 @@ void Bin::slotGotFilterJobResults(const QString &id, int \
startPos, int track, co int cutPos = 0;
QUndoCommand *command = new QUndoCommand();
command->setText(i18n("Add Markers"));
- QList <CommentedTime> markersList;
+ QList<CommentedTime> markersList;
int index = 1;
bool simpleList = false;
double sourceFps = clip->getOriginalFps();
@@ -3168,7 +3168,7 @@ void Bin::slotGotFilterJobResults(const QString &id, int \
startPos, int track, co }
}
-void Bin::slotAddClipMarker(const QString &id, const QList <CommentedTime> \
&newMarkers, QUndoCommand *groupCommand) +void Bin::slotAddClipMarker(const QString \
&id, const QList<CommentedTime> &newMarkers, QUndoCommand *groupCommand) {
ProjectClip *clip = getBinClip(id);
if (!clip) {
@@ -3227,7 +3227,7 @@ void Bin::slotLoadClipMarkers(const QString &id)
QUndoCommand *command = new QUndoCommand();
command->setText(QStringLiteral("Load markers"));
QString markerText;
- QList <CommentedTime> markersList;
+ QList<CommentedTime> markersList;
foreach (const QString &line, lines) {
markerText.clear();
values = line.split('\t', QString::SkipEmptyParts);
@@ -3277,7 +3277,7 @@ void Bin::slotSaveClipMarkers(const QString &id)
if (!clip) {
return;
}
- QList < CommentedTime > markers = clip->commentedSnapMarkers();
+ QList< CommentedTime > markers = clip->commentedSnapMarkers();
if (!markers.isEmpty()) {
// Set up categories
KComboBox *cbox = new KComboBox;
@@ -3344,7 +3344,7 @@ void Bin::deleteClipMarker(const QString &comment, const \
QString &id, const GenT command->setText(i18n("Delete marker"));
CommentedTime marker(position, comment);
marker.setMarkerType(-1);
- QList <CommentedTime> markers;
+ QList<CommentedTime> markers;
markers << marker;
clip->addClipMarker(markers, command);
if (command->childCount() > 0) {
@@ -3609,14 +3609,14 @@ void Bin::slotRenameFolder()
void Bin::refreshProxySettings()
{
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
QUndoCommand *masterCommand = new QUndoCommand();
masterCommand->setText(m_doc->useProxy() ? i18n("Enable proxies") : \
i18n("Disable proxies")); if (!m_doc->useProxy()) {
// Disable all proxies
m_doc->slotProxyCurrentItem(false, clipList, false, masterCommand);
} else {
- QList <ProjectClip *> toProxy;
+ QList<ProjectClip *> toProxy;
foreach (ProjectClip *clp, clipList) {
ClipType t = clp->clipType();
if (t == Playlist) {
@@ -3648,7 +3648,7 @@ void Bin::refreshProxySettings()
QStringList Bin::getProxyHashList()
{
QStringList list;
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
foreach (ProjectClip *clp, clipList) {
if (clp->clipType() == AV || clp->clipType() == Video || clp->clipType() == \
Playlist) { list << clp->hash();
@@ -3682,7 +3682,7 @@ void Bin::reloadAllProducers()
if (m_rootFolder == Q_NULLPTR || m_rootFolder->isEmpty() || !isEnabled()) {
return;
}
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
emit openClip(Q_NULLPTR);
foreach (ProjectClip *clip, clipList) {
QDomDocument doc;
@@ -3706,7 +3706,7 @@ void Bin::slotMessageActionTriggered()
void Bin::resetUsageCount()
{
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
foreach (ProjectClip *clip, clipList) {
clip->setRefCount(0);
}
@@ -3714,7 +3714,7 @@ void Bin::resetUsageCount()
void Bin::cleanup()
{
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
QStringList ids;
QStringList subIds;
foreach (ProjectClip *clip, clipList) {
@@ -3730,7 +3730,7 @@ void Bin::cleanup()
void Bin::getBinStats(uint *used, uint *unused, qint64 *usedSize, qint64 \
*unusedSize) {
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
foreach (ProjectClip *clip, clipList) {
if (clip->refCount() == 0) {
*unused += 1;
@@ -3775,8 +3775,8 @@ bool Bin::addClip(QDomElement elem, const QString &clipId)
void Bin::rebuildProxies()
{
- QList <ProjectClip *> clipList = m_rootFolder->childClips();
- QList <ProjectClip *> toProxy;
+ QList<ProjectClip *> clipList = m_rootFolder->childClips();
+ QList<ProjectClip *> toProxy;
foreach (ProjectClip *clp, clipList) {
if (clp->hasProxy()) {
toProxy << clp;
diff --git a/src/bin/bin.h b/src/bin/bin.h
index 853612c3f..b0d1fa095 100644
--- a/src/bin/bin.h
+++ b/src/bin/bin.h
@@ -394,7 +394,7 @@ public:
ProjectClip *getBinClip(const QString &id);
/** @brief Returns a list of selected clips */
- QList <ProjectClip *> selectedClips();
+ QList<ProjectClip *> selectedClips();
/** @brief Start a job of selected type for a clip */
void startJob(const QString &id, AbstractClipJob::JOBTYPE type);
@@ -646,7 +646,7 @@ public slots:
void abortAudioThumbs();
/** @brief Abort all ongoing operations to prepare close. */
void abortOperations();
- void doDisplayMessage(const QString &text, KMessageWidget::MessageType type, \
const QList<QAction *> &actions = QList <QAction *>()); + void \
doDisplayMessage(const QString &text, KMessageWidget::MessageType type, const \
QList<QAction *> &actions = QList<QAction *>()); /** @brief Reset all clip usage to \
0 */ void resetUsageCount();
/** @brief Select a clip in the Bin from its id. */
diff --git a/src/bin/projectclip.cpp b/src/bin/projectclip.cpp
index 2ef554e2a..5dbd07026 100644
--- a/src/bin/projectclip.cpp
+++ b/src/bin/projectclip.cpp
@@ -145,12 +145,12 @@ void ProjectClip::updateAudioThumbnail(const QVariantList \
&audioLevels) emit gotAudioData();
}
-QList < CommentedTime > ProjectClip::commentedSnapMarkers() const
+QList< CommentedTime > ProjectClip::commentedSnapMarkers() const
{
if (m_controller) {
return m_controller->commentedSnapMarkers();
}
- return QList < CommentedTime > ();
+ return QList< CommentedTime > ();
}
QStringList ProjectClip::markersText(GenTime in, GenTime out) const
@@ -785,12 +785,12 @@ bool ProjectClip::rename(const QString &name, int column)
return edited;
}
-void ProjectClip::addClipMarker(QList <CommentedTime> newMarkers, QUndoCommand \
*groupCommand) +void ProjectClip::addClipMarker(QList<CommentedTime> newMarkers, \
QUndoCommand *groupCommand) {
if (!m_controller) {
return;
}
- QList <CommentedTime> oldMarkers;
+ QList<CommentedTime> oldMarkers;
for (int i = 0; i < newMarkers.count(); ++i) {
CommentedTime oldMarker = m_controller->markerAt(newMarkers.at(i).time());
if (oldMarker == CommentedTime()) {
@@ -804,11 +804,11 @@ void ProjectClip::addClipMarker(QList <CommentedTime> \
newMarkers, QUndoCommand *
bool ProjectClip::deleteClipMarkers(QUndoCommand *command)
{
- QList <CommentedTime> markers = commentedSnapMarkers();
+ QList<CommentedTime> markers = commentedSnapMarkers();
if (markers.isEmpty()) {
return false;
}
- QList <CommentedTime> newMarkers;
+ QList<CommentedTime> newMarkers;
for (int i = 0; i < markers.size(); ++i) {
CommentedTime marker = markers.at(i);
marker.setMarkerType(-1);
@@ -818,7 +818,7 @@ bool ProjectClip::deleteClipMarkers(QUndoCommand *command)
return true;
}
-void ProjectClip::addMarkers(QList <CommentedTime> &markers)
+void ProjectClip::addMarkers(QList<CommentedTime> &markers)
{
if (!m_controller) {
return;
@@ -1062,7 +1062,7 @@ void ProjectClip::slotCreateAudioThumbs()
bool jobFinished = false;
if (KdenliveSettings::ffmpegaudiothumbnails() && m_type != Playlist) {
QStringList args;
- QList <QTemporaryFile *> channelFiles;
+ QList<QTemporaryFile *> channelFiles;
for (int i = 0; i < channels; i++) {
QTemporaryFile *channelTmpfile = new QTemporaryFile;
if (!channelTmpfile->open()) {
@@ -1129,8 +1129,8 @@ void ProjectClip::slotCreateAudioThumbs()
if (!ffmpegError && audioThumbsProcess.exitStatus() != QProcess::CrashExit) \
{ int dataSize = 0;
- QList <const qint16 *> rawChannels;
- QList <QByteArray> sourceChannels;
+ QList<const qint16 *> rawChannels;
+ QList<QByteArray> sourceChannels;
QList<qint16> data2;
for (int i = 0; i < channelFiles.count(); i++) {
channelFiles[i]->open();
@@ -1154,7 +1154,7 @@ void ProjectClip::slotCreateAudioThumbs()
sourceChannels << res;
}
int progress = 0;
- QList <long> channelsData;
+ QList<long> channelsData;
double offset = (double) dataSize / (2.0 * lengthInFrames);
int intraOffset = 1;
if (offset > 1000) {
diff --git a/src/bin/projectclip.h b/src/bin/projectclip.h
index 5d0303f4c..de812704a 100644
--- a/src/bin/projectclip.h
+++ b/src/bin/projectclip.h
@@ -167,7 +167,7 @@ public:
QColor getProducerColorProperty(const QString &key) const;
double getDoubleProducerProperty(const QString &key) const;
- QList < CommentedTime > commentedSnapMarkers() const;
+ QList< CommentedTime > commentedSnapMarkers() const;
/** @brief Returns a list of all markers comments between in ant out frames. */
QStringList markersText(GenTime in, GenTime out) const;
@@ -188,9 +188,9 @@ public:
*/
const QString codec(bool audioCodec) const;
- void addClipMarker(QList <CommentedTime> newMarkers, QUndoCommand \
*groupCommand); + void addClipMarker(QList<CommentedTime> newMarkers, QUndoCommand \
*groupCommand); bool deleteClipMarkers(QUndoCommand *groupCommand);
- void addMarkers(QList <CommentedTime> &markers);
+ void addMarkers(QList<CommentedTime> &markers);
/** @brief Add an effect to bin clip. */
void addEffect(const ProfileInfo &pInfo, QDomElement &effect);
void updateEffect(const ProfileInfo &pInfo, QDomElement &effect, int ix, bool \
refreshStack);
diff --git a/src/bin/projectfolder.cpp b/src/bin/projectfolder.cpp
index a6ec9848e..d439165c3 100644
--- a/src/bin/projectfolder.cpp
+++ b/src/bin/projectfolder.cpp
@@ -69,9 +69,9 @@ ProjectClip *ProjectFolder::clip(const QString &id)
return Q_NULLPTR;
}
-QList <ProjectClip *> ProjectFolder::childClips()
+QList<ProjectClip *> ProjectFolder::childClips()
{
- QList <ProjectClip *> allChildren;
+ QList<ProjectClip *> allChildren;
for (int i = 0; i < count(); ++i) {
AbstractProjectItem *child = at(i);
if (child->itemType() == ClipItem) {
diff --git a/src/bin/projectfolder.h b/src/bin/projectfolder.h
index 212377eb2..6106c3891 100644
--- a/src/bin/projectfolder.h
+++ b/src/bin/projectfolder.h
@@ -82,7 +82,7 @@ public:
QString getToolTip() const Q_DECL_OVERRIDE;
bool rename(const QString &name, int column) Q_DECL_OVERRIDE;
/** @brief Returns a list of all children and sub-children clips. */
- QList <ProjectClip *> childClips();
+ QList<ProjectClip *> childClips();
private:
Bin *m_bin;
diff --git a/src/capture/mltdevicecapture.cpp b/src/capture/mltdevicecapture.cpp
index c496a4d86..1cf5a721e 100644
--- a/src/capture/mltdevicecapture.cpp
+++ b/src/capture/mltdevicecapture.cpp
@@ -153,7 +153,7 @@ void MltDeviceCapture::stop()
//if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
}
if (m_mltProducer) {
- QList <Mlt::Producer *> prods;
+ QList<Mlt::Producer *> prods;
Mlt::Service service(m_mltProducer->parent().get_service());
mlt_service_lock(service.get_service());
if (service.type() == tractor_type) {
diff --git a/src/definitions.h b/src/definitions.h
index 1687a0486..6b5578aa0 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -223,7 +223,7 @@ struct requestClipInfo {
};
typedef QMap<QString, QString> stringMap;
-typedef QMap <int, QMap <int, QByteArray> > audioByteArray;
+typedef QMap<int, QMap<int, QByteArray> > audioByteArray;
typedef QVector<qint16> audioShortVector;
class ItemInfo
diff --git a/src/dialogs/clipcreationdialog.cpp b/src/dialogs/clipcreationdialog.cpp
index 9ce9cc9cc..76e468efe 100644
--- a/src/dialogs/clipcreationdialog.cpp
+++ b/src/dialogs/clipcreationdialog.cpp
@@ -395,7 +395,7 @@ void ClipCreationDialog::createClipsCommand(KdenliveDoc *doc, \
const QList<QUrl> }*/
//TODO check folders
- /*QList < QList<QUrl> > foldersList;
+ /*QList< QList<QUrl> > foldersList;
QMimeDatabase db;
foreach(const QUrl & file, list) {
// Check there is no folder here
diff --git a/src/dialogs/profilesdialog.cpp b/src/dialogs/profilesdialog.cpp
index b3659a1ed..0f492e69e 100644
--- a/src/dialogs/profilesdialog.cpp
+++ b/src/dialogs/profilesdialog.cpp
@@ -472,12 +472,12 @@ QString ProfilesDialog::existingProfile(const MltVideoProfile \
&profile) }
// static
-QList <MltVideoProfile> ProfilesDialog::profilesList()
+QList<MltVideoProfile> ProfilesDialog::profilesList()
{
// Check if the profile has a matching entry in existing ones
QStringList profilesFilter;
profilesFilter << QStringLiteral("*");
- QList <MltVideoProfile> list;
+ QList<MltVideoProfile> list;
// Check the Mlt profiles
QDir mltDir(KdenliveSettings::mltpath());
QStringList profilesFiles = mltDir.entryList(profilesFilter, QDir::Files);
diff --git a/src/dialogs/profilesdialog.h b/src/dialogs/profilesdialog.h
index dc274deb1..fa13e3478 100644
--- a/src/dialogs/profilesdialog.h
+++ b/src/dialogs/profilesdialog.h
@@ -46,7 +46,7 @@ public:
/** @brief Check if a given profile has a profile file describing it */
static QString existingProfile(const MltVideoProfile &profile);
static bool existingProfileDescription(const QString &desc);
- static QList <MltVideoProfile> profilesList();
+ static QList<MltVideoProfile> profilesList();
/** @brief Check if a given profile matches passed properties:
* @param width The profile frame width
diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index 3f7ebbd47..f9bf1cac4 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -392,7 +392,7 @@ void RenderWidget::slotCheckEndGuidePosition()
}
}
-void RenderWidget::setGuides(const QMap <double, QString> &guidesData, double \
duration) +void RenderWidget::setGuides(const QMap<double, QString> &guidesData, \
double duration) {
m_view.guide_start->clear();
m_view.guide_end->clear();
@@ -938,7 +938,7 @@ void RenderWidget::focusFirstVisibleItem(const QString &profile)
{
QTreeWidgetItem *item = 0;
if (!profile.isEmpty()) {
- QList <QTreeWidgetItem *> items = m_view.formats->findItems(profile, \
Qt::MatchExactly | Qt::MatchRecursive); + QList<QTreeWidgetItem *> items = \
m_view.formats->findItems(profile, Qt::MatchExactly | Qt::MatchRecursive); if \
(!items.isEmpty()) { item = items.first();
}
diff --git a/src/doc/documentchecker.cpp b/src/doc/documentchecker.cpp
index 71d829893..99853d63b 100644
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@ -114,9 +114,9 @@ bool DocumentChecker::hasErrorInClips()
}
}
// List clips whose proxy is missing
- QList <QDomElement> missingProxies;
+ QList<QDomElement> missingProxies;
// List clips who have a working proxy but no source clip
- QList <QDomElement> missingSources;
+ QList<QDomElement> missingSources;
m_safeImages.clear();
m_safeFonts.clear();
m_missingFonts.clear();
diff --git a/src/doc/documentchecker.h b/src/doc/documentchecker.h
index 9fe5530b5..4eca07168 100644
--- a/src/doc/documentchecker.h
+++ b/src/doc/documentchecker.h
@@ -67,7 +67,7 @@ private:
void checkStatus();
QMap<QString, QString> m_missingTitleImages;
QMap<QString, QString> m_missingTitleFonts;
- QList <QDomElement> m_missingClips;
+ QList<QDomElement> m_missingClips;
QStringList m_missingFonts;
QStringList m_safeImages;
QStringList m_safeFonts;
diff --git a/src/doc/documentvalidator.cpp b/src/doc/documentvalidator.cpp
index 8ec2d06ad..e3c9d279b 100644
--- a/src/doc/documentvalidator.cpp
+++ b/src/doc/documentvalidator.cpp
@@ -1160,7 +1160,7 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) }
// Create easily searchable index of original producers
- QMap <QString, QDomElement> m_source_producers;
+ QMap<QString, QDomElement> m_source_producers;
for (int j = 0; j < kdenlive_producers.count(); j++) {
QDomElement prod = kdenlive_producers.at(j).toElement();
QString id = prod.attribute(QStringLiteral("id"));
@@ -1478,7 +1478,7 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) // convert old keyframe filters to animated
// these filters were "animated" by adding several instance of the filter, \
each one having a start and end tag.
// We convert by parsing the start and end tags vor values and adding all to \
the new animated parameter
- QMap <QString, QStringList> keyframeFilterToConvert;
+ QMap<QString, QStringList> keyframeFilterToConvert;
keyframeFilterToConvert.insert(QStringLiteral("volume"), QStringList() << \
QStringLiteral("gain") << QStringLiteral("end") << \
QStringLiteral("level"));
keyframeFilterToConvert.insert(QStringLiteral("brightness"), QStringList() \
<< QStringLiteral("start") << QStringLiteral("end") << QStringLiteral("level"));
@@ -1492,7 +1492,7 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion)
QString id = EffectsList::property(eff, \
QStringLiteral("kdenlive_id"));
if (keyframeFilterToConvert.contains(id) && !parsedIds.contains(id)) \
{ parsedIds << id;
- QMap <int, double> values;
+ QMap<int, double> values;
QStringList conversionParams = \
keyframeFilterToConvert.value(id);
int offset = eff.attribute(QStringLiteral("in")).toInt();
int out = eff.attribute(QStringLiteral("out")).toInt();
@@ -1595,7 +1595,7 @@ bool DocumentValidator::upgrade(double version, const double \
currentVersion) return true;
}
-void DocumentValidator::convertKeyframeEffect(const QDomElement &effect, const \
QStringList ¶ms, QMap <int, double> &values, int offset) +void \
DocumentValidator::convertKeyframeEffect(const QDomElement &effect, const QStringList \
¶ms, QMap<int, double> &values, int offset) {
QLocale locale;
int in = effect.attribute(QStringLiteral("in")).toInt() - offset;
@@ -1732,8 +1732,8 @@ bool DocumentValidator::isModified() const
void DocumentValidator::updateEffects()
{
// WARNING: order by findDirs will determine which js file to use (in case \
multiple scripts for the same filter exist)
- QMap <QString, QUrl> paths;
- QMap <QString, QScriptProgram> scripts;
+ QMap<QString, QUrl> paths;
+ QMap<QString, QScriptProgram> scripts;
QStringList directories = \
QStandardPaths::locateAll(QStandardPaths::DataLocation, "effects/update"); foreach \
(const QString &directoryName, directories) { QDir directory(directoryName);
diff --git a/src/doc/documentvalidator.h b/src/doc/documentvalidator.h
index d11979d26..383d268a2 100644
--- a/src/doc/documentvalidator.h
+++ b/src/doc/documentvalidator.h
@@ -61,7 +61,7 @@ private:
QString factorizeGeomValue(const QString &value, double factor);
/** @brief Kdenlive <= 0.9.10 saved title clip item position/opacity with locale \
which was wrong, fix. */ void fixTitleProducerLocale(QDomElement &producer);
- void convertKeyframeEffect(const QDomElement &effect, const QStringList ¶ms, \
QMap <int, double> &values, int offset); + void convertKeyframeEffect(const \
QDomElement &effect, const QStringList ¶ms, QMap<int, double> &values, int \
offset); };
#endif
diff --git a/src/doc/kdenlivedoc.cpp b/src/doc/kdenlivedoc.cpp
index d161a664f..c2c1f818b 100644
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@ -337,7 +337,7 @@ int KdenliveDoc::setSceneList()
QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks)
{
- QList <TrackInfo> tracks;
+ QList<TrackInfo> tracks;
// Tracks are added «backwards », so we need to reverse the track numbering
// mbt 331: http://www.kdenlive.org/mantis/view.php?id=331
// Better default names for tracks: Audio 1 etc. instead of blank numbers
@@ -368,7 +368,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, \
int audiotracks) return createEmptyDocument(tracks);
}
-QDomDocument KdenliveDoc::createEmptyDocument(const QList <TrackInfo> &tracks)
+QDomDocument KdenliveDoc::createEmptyDocument(const QList<TrackInfo> &tracks)
{
// Creating new document
QDomDocument doc;
@@ -763,7 +763,7 @@ void KdenliveDoc::setProjectFolder(const QUrl &url)
void KdenliveDoc::moveProjectData(const QString &/*src*/, const QString &dest)
{
// Move proxies
- QList <ClipController *> list = pCore->binController()->getControllerList();
+ QList<ClipController *> list = pCore->binController()->getControllerList();
QList<QUrl> cacheUrls;
for (int i = 0; i < list.count(); ++i) {
ClipController *clip = list.at(i);
@@ -1589,7 +1589,7 @@ void KdenliveDoc::switchProfile(MltVideoProfile profile, const \
QString &id, cons }
// Build actions for the info message (switch / cancel)
- QList <QAction *> list;
+ QList<QAction *> list;
QAction *ac = new \
QAction(KoIconUtils::themedIcon(QStringLiteral("dialog-ok")), i18n("Switch"), this); \
QVariantList params;
connect(ac, &QAction::triggered, this, &KdenliveDoc::slotSwitchProfile);
diff --git a/src/doc/kdenlivedoc.h b/src/doc/kdenlivedoc.h
index 513464ca3..ab75af043 100644
--- a/src/doc/kdenlivedoc.h
+++ b/src/doc/kdenlivedoc.h
@@ -186,7 +186,7 @@ private:
/** Timer used to reload clips when they have been externally modified */
QTimer m_modifiedTimer;
/** List of the clip IDs that need to be reloaded after being externally \
modified */
- QMap <QString, QTime> m_modifiedClips;
+ QMap<QString, QTime> m_modifiedClips;
int m_width;
int m_height;
Timecode m_timecode;
diff --git a/src/dvdwizard/dvdwizard.cpp b/src/dvdwizard/dvdwizard.cpp
index e19c9de22..35b6efea5 100644
--- a/src/dvdwizard/dvdwizard.cpp
+++ b/src/dvdwizard/dvdwizard.cpp
@@ -294,7 +294,7 @@ void DvdWizard::generateDvd()
void DvdWizard::processSpumux()
{
//qCDebug(KDENLIVE_LOG) << "/// STARTING SPUMUX";
- QMap <QString, QRect> buttons = m_pageMenu->buttonsInfo();
+ QMap<QString, QRect> buttons = m_pageMenu->buttonsInfo();
QStringList buttonsTarget;
// create xml spumux file
QListWidgetItem *spuitem = m_status.job_progress->item(2);
@@ -507,7 +507,7 @@ void DvdWizard::processSpumux()
processDvdauthor(menuMovieUrl, buttons, buttonsTarget);
}
-void DvdWizard::processDvdauthor(const QString &menuMovieUrl, const QMap <QString, \
QRect> &buttons, const QStringList &buttonsTarget) +void \
DvdWizard::processDvdauthor(const QString &menuMovieUrl, const QMap<QString, QRect> \
&buttons, const QStringList &buttonsTarget) {
// create dvdauthor xml
QListWidgetItem *authitem = m_status.job_progress->item(3);
diff --git a/src/dvdwizard/dvdwizard.h b/src/dvdwizard/dvdwizard.h
index 9d193270b..60742b86c 100644
--- a/src/dvdwizard/dvdwizard.h
+++ b/src/dvdwizard/dvdwizard.h
@@ -31,7 +31,7 @@
#include <QTemporaryFile>
-typedef QMap <QString, QRect> stringRectMap;
+typedef QMap<QString, QRect> stringRectMap;
class DvdWizard : public QWizard
{
diff --git a/src/dvdwizard/dvdwizardchapters.cpp \
b/src/dvdwizard/dvdwizardchapters.cpp index da1578ecd..1892d3a19 100644
--- a/src/dvdwizard/dvdwizardchapters.cpp
+++ b/src/dvdwizard/dvdwizardchapters.cpp
@@ -115,7 +115,7 @@ void DvdWizardChapters::slotAddChapter()
void DvdWizardChapters::updateMonitorMarkers()
{
QStringList chapters = \
m_view.vob_list->itemData(m_view.vob_list->currentIndex(), Qt::UserRole + \
1).toStringList();
- QList <CommentedTime> markers;
+ QList<CommentedTime> markers;
foreach (const QString &frame, chapters) {
markers << CommentedTime(GenTime(frame.toInt(), m_tc.fps()), QString());
}
diff --git a/src/dvdwizard/dvdwizardmenu.cpp b/src/dvdwizard/dvdwizardmenu.cpp
index 857304ce5..ed40084fd 100644
--- a/src/dvdwizard/dvdwizardmenu.cpp
+++ b/src/dvdwizard/dvdwizardmenu.cpp
@@ -752,9 +752,9 @@ int DvdWizardMenu::menuMovieLength() const
return m_movieLength;
}
-QMap <QString, QRect> DvdWizardMenu::buttonsInfo(bool letterbox)
+QMap<QString, QRect> DvdWizardMenu::buttonsInfo(bool letterbox)
{
- QMap <QString, QRect> info;
+ QMap<QString, QRect> info;
QList<QGraphicsItem *> list = m_scene->items();
double ratiox = (double) m_finalSize.width() / m_width;
double ratioy = 1;
diff --git a/src/dvdwizard/dvdwizardmenu.h b/src/dvdwizard/dvdwizardmenu.h
index 6e5d1c2ce..c9af16693 100644
--- a/src/dvdwizard/dvdwizardmenu.h
+++ b/src/dvdwizard/dvdwizardmenu.h
@@ -93,7 +93,7 @@ public:
void createBackgroundImage(const QString &img1, bool letterbox);
void createButtonImages(const QString &selected_image, const QString \
&highlighted_image, bool letterbox);
void setTargets(const QStringList &list, const QStringList &targetlist);
- QMap <QString, QRect> buttonsInfo(bool letterbox = false);
+ QMap<QString, QRect> buttonsInfo(bool letterbox = false);
bool loopMovie() const;
bool menuMovie() const;
QString menuMoviePath() const;
diff --git a/src/dvdwizard/dvdwizardvob.h b/src/dvdwizard/dvdwizardvob.h
index 554d03323..322cfb99a 100644
--- a/src/dvdwizard/dvdwizardvob.h
+++ b/src/dvdwizard/dvdwizardvob.h
@@ -132,7 +132,7 @@ private:
KMessageWidget *m_warnMessage;
int m_duration;
QProcess m_transcodeProcess;
- QList <TranscodeJobInfo> m_transcodeQueue;
+ QList<TranscodeJobInfo> m_transcodeQueue;
TranscodeJobInfo m_currentTranscoding;
void showProfileError();
void showError(const QString &error);
diff --git a/src/effectslist/effectslistview.cpp \
b/src/effectslist/effectslistview.cpp index b6126b286..0852c921b 100644
--- a/src/effectslist/effectslistview.cpp
+++ b/src/effectslist/effectslistview.cpp
@@ -280,7 +280,7 @@ void EffectsListView::filterList()
m_removeAction->setText(i18n("Remove from favorites"));
// Find favorites;
- QList <QTreeWidgetItem *> favorites;
+ QList<QTreeWidgetItem *> favorites;
for (int i = 0; i < m_effectsList->topLevelItemCount(); ++i) {
QTreeWidgetItem *folder = m_effectsList->topLevelItem(i);
for (int j = 0; j < folder->childCount(); ++j) {
@@ -306,7 +306,7 @@ void EffectsListView::filterList()
}
if (pos == EffectsList::EFFECT_GPU) {
// Find favorites;
- QList <QTreeWidgetItem *> favorites;
+ QList<QTreeWidgetItem *> favorites;
for (int i = 0; i < m_effectsList->topLevelItemCount(); ++i) {
QTreeWidgetItem *folder = m_effectsList->topLevelItem(i);
for (int j = 0; j < folder->childCount(); ++j) {
diff --git a/src/effectslist/effectslistwidget.cpp \
b/src/effectslist/effectslistwidget.cpp index e082918e3..6b910f053 100644
--- a/src/effectslist/effectslistwidget.cpp
+++ b/src/effectslist/effectslistwidget.cpp
@@ -80,7 +80,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, \
KActionCategory *effectActi QTreeWidgetItem *misc = Q_NULLPTR;
QTreeWidgetItem *audio = Q_NULLPTR;
QTreeWidgetItem *custom = Q_NULLPTR;
- QList <QTreeWidgetItem *> folders;
+ QList<QTreeWidgetItem *> folders;
if (!categoryFile.isEmpty()) {
QDomDocument doc;
@@ -501,7 +501,7 @@ void EffectsListWidget::resetRoot()
{
setRootIndex(indexFromItem(invisibleRootItem()));
}
-void EffectsListWidget::createTopLevelItems(const QList <QTreeWidgetItem *> &list, \
int effectType) +void EffectsListWidget::createTopLevelItems(const \
QList<QTreeWidgetItem *> &list, int effectType) {
// Favorites is a pseudo-folder used to store items, not visible to end user, so \
don't i18n its name
QTreeWidgetItem *misc = findFolder(QStringLiteral("TemporaryFolder"));
diff --git a/src/effectslist/effectslistwidget.h \
b/src/effectslist/effectslistwidget.h index 484a85278..384549e92 100644
--- a/src/effectslist/effectslistwidget.h
+++ b/src/effectslist/effectslistwidget.h
@@ -44,7 +44,7 @@ public:
void updatePalette();
void setRootOnCustomFolder();
void resetRoot();
- void createTopLevelItems(const QList <QTreeWidgetItem *> &list, int effectType);
+ void createTopLevelItems(const QList<QTreeWidgetItem *> &list, int effectType);
void resetFavorites();
protected:
diff --git a/src/effectstack/collapsibleeffect.h \
b/src/effectstack/collapsibleeffect.h index e80d7b9b8..02e0ec71c 100644
--- a/src/effectstack/collapsibleeffect.h
+++ b/src/effectstack/collapsibleeffect.h
@@ -113,11 +113,11 @@ private slots:
private:
ParameterContainer *m_paramWidget;
- QList <CollapsibleEffect *> m_subParamWidgets;
+ QList<CollapsibleEffect *> m_subParamWidgets;
QDomElement m_effect;
ItemInfo m_itemInfo;
QDomElement m_original_effect;
- QList <QDomElement> m_subEffects;
+ QList<QDomElement> m_subEffects;
QMenu *m_menu;
QPoint m_clickPoint;
EffectInfo m_info;
diff --git a/src/effectstack/collapsiblegroup.cpp \
b/src/effectstack/collapsiblegroup.cpp index a908b69f1..ca45265e2 100644
--- a/src/effectstack/collapsiblegroup.cpp
+++ b/src/effectstack/collapsiblegroup.cpp
@@ -56,7 +56,7 @@ CollapsibleGroup::CollapsibleGroup(int ix, bool firstGroup, bool \
lastGroup, cons AbstractCollapsibleWidget(parent)
{
m_info.groupIndex = ix;
- m_subWidgets = QList <CollapsibleEffect *> ();
+ m_subWidgets = QList<CollapsibleEffect *> ();
setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
frame->setObjectName(QStringLiteral("framegroup"));
decoframe->setObjectName(QStringLiteral("decoframegroup"));
@@ -409,7 +409,7 @@ void CollapsibleGroup::slotRenameGroup()
emit groupRenamed(this);
}
-QList <CollapsibleEffect *> CollapsibleGroup::effects()
+QList<CollapsibleEffect *> CollapsibleGroup::effects()
{
QMutexLocker lock(&m_mutex);
return m_subWidgets;
diff --git a/src/effectstack/collapsiblegroup.h b/src/effectstack/collapsiblegroup.h
index 1677a12f6..9f56b9a50 100644
--- a/src/effectstack/collapsiblegroup.h
+++ b/src/effectstack/collapsiblegroup.h
@@ -62,7 +62,7 @@ public:
void addGroupEffect(CollapsibleEffect *effect);
void removeGroup(int ix, QVBoxLayout *layout);
/** @brief Return all effects in group. */
- QList <CollapsibleEffect *> effects();
+ QList<CollapsibleEffect *> effects();
/** @brief Return the editable title widget. */
QWidget *title() const;
/** @brief Return the XML data describing all effects in group. */
@@ -85,7 +85,7 @@ private slots:
void slotRenameGroup();
private:
- QList <CollapsibleEffect *> m_subWidgets;
+ QList<CollapsibleEffect *> m_subWidgets;
QMenu *m_menu;
EffectInfo m_info;
MyEditableLabel *m_title;
diff --git a/src/effectstack/effectstackview2.cpp \
b/src/effectstack/effectstackview2.cpp index d0cf53bb9..3accbc0c3 100644
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -57,7 +57,7 @@ EffectStackView2::EffectStackView2(Monitor *projectMonitor, QWidget \
*parent) : m_transition(Q_NULLPTR)
{
m_effectMetaInfo.monitor = projectMonitor;
- m_effects = QList <CollapsibleEffect *>();
+ m_effects = QList<CollapsibleEffect *>();
setAcceptDrops(true);
setLayout(&m_layout);
@@ -1149,7 +1149,7 @@ void EffectStackView2::slotUnGroup(CollapsibleGroup *group)
void EffectStackView2::slotRenameGroup(CollapsibleGroup *group)
{
- QList <CollapsibleEffect *> effects = group->effects();
+ QList<CollapsibleEffect *> effects = group->effects();
for (int i = 0; i < effects.count(); ++i) {
QDomElement origin = effects.at(i)->effect();
QDomElement changed = origin.cloneNode().toElement();
diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h
index 9adc1027b..024dc0b28 100644
--- a/src/effectstack/effectstackview2.h
+++ b/src/effectstack/effectstackview2.h
@@ -130,7 +130,7 @@ private:
/** If in track mode: Info of the edited track to be able to access its \
duration. */ TrackInfo m_trackInfo;
- QList <CollapsibleEffect *> m_effects;
+ QList<CollapsibleEffect *> m_effects;
EffectsList m_currentEffectList;
QVBoxLayout m_layout;
diff --git a/src/effectstack/graphicsscenerectmove.cpp \
b/src/effectstack/graphicsscenerectmove.cpp index e92e84999..9239336ec 100644
--- a/src/effectstack/graphicsscenerectmove.cpp
+++ b/src/effectstack/graphicsscenerectmove.cpp
@@ -619,7 +619,7 @@ void \
GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent *e) m_moveStarted = \
false; m_clickPoint = e->scenePos();
m_resizeMode = m_possibleAction;
- const QList <QGraphicsItem *> list = items(e->scenePos());
+ const QList<QGraphicsItem *> list = items(e->scenePos());
QGraphicsItem *item = Q_NULLPTR;
if (e->modifiers() != Qt::ControlModifier) {
clearSelection();
diff --git a/src/effectstack/keyframeedit.cpp b/src/effectstack/keyframeedit.cpp
index 11d799b00..0cc0a36fc 100644
--- a/src/effectstack/keyframeedit.cpp
+++ b/src/effectstack/keyframeedit.cpp
@@ -243,8 +243,8 @@ void KeyframeEdit::slotAddKeyframe(int pos)
}
}
// Calculate new values
- QList <double> previousValues;
- QList <double> nextValues;
+ QList<double> previousValues;
+ QList<double> nextValues;
int rowCount = keyframe_list->rowCount();
// Insert new row
keyframe_list->insertRow(newrow);
diff --git a/src/effectstack/keyframeedit.h b/src/effectstack/keyframeedit.h
index 55b13443c..b36ecbf6f 100644
--- a/src/effectstack/keyframeedit.h
+++ b/src/effectstack/keyframeedit.h
@@ -123,7 +123,7 @@ protected slots:
void slotAdjustKeyframeInfo(bool seek = true);
private:
- QList <QDomElement> m_params;
+ QList<QDomElement> m_params;
Timecode m_timecode;
QGridLayout *m_slidersLayout;
PositionEdit *m_position;
diff --git a/src/effectstack/keyframehelper.h b/src/effectstack/keyframehelper.h
index 03cf29f20..6e5305bf1 100644
--- a/src/effectstack/keyframehelper.h
+++ b/src/effectstack/keyframehelper.h
@@ -50,13 +50,13 @@ private:
double m_scale;
bool m_movingKeyframe;
Mlt::GeometryItem m_movingItem;
- QList <Mlt::GeometryItem *> m_extraMovingItems;
+ QList<Mlt::GeometryItem *> m_extraMovingItems;
QPoint m_dragStart;
int m_lineHeight;
int m_hoverKeyframe;
QColor m_selected;
QColor m_keyframe;
- QList <Mlt::Geometry *>m_extraGeometries;
+ QList<Mlt::Geometry *>m_extraGeometries;
int m_seekPosition;
int m_offset;
diff --git a/src/effectstack/widgets/animationwidget.cpp \
b/src/effectstack/widgets/animationwidget.cpp index 6da89ca46..fe239dad0 100644
--- a/src/effectstack/widgets/animationwidget.cpp
+++ b/src/effectstack/widgets/animationwidget.cpp
@@ -1034,7 +1034,7 @@ void AnimationWidget::loadPresets(QString currentText)
m_presetCombo->removeItem(0);
}
m_presetCombo->removeItem(0);
- QMap <QString, QVariant> defaultEntry;
+ QMap<QString, QVariant> defaultEntry;
QStringList paramNames = m_doubleWidgets.keys();
for (int i = 0; i < paramNames.count(); i++) {
defaultEntry.insert(paramNames.at(i), getDefaultKeyframes(m_inPoint, \
m_params.at(i).attribute(QStringLiteral("default")))); @@ -1057,7 +1057,7 @@ void \
AnimationWidget::loadPreset(const QString &path) QStringList groups = \
confFile.groupList(); foreach (const QString &grp, groups) {
QMap<QString, QString> entries = KConfigGroup(&confFile, grp).entryMap();
- QMap <QString, QVariant> variantEntries;
+ QMap<QString, QVariant> variantEntries;
QMapIterator<QString, QString> i(entries);
while (i.hasNext()) {
i.next();
diff --git a/src/effectstack/widgets/animationwidget.h \
b/src/effectstack/widgets/animationwidget.h index d35d222e2..34642fbb4 100644
--- a/src/effectstack/widgets/animationwidget.h
+++ b/src/effectstack/widgets/animationwidget.h
@@ -89,8 +89,8 @@ private:
Mlt::Properties m_animProperties;
KSelectAction *m_selectType;
QAction *m_endAttach;
- QList <QDomElement> m_params;
- QMap <QString, DoubleParameterWidget *> m_doubleWidgets;
+ QList<QDomElement> m_params;
+ QMap<QString, DoubleParameterWidget *> m_doubleWidgets;
DragValue *m_spinX;
DragValue *m_spinY;
DragValue *m_spinWidth;
diff --git a/src/effectstack/widgets/bezier/cubicbezierspline.cpp \
b/src/effectstack/widgets/bezier/cubicbezierspline.cpp index 6fdcec945..bfcf5f399 \
100644
--- a/src/effectstack/widgets/bezier/cubicbezierspline.cpp
+++ b/src/effectstack/widgets/bezier/cubicbezierspline.cpp
@@ -90,7 +90,7 @@ int CubicBezierSpline::setPoint(int ix, const BPoint &point)
return indexOf(point); // in case it changed
}
-QList <BPoint> CubicBezierSpline::points() const
+QList<BPoint> CubicBezierSpline::points() const
{
return m_points;
}
diff --git a/src/effectstack/widgets/bezier/cubicbezierspline.h \
b/src/effectstack/widgets/bezier/cubicbezierspline.h index a09f8c807..dfd80deaa \
100644
--- a/src/effectstack/widgets/bezier/cubicbezierspline.h
+++ b/src/effectstack/widgets/bezier/cubicbezierspline.h
@@ -50,7 +50,7 @@ public:
QString toString() const;
/** @brief Returns a list of the points defining the spline. */
- QList <BPoint> points() const;
+ QList<BPoint> points() const;
/** @brief Sets the point at index @param ix to @param point and returns its \
index (it might have changed during validation). */ int setPoint(int ix, const \
BPoint &point); @@ -72,7 +72,7 @@ private:
void keepSorted();
int indexOf(const BPoint &p);
- QList <BPoint> m_points;
+ QList<BPoint> m_points;
};
#endif
diff --git a/src/effectstack/widgets/geometrywidget.h \
b/src/effectstack/widgets/geometrywidget.h index c1555dc1b..459d940c3 100644
--- a/src/effectstack/widgets/geometrywidget.h
+++ b/src/effectstack/widgets/geometrywidget.h
@@ -92,7 +92,7 @@ private:
Mlt::Geometry *m_geometry;
QStringList m_extraGeometryNames;
QStringList m_extraFactors;
- QList <Mlt::Geometry *>m_extraGeometries;
+ QList<Mlt::Geometry *>m_extraGeometries;
DragValue *m_spinX;
DragValue *m_spinY;
DragValue *m_spinWidth;
diff --git a/src/effectstack/widgets/keyframeimport.cpp \
b/src/effectstack/widgets/keyframeimport.cpp index 94326fcec..c699770c3 100644
--- a/src/effectstack/widgets/keyframeimport.cpp
+++ b/src/effectstack/widgets/keyframeimport.cpp
@@ -336,7 +336,7 @@ void KeyframeImport::updateDisplay()
QPixmap pix(m_previewLabel->width(), m_previewLabel->height());
pix.fill(Qt::transparent);
QPainter *painter = new QPainter(&pix);
- QList <QPoint> maximas;
+ QList<QPoint> maximas;
int selectedtarget = m_sourceCombo->currentData().toInt();
int profileWidth = m_profile.profileSize.width();
int profileHeight = m_profile.profileSize.height();
diff --git a/src/effectstack/widgets/keyframeimport.h \
b/src/effectstack/widgets/keyframeimport.h index 4aff4f740..595753690 100644
--- a/src/effectstack/widgets/keyframeimport.h
+++ b/src/effectstack/widgets/keyframeimport.h
@@ -59,7 +59,7 @@ private:
QComboBox *m_targetCombo;
QComboBox *m_alignCombo;
QLabel *m_sourceRangeLabel;
- QList <QPoint> m_maximas;
+ QList<QPoint> m_maximas;
QDoubleSpinBox m_destMin;
QDoubleSpinBox m_destMax;
/** @brief Contains the 4 dimensional (x,y,w,h) target parameter names / tag **/
diff --git a/src/effectstack/widgets/lumaliftgain.cpp \
b/src/effectstack/widgets/lumaliftgain.cpp index b2003ddd3..ecea0f28f 100644
--- a/src/effectstack/widgets/lumaliftgain.cpp
+++ b/src/effectstack/widgets/lumaliftgain.cpp
@@ -35,7 +35,7 @@ LumaLiftGain::LumaLiftGain(const QDomNodeList &nodes, QWidget \
*parent) : layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);*/
- QMap <QString, double> values;
+ QMap<QString, double> values;
for (int i = 0; i < nodes.count(); ++i) {
QDomElement pa = nodes.item(i).toElement();
if (pa.tagName() != QLatin1String("parameter")) {
@@ -81,7 +81,7 @@ void LumaLiftGain::updateEffect(QDomElement &effect)
QColor lift = m_lift->color();
QColor gamma = m_gamma->color();
QColor gain = m_gain->color();
- QMap <QString, double> values;
+ QMap<QString, double> values;
values.insert(QStringLiteral("lift_r"), lift.redF());
values.insert(QStringLiteral("lift_g"), lift.greenF());
values.insert(QStringLiteral("lift_b"), lift.blueF());
diff --git a/src/hidetitlebars.cpp b/src/hidetitlebars.cpp
index 93ed2fa6e..5485dcc5f 100644
--- a/src/hidetitlebars.cpp
+++ b/src/hidetitlebars.cpp
@@ -28,7 +28,7 @@ HideTitleBars::HideTitleBars(QObject *parent) :
void HideTitleBars::slotInstallRightClick()
{
- QList <QTabBar *> tabs = pCore->window()->findChildren<QTabBar *>();
+ QList<QTabBar *> tabs = pCore->window()->findChildren<QTabBar *>();
for (int i = 0; i < tabs.count(); ++i) {
tabs.at(i)->setContextMenuPolicy(Qt::CustomContextMenu);
connect(tabs.at(i), &QWidget::customContextMenuRequested, this, \
&HideTitleBars::slotSwitchTitleBars); @@ -38,7 +38,7 @@ void \
HideTitleBars::slotInstallRightClick()
void HideTitleBars::slotShowTitleBars(bool show)
{
- QList <QDockWidget *> docks = pCore->window()->findChildren<QDockWidget *>();
+ QList<QDockWidget *> docks = pCore->window()->findChildren<QDockWidget *>();
for (int i = 0; i < docks.count(); ++i) {
QDockWidget *dock = docks.at(i);
QWidget *bar = dock->titleBarWidget();
@@ -52,7 +52,7 @@ void HideTitleBars::slotShowTitleBars(bool show)
}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
// Since Qt 5.6 we only display title bar in non tabbed dockwidgets
- QList <QDockWidget *> docked = \
pCore->window()->tabifiedDockWidgets(dock); + QList<QDockWidget *> docked \
= pCore->window()->tabifiedDockWidgets(dock); if (docked.isEmpty()) {
if (bar) {
dock->setTitleBarWidget(0);
diff --git a/src/library/librarywidget.cpp b/src/library/librarywidget.cpp
index cab9233d1..79cbd2422 100644
--- a/src/library/librarywidget.cpp
+++ b/src/library/librarywidget.cpp
@@ -76,7 +76,7 @@ QStringList LibraryTree::mimeTypes() const
void LibraryTree::slotUpdateThumb(const QString &path, const QString &iconPath)
{
QString name = QUrl::fromLocalFile(path).fileName();
- QList <QTreeWidgetItem *> list = findItems(name, Qt::MatchExactly | \
Qt::MatchRecursive); + QList<QTreeWidgetItem *> list = findItems(name, \
Qt::MatchExactly | Qt::MatchRecursive); foreach (QTreeWidgetItem *item, list) {
if (item->data(0, Qt::UserRole).toString() == path) {
// We found our item
@@ -91,7 +91,7 @@ void LibraryTree::slotUpdateThumb(const QString &path, const \
QString &iconPath) void LibraryTree::slotUpdateThumb(const QString &path, const \
QPixmap &pix) {
QString name = QUrl::fromLocalFile(path).fileName();
- QList <QTreeWidgetItem *> list = findItems(name, Qt::MatchExactly | \
Qt::MatchRecursive); + QList<QTreeWidgetItem *> list = findItems(name, \
Qt::MatchExactly | Qt::MatchRecursive); foreach (QTreeWidgetItem *item, list) {
if (item->data(0, Qt::UserRole).toString() == path) {
// We found our item
@@ -106,7 +106,7 @@ void LibraryTree::slotUpdateThumb(const QString &path, const \
QPixmap &pix) void LibraryTree::mousePressEvent(QMouseEvent *event)
{
QTreeWidgetItem *clicked = this->itemAt(event->pos());
- QList <QAction *> act = actions();
+ QList<QAction *> act = actions();
if (clicked) {
foreach (QAction *a, act) {
a->setEnabled(true);
@@ -223,9 +223,9 @@ LibraryWidget::LibraryWidget(ProjectManager *manager, QWidget \
*parent) : QWidget
connect(m_libraryTree, &LibraryTree::itemChanged, this, \
&LibraryWidget::slotItemEdited, Qt::UniqueConnection); }
-void LibraryWidget::setupActions(const QList <QAction *> &list)
+void LibraryWidget::setupActions(const QList<QAction *> &list)
{
- QList <QAction *> menuList;
+ QList<QAction *> menuList;
m_addAction = new \
QAction(KoIconUtils::themedIcon(QStringLiteral("kdenlive-add-clip")), i18n("Add Clip \
to Project"), this);
connect(m_addAction, &QAction::triggered, this, \
&LibraryWidget::slotAddToProject); m_addAction->setData(1);
@@ -546,7 +546,7 @@ void LibraryWidget::slotItemsDeleted(const KFileItemList &list)
if (matchingFolder) {
m_folders.removeAll(matchingFolder);
// warning, we also need to remove all subfolders since they will be \
recreated
- QList <QTreeWidgetItem *> subList;
+ QList<QTreeWidgetItem *> subList;
foreach (QTreeWidgetItem *folder, m_folders) {
if (folder->data(0, Qt::UserRole).toString().startsWith(path)) {
subList << folder;
diff --git a/src/library/librarywidget.h b/src/library/librarywidget.h
index df6edd70a..b99de5248 100644
--- a/src/library/librarywidget.h
+++ b/src/library/librarywidget.h
@@ -198,7 +198,7 @@ private:
QTimer m_timer;
KMessageWidget *m_infoWidget;
ProjectManager *m_manager;
- QList <QTreeWidgetItem *> m_folders;
+ QList<QTreeWidgetItem *> m_folders;
KIO::PreviewJob *m_previewJob;
KCoreDirLister *m_coreLister;
QMutex m_treeMutex;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c76c630db..2ca4c9253 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -122,8 +122,8 @@ EffectsList MainWindow::audioEffects;
EffectsList MainWindow::customEffects;
EffectsList MainWindow::transitions;
-QMap <QString, QImage> MainWindow::m_lumacache;
-QMap <QString, QStringList> MainWindow::m_lumaFiles;
+QMap<QString, QImage> MainWindow::m_lumacache;
+QMap<QString, QStringList> MainWindow::m_lumaFiles;
/*static bool sortByNames(const QPair<QString, QAction *> &a, const QPair<QString, \
QAction*> &b) {
@@ -1475,7 +1475,7 @@ void MainWindow::setupActions()
addAction(QStringLiteral("save_selection"), i18n("Save Selection"), \
pCore->projectManager(), SLOT(slotSaveSelection()), \
KoIconUtils::themedIcon(QStringLiteral("document-save")));
QAction *sentToLibrary = addAction(QStringLiteral("send_library"), i18n("Add \
Timeline Selection to Library"), pCore->library(), SLOT(slotAddToLibrary()), \
KoIconUtils::themedIcon(QStringLiteral("bookmark-new")));
- pCore->library()->setupActions(QList <QAction *>() << sentToLibrary);
+ pCore->library()->setupActions(QList<QAction *>() << sentToLibrary);
KStandardAction::showMenubar(this, SLOT(showMenuBar(bool)), actionCollection());
@@ -2054,7 +2054,7 @@ void MainWindow::slotZoneMoved(int start, int end)
void MainWindow::slotGuidesUpdated()
{
- QMap <double, QString> guidesData = \
pCore->projectManager()->currentTimeline()->projectView()->guidesData(); + \
QMap<double, QString> guidesData = \
pCore->projectManager()->currentTimeline()->projectView()->guidesData(); if \
(m_renderWidget) {
m_renderWidget->setGuides(guidesData, \
pCore->projectManager()->current()->projectDuration()); }
@@ -2272,7 +2272,7 @@ void MainWindow::slotAddClipMarker()
QPointer<MarkerDialog> d = new MarkerDialog(clip, marker,
project->timecode(), i18n("Add Marker"), this);
if (d->exec() == QDialog::Accepted) {
- pCore->bin()->slotAddClipMarker(id, QList <CommentedTime>() << \
d->newMarker()); + pCore->bin()->slotAddClipMarker(id, QList<CommentedTime>() \
<< d->newMarker()); QString hash = clip->getClipHash();
if (!hash.isEmpty()) {
project->cacheImage(hash + '#' + \
QString::number(d->newMarker().time().frames(project->fps())), d->markerImage()); @@ \
-2366,7 +2366,7 @@ void MainWindow::slotEditClipMarker() QPointer<MarkerDialog> d = \
new MarkerDialog(clip, oldMarker,
pCore->projectManager()->current()->timecode(), i18n("Edit Marker"), \
this); if (d->exec() == QDialog::Accepted) {
- pCore->bin()->slotAddClipMarker(id, QList <CommentedTime>() << \
d->newMarker()); + pCore->bin()->slotAddClipMarker(id, QList<CommentedTime>() \
<< d->newMarker()); QString hash = clip->getClipHash();
if (!hash.isEmpty()) {
pCore->projectManager()->current()->cacheImage(hash + '#' + \
QString::number(d->newMarker().time().frames(pCore->projectManager()->current()->fps())), \
d->markerImage()); @@ -2374,7 +2374,7 @@ void MainWindow::slotEditClipMarker()
if (d->newMarker().time() != pos) {
// remove old marker
oldMarker.setMarkerType(-1);
- pCore->bin()->slotAddClipMarker(id, QList <CommentedTime>() << \
oldMarker); + pCore->bin()->slotAddClipMarker(id, QList<CommentedTime>() \
<< oldMarker); }
}
delete d;
@@ -2396,7 +2396,7 @@ void MainWindow::slotAddMarkerGuideQuickly()
}
//TODO: allow user to set default marker category
CommentedTime marker(pos, \
pCore->projectManager()->current()->timecode().getDisplayTimecode(pos, false), \
KdenliveSettings::default_marker_type());
- pCore->bin()->slotAddClipMarker(clip->clipId(), QList <CommentedTime>() << \
marker); + pCore->bin()->slotAddClipMarker(clip->clipId(), \
QList<CommentedTime>() << marker); } else {
pCore->projectManager()->currentTimeline()->projectView()->slotAddGuide(false);
}
@@ -2921,7 +2921,7 @@ void MainWindow::slotClipInTimeline(const QString &clipId)
QList<ItemInfo> matching = \
pCore->projectManager()->currentTimeline()->projectView()->findId(clipId);
QMenu *inTimelineMenu = static_cast<QMenu \
*>(factory()->container(QStringLiteral("clip_in_timeline"), this));
- QList <QAction *> actionList;
+ QList<QAction *> actionList;
for (int i = 0; i < matching.count(); ++i) {
QString track = \
pCore->projectManager()->currentTimeline()->getTrackInfo(matching.at(i).track).trackName;
QString start = \
pCore->projectManager()->current()->timecode().getTimecode(matching.at(i).startPos); \
@@ -2937,7 +2937,7 @@ void MainWindow::slotClipInTimeline(const QString &clipId) }
actionList.insert(j, a);
}
- QList <QAction *> list = inTimelineMenu->actions();
+ QList<QAction *> list = inTimelineMenu->actions();
unplugActionList(QStringLiteral("timeline_occurences"));
qDeleteAll(list);
plugActionList(QStringLiteral("timeline_occurences"), actionList);
@@ -3172,30 +3172,30 @@ void MainWindow::loadClipActions()
unplugActionList(QStringLiteral("add_effect"));
plugActionList(QStringLiteral("add_effect"), m_effectsMenu->actions());
- QList <QAction *>clipJobActions = getExtraActions(QStringLiteral("clipjobs"));
+ QList<QAction *>clipJobActions = getExtraActions(QStringLiteral("clipjobs"));
unplugActionList(QStringLiteral("clip_jobs"));
plugActionList(QStringLiteral("clip_jobs"), clipJobActions);
- QList <QAction *>atcActions = \
getExtraActions(QStringLiteral("audiotranscoderslist")); + QList<QAction \
*>atcActions = getExtraActions(QStringLiteral("audiotranscoderslist")); \
unplugActionList(QStringLiteral("audio_transcoders_list")); \
plugActionList(QStringLiteral("audio_transcoders_list"), atcActions);
- QList <QAction *>tcActions = getExtraActions(QStringLiteral("transcoderslist"));
+ QList<QAction *>tcActions = getExtraActions(QStringLiteral("transcoderslist"));
unplugActionList(QStringLiteral("transcoders_list"));
plugActionList(QStringLiteral("transcoders_list"), tcActions);
}
void MainWindow::loadDockActions()
{
- QList <QAction *>list = \
kdenliveCategoryMap.value(QStringLiteral("interface"))->actions(); + QList<QAction \
*>list = kdenliveCategoryMap.value(QStringLiteral("interface"))->actions(); // Sort \
actions
- QMap <QString, QAction *> sorted;
+ QMap<QString, QAction *> sorted;
QStringList sortedList;
foreach (QAction *a, list) {
sorted.insert(a->text(), a);
sortedList << a->text();
}
- QList <QAction *>orderedList;
+ QList<QAction *>orderedList;
sortedList.sort(Qt::CaseInsensitive);
foreach (const QString &text, sortedList) {
orderedList << sorted.value(text);
@@ -3306,7 +3306,7 @@ void MainWindow::buildDynamicActions()
guiActions->addAction(showTimeline->text(), showTimeline);
actionCollection()->addAction(showTimeline->text(), showTimeline);
- QList <QDockWidget *> docks = findChildren<QDockWidget *>();
+ QList<QDockWidget *> docks = findChildren<QDockWidget *>();
for (int i = 0; i < docks.count(); ++i) {
QDockWidget *dock = docks.at(i);
QAction *dockInformations = dock->toggleViewAction();
@@ -3319,10 +3319,10 @@ void MainWindow::buildDynamicActions()
kdenliveCategoryMap.insert(QStringLiteral("interface"), guiActions);
}
-QList <QAction *> MainWindow::getExtraActions(const QString &name)
+QList<QAction *> MainWindow::getExtraActions(const QString &name)
{
if (!kdenliveCategoryMap.contains(name)) {
- return QList <QAction *> ();
+ return QList<QAction *> ();
}
return kdenliveCategoryMap.value(name)->actions();
}
@@ -3433,7 +3433,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool \
zoneOnly, const QS chapters.setAttribute(QStringLiteral("fps"), project->fps());
doc.appendChild(chapters);
- QMap <double, QString> guidesData = \
pCore->projectManager()->currentTimeline()->projectView()->guidesData(); + \
QMap<double, QString> guidesData = \
pCore->projectManager()->currentTimeline()->projectView()->guidesData(); \
QMapIterator<double, QString> g(guidesData); while (g.hasNext()) {
g.next();
@@ -3753,7 +3753,7 @@ void MainWindow::slotUpdateProxySettings()
void MainWindow::slotArchiveProject()
{
- QList <ClipController *> list = pCore->binController()->getControllerList();
+ QList<ClipController *> list = pCore->binController()->getControllerList();
KdenliveDoc *doc = pCore->projectManager()->current();
pCore->binController()->saveDocumentProperties(pCore->projectManager()->currentTimeline()->documentProperties(), \
doc->metadata(), pCore->projectManager()->currentTimeline()->projectView()->guidesData());
QDomDocument xmlDoc = \
doc->xmlSceneList(m_projectMonitor->sceneList(doc->url().adjusted(QUrl::RemoveFilename).path()));
@@ -3838,7 +3838,7 @@ void MainWindow::slotUpdateMonitorOverlays(int id, int code)
if (!monitorOverlay) {
return;
}
- QList <QAction *> actions = monitorOverlay->actions();
+ QList<QAction *> actions = monitorOverlay->actions();
foreach (QAction *ac, actions) {
int data = ac->data().toInt();
if (data == 0x010) {
@@ -3883,7 +3883,7 @@ void MainWindow::updateDockTitleBars(bool isTopLevel)
return;
}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
- QList <QDockWidget *> docks = pCore->window()->findChildren<QDockWidget *>();
+ QList<QDockWidget *> docks = pCore->window()->findChildren<QDockWidget *>();
for (int i = 0; i < docks.count(); ++i) {
QDockWidget *dock = docks.at(i);
QWidget *bar = dock->titleBarWidget();
@@ -3894,7 +3894,7 @@ void MainWindow::updateDockTitleBars(bool isTopLevel)
}
continue;
}
- QList <QDockWidget *> docked = pCore->window()->tabifiedDockWidgets(dock);
+ QList<QDockWidget *> docked = pCore->window()->tabifiedDockWidgets(dock);
if (docked.isEmpty()) {
if (bar) {
dock->setTitleBarWidget(0);
@@ -4089,7 +4089,7 @@ void MainWindow::slotUpdateCompositing(QAction *compose)
void MainWindow::slotUpdateCompositeAction(int mode)
{
- QList <QAction *> actions = m_compositeAction->actions();
+ QList<QAction *> actions = m_compositeAction->actions();
for (int i = 0; i < actions.count(); i++) {
if (actions.at(i)->data().toInt() == mode) {
m_compositeAction->setCurrentAction(actions.at(i));
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 1b30b9531..73a509b8e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -83,8 +83,8 @@ public:
static EffectsList transitions;
/** @brief Cache for luma files thumbnails. */
- static QMap <QString, QImage> m_lumacache;
- static QMap <QString, QStringList> m_lumaFiles;
+ static QMap<QString, QImage> m_lumacache;
+ static QMap<QString, QStringList> m_lumaFiles;
/** @brief Adds an action to the action collection and stores the name. */
void addAction(const QString &name, QAction *action);
@@ -112,7 +112,7 @@ public:
bool m_gpuAllowed;
int m_exitCode;
QMap<QString, KActionCategory *> kdenliveCategoryMap;
- QList <QAction *> getExtraActions(const QString &name);
+ QList<QAction *> getExtraActions(const QString &name);
/** @brief Returns true if docked widget is tabbed with another widget from its \
object name */ bool isTabbedWith(QDockWidget *widget, const QString &otherWidget);
@@ -169,7 +169,7 @@ private:
KSelectAction *m_compositeAction;
/** This list holds all the scopes used in Kdenlive, allowing to manage some \
global settings */
- QList <QDockWidget *> m_gfxScopesList;
+ QList<QDockWidget *> m_gfxScopesList;
KActionCategory *m_effectActions;
KActionCategory *m_transitionActions;
@@ -193,7 +193,7 @@ private:
RenderWidget *m_renderWidget;
StatusBarMessageLabel *m_messageLabel;
- QList <QAction *>m_transitions;
+ QList<QAction *>m_transitions;
QAction *m_buttonAudioThumbs;
QAction *m_buttonVideoThumbs;
QAction *m_buttonShowMarkers;
diff --git a/src/mltcontroller/bincontroller.cpp \
b/src/mltcontroller/bincontroller.cpp index 91b789ce9..3fe7c7008 100644
--- a/src/mltcontroller/bincontroller.cpp
+++ b/src/mltcontroller/bincontroller.cpp
@@ -104,7 +104,7 @@ void BinController::initializeBin(Mlt::Playlist playlist)
Mlt::Properties folderProperties;
Mlt::Properties playlistProps(playlist.get_properties());
folderProperties.pass_values(playlistProps, "kdenlive:folder.");
- QMap <QString, QString> foldersData;
+ QMap<QString, QString> foldersData;
for (int i = 0; i < folderProperties.count(); i++) {
foldersData.insert(folderProperties.get_name(i), folderProperties.get(i));
}
@@ -162,7 +162,7 @@ void BinController::initializeBin(Mlt::Playlist playlist)
// Load markers
Mlt::Properties markerProperties;
markerProperties.pass_values(playlistProps, "kdenlive:marker.");
- QMap <QString, QString> markersData;
+ QMap<QString, QString> markersData;
for (int i = 0; i < markerProperties.count(); i++) {
QString markerId = markerProperties.get_name(i);
QString controllerId = markerId.section(QStringLiteral(":"), 0, 0);
@@ -182,7 +182,7 @@ QMap<double, QString> BinController::takeGuidesData()
Mlt::Properties playlistProps(m_binPlaylist->get_properties());
guidesProperties.pass_values(playlistProps, "kdenlive:guide.");
qCDebug(KDENLIVE_LOG) << "***********\nFOUND GUIDES: " << \
guidesProperties.count() << "\n**********";
- QMap <double, QString> guidesData;
+ QMap<double, QString> guidesData;
for (int i = 0; i < guidesProperties.count(); i++) {
double time = locale.toDouble(guidesProperties.get_name(i));
guidesData.insert(time, guidesProperties.get(i));
@@ -464,7 +464,7 @@ ClipController *BinController::getController(const QString &id)
return m_clipList.value(id);
}
-const QList <ClipController *> BinController::getControllerList() const
+const QList<ClipController *> BinController::getControllerList() const
{
return m_clipList.values();
}
@@ -539,7 +539,7 @@ void BinController::checkAudioThumbs()
}
}
-void BinController::saveDocumentProperties(const QMap<QString, QString> &props, \
const QMap<QString, QString> &metadata, const QMap <double, QString> &guidesData) \
+void BinController::saveDocumentProperties(const QMap<QString, QString> &props, \
const QMap<QString, QString> &metadata, const QMap<double, QString> &guidesData) {
// Clear previous properites
Mlt::Properties playlistProps(m_binPlaylist->get_properties());
diff --git a/src/mltcontroller/bincontroller.h b/src/mltcontroller/bincontroller.h
index 25cdfd397..d27fe32c9 100644
--- a/src/mltcontroller/bincontroller.h
+++ b/src/mltcontroller/bincontroller.h
@@ -129,7 +129,7 @@ public:
Mlt::Producer *cloneProducer(Mlt::Producer &original);
ClipController *getController(const QString &id);
- const QList <ClipController *> getControllerList() const;
+ const QList<ClipController *> getControllerList() const;
void replaceBinPlaylistClip(const QString &id, Mlt::Producer &producer);
/** @brief Get the list of ids whose clip have the resource indicated by @param \
url */ @@ -189,10 +189,10 @@ private:
void duplicateFilters(Mlt::Producer original, Mlt::Producer clone);
/** @brief This list holds all producer controllers for the playlist, indexed by \
id */
- QMap <QString, ClipController *> m_clipList;
+ QMap<QString, ClipController *> m_clipList;
/** @brief This list holds all extra controllers (slowmotion, video only, ... \
that are in timeline, indexed by id */
- QMap <QString, Mlt::Producer *> m_extraClipList;
+ QMap<QString, Mlt::Producer *> m_extraClipList;
/** @brief Stores MLT's xml playlist document root, useful to recover full urls \
*/ QString m_documentRoot;
diff --git a/src/mltcontroller/clipcontroller.cpp \
b/src/mltcontroller/clipcontroller.cpp index 5cf90ff40..b57bede09 100644
--- a/src/mltcontroller/clipcontroller.cpp
+++ b/src/mltcontroller/clipcontroller.cpp
@@ -45,7 +45,7 @@ ClipController::ClipController(BinController *bincontroller, \
Mlt::Producer &prod , m_clipType(Unknown)
, m_hasLimitedDuration(true)
, m_binController(bincontroller)
- , m_snapMarkers(QList < CommentedTime >())
+ , m_snapMarkers(QList< CommentedTime >())
{
m_masterProducer = &producer;
if (!m_masterProducer->is_valid()) {
@@ -81,7 +81,7 @@ ClipController::ClipController(BinController *bincontroller) : \
QObject() , m_clipType(Unknown)
, m_hasLimitedDuration(true)
, m_binController(bincontroller)
- , m_snapMarkers(QList < CommentedTime >())
+ , m_snapMarkers(QList< CommentedTime >())
{
}
@@ -235,7 +235,7 @@ QMap<QString, QString> \
ClipController::getPropertiesFromPrefix(const QString &pr {
Mlt::Properties subProperties;
subProperties.pass_values(*m_properties, prefix.toUtf8().constData());
- QMap <QString, QString> subclipsData;
+ QMap<QString, QString> subclipsData;
for (int i = 0; i < subProperties.count(); i++) {
subclipsData.insert(withPrefix ? QString(prefix + subProperties.get_name(i)) \
: subProperties.get_name(i), subProperties.get(i)); }
@@ -506,9 +506,9 @@ QPixmap ClipController::pixmap(int framePosition, int width, int \
height) return pixmap;
}
-QList < GenTime > ClipController::snapMarkers() const
+QList< GenTime > ClipController::snapMarkers() const
{
- QList < GenTime > markers;
+ QList< GenTime > markers;
for (int count = 0; count < m_snapMarkers.count(); ++count) {
markers.append(m_snapMarkers.at(count).time());
}
@@ -516,7 +516,7 @@ QList < GenTime > ClipController::snapMarkers() const
return markers;
}
-QList < CommentedTime > ClipController::commentedSnapMarkers() const
+QList< CommentedTime > ClipController::commentedSnapMarkers() const
{
return m_snapMarkers;
}
diff --git a/src/mltcontroller/clipcontroller.h b/src/mltcontroller/clipcontroller.h
index e985d29d7..445e622d3 100644
--- a/src/mltcontroller/clipcontroller.h
+++ b/src/mltcontroller/clipcontroller.h
@@ -152,14 +152,14 @@ public:
/** @brief Sets the master producer for this clip when we build the controller \
without master clip. */ void addMasterProducer(Mlt::Producer &producer);
- QList < CommentedTime > commentedSnapMarkers() const;
+ QList< CommentedTime > commentedSnapMarkers() const;
GenTime findNextSnapMarker(const GenTime &currTime);
GenTime findPreviousSnapMarker(const GenTime &currTime);
QString deleteSnapMarker(const GenTime &time);
void editSnapMarker(const GenTime &time, const QString &comment);
void addSnapMarker(const CommentedTime &marker);
void loadSnapMarker(const QString &seconds, const QString &hash);
- QList < GenTime > snapMarkers() const;
+ QList< GenTime > snapMarkers() const;
QString markerComment(const GenTime &t) const;
QStringList markerComments(const GenTime &start, const GenTime &end) const;
CommentedTime markerAt(const GenTime &t) const;
@@ -210,7 +210,7 @@ private:
bool m_hasLimitedDuration;
BinController *m_binController;
/** @brief A list of snap markers; these markers are added to a clips snap-to \
points, and are displayed as necessary. */
- QList < CommentedTime > m_snapMarkers;
+ QList< CommentedTime > m_snapMarkers;
QMutex m_effectMutex;
void getInfoForProducer();
//void rebuildEffectList(ProfileInfo info);
diff --git a/src/mltcontroller/clippropertiescontroller.cpp \
b/src/mltcontroller/clippropertiescontroller.cpp index 5c7f17c0e..e0d5b0b80 100644
--- a/src/mltcontroller/clippropertiescontroller.cpp
+++ b/src/mltcontroller/clippropertiescontroller.cpp
@@ -742,7 +742,7 @@ void ClipPropertiesController::slotComboValueChanged()
void ClipPropertiesController::fillProperties()
{
m_clipProperties.clear();
- QList <QStringList> propertyMap;
+ QList<QStringList> propertyMap;
m_propertiesTree->setSortingEnabled(false);
@@ -871,7 +871,7 @@ void ClipPropertiesController::fillProperties()
void ClipPropertiesController::slotFillMarkers()
{
m_markerTree->clear();
- QList <CommentedTime> markers = m_controller->commentedSnapMarkers();
+ QList<CommentedTime> markers = m_controller->commentedSnapMarkers();
for (int count = 0; count < markers.count(); ++count) {
QString time = m_tc.getTimecode(markers.at(count).time());
QStringList itemtext;
@@ -892,14 +892,14 @@ void ClipPropertiesController::slotSeekToMarker()
void ClipPropertiesController::slotEditMarker()
{
- QList < CommentedTime > marks = m_controller->commentedSnapMarkers();
+ QList< CommentedTime > marks = m_controller->commentedSnapMarkers();
int pos = m_markerTree->currentIndex().row();
if (pos < 0 || pos > marks.count() - 1) {
return;
}
QPointer<MarkerDialog> d = new MarkerDialog(m_controller, marks.at(pos), m_tc, \
i18n("Edit Marker"), this); if (d->exec() == QDialog::Accepted) {
- QList <CommentedTime> markers;
+ QList<CommentedTime> markers;
markers << d->newMarker();
emit addMarkers(m_id, markers);
}
@@ -908,8 +908,8 @@ void ClipPropertiesController::slotEditMarker()
void ClipPropertiesController::slotDeleteMarker()
{
- QList < CommentedTime > marks = m_controller->commentedSnapMarkers();
- QList < CommentedTime > toDelete;
+ QList< CommentedTime > marks = m_controller->commentedSnapMarkers();
+ QList< CommentedTime > toDelete;
for (int i = 0; i < marks.count(); ++i) {
if (m_markerTree->topLevelItem(i)->isSelected()) {
CommentedTime marker = marks.at(i);
@@ -926,7 +926,7 @@ void ClipPropertiesController::slotAddMarker()
QPointer<MarkerDialog> d = new MarkerDialog(m_controller, marker,
m_tc, i18n("Add Marker"), this);
if (d->exec() == QDialog::Accepted) {
- QList <CommentedTime> markers;
+ QList<CommentedTime> markers;
markers << d->newMarker();
emit addMarkers(m_id, markers);
}
diff --git a/src/mltcontroller/effectscontroller.cpp \
b/src/mltcontroller/effectscontroller.cpp index 772ac90ae..f496142f8 100644
--- a/src/mltcontroller/effectscontroller.cpp
+++ b/src/mltcontroller/effectscontroller.cpp
@@ -80,7 +80,7 @@ void EffectParameter::setValue(const QString &value)
m_value = value;
}
-EffectsParameterList::EffectsParameterList(): QList < EffectParameter >() {}
+EffectsParameterList::EffectsParameterList(): QList< EffectParameter >() {}
bool EffectsParameterList::hasParam(const QString &name) const
{
diff --git a/src/mltcontroller/effectscontroller.h \
b/src/mltcontroller/effectscontroller.h index 95d8660c4..e61e1edf1 100644
--- a/src/mltcontroller/effectscontroller.h
+++ b/src/mltcontroller/effectscontroller.h
@@ -71,7 +71,7 @@ private:
* @author Jean-Baptiste Mardelle
*/
-class EffectsParameterList: public QList < EffectParameter >
+class EffectsParameterList: public QList< EffectParameter >
{
public:
EffectsParameterList();
diff --git a/src/mltcontroller/producerqueue.cpp \
b/src/mltcontroller/producerqueue.cpp index 802dc6ec7..f1d4ade57 100644
--- a/src/mltcontroller/producerqueue.cpp
+++ b/src/mltcontroller/producerqueue.cpp
@@ -73,7 +73,7 @@ void ProducerQueue::getFileProperties(const QDomElement &xml, const \
QString &cli void ProducerQueue::forceProcessing(const QString &id)
{
// Make sure we load the clip producer now so that we can use it in timeline
- QList <requestClipInfo> requestListCopy;
+ QList<requestClipInfo> requestListCopy;
if (m_processingClipId.contains(id)) {
m_infoMutex.lock();
requestListCopy = m_requestList;
@@ -934,8 +934,8 @@ void ProducerQueue::slotMultiStreamProducerFound(const QString \
&path, const QLis
QLabel *lab1 = new QLabel(i18n("Additional streams for clip\n %1", path), \
mainWidget); mainLayout->addWidget(lab1);
- QList <QGroupBox *> groupList;
- QList <KComboBox *> comboList;
+ QList<QGroupBox *> groupList;
+ QList<KComboBox *> comboList;
// We start loading the list at 1, video index 0 should already be loaded
for (int j = 1; j < video_list.count(); ++j) {
Mlt::Producer multiprod(* m_binController->profile(), \
path.toUtf8().constData());
diff --git a/src/mltcontroller/producerqueue.h b/src/mltcontroller/producerqueue.h
index 2d0585cd6..1e9218daa 100644
--- a/src/mltcontroller/producerqueue.h
+++ b/src/mltcontroller/producerqueue.h
@@ -59,7 +59,7 @@ public:
private:
QMutex m_infoMutex;
- QList <requestClipInfo> m_requestList;
+ QList<requestClipInfo> m_requestList;
/** @brief The ids of the clips that are currently being loaded for info query \
*/ QStringList m_processingClipId;
QFuture <void> m_infoThread;
diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp
index 4a3b8f176..2ea8a0479 100644
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@ -447,7 +447,7 @@ void Monitor::setupMenu(QMenu *goMenu, QMenu *overlayMenu, \
QAction *playZone, QA
if (markerMenu) {
m_contextMenu->addMenu(markerMenu);
- QList <QAction *>list = markerMenu->actions();
+ QList<QAction *>list = markerMenu->actions();
for (int i = 0; i < list.count(); ++i) {
if (list.at(i)->data().toString() == QLatin1String("edit_marker")) {
m_editMarker = list.at(i);
@@ -572,7 +572,7 @@ void Monitor::updateMarkers()
{
if (m_controller) {
m_markerMenu->clear();
- QList <CommentedTime> markers = m_controller->commentedSnapMarkers();
+ QList<CommentedTime> markers = m_controller->commentedSnapMarkers();
if (!markers.isEmpty()) {
for (int i = 0; i < markers.count(); ++i) {
int pos = (int) \
markers.at(i).time().frames(m_monitorManager->timecode().fps()); @@ -591,7 +591,7 @@ \
void Monitor::setGuides(const QMap<double, QString> &guides) {
m_markerMenu->clear();
QMapIterator<double, QString> i(guides);
- QList <CommentedTime> guidesList;
+ QList<CommentedTime> guidesList;
while (i.hasNext()) {
i.next();
CommentedTime timeGuide(GenTime(i.key()), i.value());
@@ -628,8 +628,8 @@ GenTime Monitor::position()
GenTime Monitor::getSnapForPos(bool previous)
{
- QList <GenTime> snaps;
- QList < GenTime > markers = m_controller->snapMarkers();
+ QList<GenTime> snaps;
+ QList< GenTime > markers = m_controller->snapMarkers();
snaps.reserve(markers.size());
for (int i = 0; i < markers.size(); ++i) {
GenTime t = markers.at(i);
@@ -1724,7 +1724,7 @@ void Monitor::gpuError()
warningMessage(i18n("Cannot initialize Movit's GLSL manager, please disable \
Movit"), -1); }
-void Monitor::warningMessage(const QString &text, int timeout, const QList \
<QAction*> &actions) +void Monitor::warningMessage(const QString &text, int timeout, \
const QList<QAction*> &actions) {
m_infoMessage->setMessageType(KMessageWidget::Warning);
m_infoMessage->setText(text);
diff --git a/src/monitor/monitor.h b/src/monitor/monitor.h
index 4cc3ba6af..9bfe2a981 100644
--- a/src/monitor/monitor.h
+++ b/src/monitor/monitor.h
@@ -98,7 +98,7 @@ public:
/** @brief Controller for the clip currently displayed (only valid for clip \
monitor). */ ClipController *currentController() const;
/** @brief Add clip markers to the ruler and context menu */
- void setMarkers(const QList <CommentedTime> &markers);
+ void setMarkers(const QList<CommentedTime> &markers);
/** @brief Add timeline guides to the ruler and context menu */
void setGuides(const QMap<double, QString> &guides);
void reloadProducer(const QString &id);
@@ -256,7 +256,7 @@ private slots:
void slotForceSize(QAction *a);
void slotSeekToKeyFrame();
/** @brief Display a non blocking error message to user **/
- void warningMessage(const QString &text, int timeout = 5000, const QList<QAction \
*> &actions = QList <QAction *>()); + void warningMessage(const QString &text, int \
timeout = 5000, const QList<QAction *> &actions = QList<QAction *>()); void \
slotLockMonitor(bool lock); void slotAddEffect(const QDomElement &effect);
void slotSwitchPlay();
diff --git a/src/monitor/monitormanager.h b/src/monitor/monitormanager.h
index f43662f7d..3ad913d58 100644
--- a/src/monitor/monitormanager.h
+++ b/src/monitor/monitormanager.h
@@ -123,7 +123,7 @@ private:
Monitor *m_projectMonitor;
Timecode m_timecode;
AbstractMonitor *m_activeMonitor;
- QList <AbstractMonitor *>m_monitorsList;
+ QList<AbstractMonitor *>m_monitorsList;
KDualAction *m_muteAction;
signals:
diff --git a/src/monitor/recmanager.cpp b/src/monitor/recmanager.cpp
index c2493230b..878c70106 100644
--- a/src/monitor/recmanager.cpp
+++ b/src/monitor/recmanager.cpp
@@ -302,12 +302,12 @@ void RecManager::slotProcessStatus(QProcess::ProcessState \
status) m_device_selector->setEnabled(true);
if (m_captureProcess) {
if (m_captureProcess->exitStatus() == QProcess::CrashExit) {
- emit warningMessage(i18n("Capture crashed, please check your \
parameters"), -1, QList <QAction *>() << m_showLogAction); + emit \
warningMessage(i18n("Capture crashed, please check your parameters"), -1, \
QList<QAction *>() << m_showLogAction); } else {
if (true) {
int code = m_captureProcess->exitCode();
if (code != 0 && code != 255) {
- emit warningMessage(i18n("Capture crashed, please check your \
parameters"), -1, QList <QAction *>() << m_showLogAction); + \
emit warningMessage(i18n("Capture crashed, please check your parameters"), -1, \
QList<QAction *>() << m_showLogAction); } else {
// Capture successfull, add clip to project
emit addClipToProject(m_captureFile);
diff --git a/src/monitor/recmanager.h b/src/monitor/recmanager.h
index 14eb39759..a8228762a 100644
--- a/src/monitor/recmanager.h
+++ b/src/monitor/recmanager.h
@@ -93,7 +93,7 @@ private slots:
signals:
void addClipToProject(QUrl);
- void warningMessage(QString, int timeout = 5000, QList <QAction *> actions = \
QList <QAction *>()); + void warningMessage(QString, int timeout = 5000, \
QList<QAction *> actions = QList<QAction *>()); };
#endif
diff --git a/src/monitor/smallruler.h b/src/monitor/smallruler.h
index 314f52dc9..824224740 100644
--- a/src/monitor/smallruler.h
+++ b/src/monitor/smallruler.h
@@ -43,7 +43,7 @@ public:
void setZoneStart();
void setZoneEnd(bool discardLastFrame = false);
QPoint zone() const;
- void setMarkers(const QList < CommentedTime > &list);
+ void setMarkers(const QList< CommentedTime > &list);
QString markerAt(GenTime pos);
void updatePalette();
void refreshRuler();
@@ -74,7 +74,7 @@ private:
double m_mediumMarkSteps;
int m_medium;
int m_small;
- QList <CommentedTime> m_markers;
+ QList<CommentedTime> m_markers;
QPixmap m_pixmap;
void prepareZoneUpdate();
void updatePixmap();
diff --git a/src/onmonitoritems/onmonitorcornersitem.cpp \
b/src/onmonitoritems/onmonitorcornersitem.cpp index e2951079d..56540e7f3 100644
--- a/src/onmonitoritems/onmonitorcornersitem.cpp
+++ b/src/onmonitoritems/onmonitorcornersitem.cpp
@@ -196,7 +196,7 @@ void OnMonitorCornersItem::paint(QPainter *painter, const \
QStyleOptionGraphicsIt
QPointF OnMonitorCornersItem::getCentroid()
{
- QList <QPointF> p = sortedClockwise();
+ QList<QPointF> p = sortedClockwise();
/*
* See: http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/
@@ -222,9 +222,9 @@ QPointF OnMonitorCornersItem::getCentroid()
return QPointF(x, y);
}
-QList <QPointF> OnMonitorCornersItem::sortedClockwise()
+QList<QPointF> OnMonitorCornersItem::sortedClockwise()
{
- QList <QPointF> points = polygon().toList();
+ QList<QPointF> points = polygon().toList();
QPointF &a = points[0];
QPointF &b = points[1];
QPointF &c = points[2];
diff --git a/src/onmonitoritems/onmonitorcornersitem.h \
b/src/onmonitoritems/onmonitorcornersitem.h index 4a8c0cec9..18e257cbd 100644
--- a/src/onmonitoritems/onmonitorcornersitem.h
+++ b/src/onmonitoritems/onmonitorcornersitem.h
@@ -48,7 +48,7 @@ private:
QPointF getCentroid();
/** @brief Returns the points of this polygon but sorted clockwise. */
- QList <QPointF> sortedClockwise();
+ QList<QPointF> sortedClockwise();
/** @brief Tries to get the view of the scene. */
bool getView();
diff --git a/src/onmonitoritems/onmonitorpathitem.cpp \
b/src/onmonitoritems/onmonitorpathitem.cpp index 74b0012b3..c19e27ac2 100644
--- a/src/onmonitoritems/onmonitorpathitem.cpp
+++ b/src/onmonitoritems/onmonitorpathitem.cpp
@@ -125,7 +125,7 @@ void OnMonitorPathItem::mouseMoveEvent(QGraphicsSceneMouseEvent \
*event) }
}
-QList <QPointF> OnMonitorPathItem::points() const
+QList<QPointF> OnMonitorPathItem::points() const
{
return m_points;
}
diff --git a/src/onmonitoritems/onmonitorpathitem.h \
b/src/onmonitoritems/onmonitorpathitem.h index e4b618da8..e4bfd8d4e 100644
--- a/src/onmonitoritems/onmonitorpathitem.h
+++ b/src/onmonitoritems/onmonitorpathitem.h
@@ -37,7 +37,7 @@ public:
void setPoints(Mlt::Geometry *geometry);
void getMode(const QPointF &pos);
void rebuildShape();
- QList <QPointF> points() const;
+ QList<QPointF> points() const;
QPainterPath shape() const Q_DECL_OVERRIDE;
/** @brief Reimplemented to draw the handles. */
@@ -53,7 +53,7 @@ protected:
void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE;
private:
- QList <QPointF> m_points;
+ QList<QPointF> m_points;
QPointF m_lastPoint;
bool m_modified;
QGraphicsView *m_view;
diff --git a/src/onmonitoritems/rotoscoping/bpointitem.cpp \
b/src/onmonitoritems/rotoscoping/bpointitem.cpp index f78a7d844..ea818b034 100644
--- a/src/onmonitoritems/rotoscoping/bpointitem.cpp
+++ b/src/onmonitoritems/rotoscoping/bpointitem.cpp
@@ -97,7 +97,7 @@ void BPointItem::paint(QPainter *painter, const \
QStyleOptionGraphicsItem *option
int BPointItem::getSelection(const QPointF &pos)
{
- QList <qreal> d;
+ QList<qreal> d;
d << QLineF(pos, m_point.h1).length() << QLineF(pos, m_point.p).length() << \
QLineF(pos, m_point.h2).length(); // index of point nearest to pos
int i = (d[1] < d[0] && d[1] < d[2]) ? 1 : (d[0] < d[2] ? 0 : 2);
diff --git a/src/onmonitoritems/rotoscoping/rotowidget.cpp \
b/src/onmonitoritems/rotoscoping/rotowidget.cpp index 47a4763e2..01fe649cd 100644
--- a/src/onmonitoritems/rotoscoping/rotowidget.cpp
+++ b/src/onmonitoritems/rotoscoping/rotowidget.cpp
@@ -60,7 +60,7 @@ RotoWidget::RotoWidget(const QByteArray &data, Monitor *monitor, \
const ItemInfo //m_scene->cleanup();
// TODO: port to qml monitor scene
- /*m_item = new SplineItem(QList <BPoint>(), Q_NULLPTR, m_scene);
+ /*m_item = new SplineItem(QList<BPoint>(), Q_NULLPTR, m_scene);
connect(m_item, SIGNAL(changed(bool)), this, SLOT(slotUpdateData(bool)));
connect(m_scene, SIGNAL(addKeyframe()), this, SLOT(slotAddKeyframe()));
*/
@@ -93,7 +93,7 @@ void RotoWidget::slotSyncPosition(int relTimelinePos)
slotPositionChanged(relTimelinePos, false);
}
-void RotoWidget::slotUpdateData(int pos, const QList <BPoint> &spline)
+void RotoWidget::slotUpdateData(int pos, const QList<BPoint> &spline)
{
int width = m_monitor->render->frameRenderWidth();
int height = m_monitor->render->renderHeight();
@@ -101,17 +101,17 @@ void RotoWidget::slotUpdateData(int pos, const QList <BPoint> \
&spline) /*
* use the position of the on-monitor points to create a storable list
*/
- QList <QVariant> vlist;
+ QList<QVariant> vlist;
foreach (const BPoint &point, spline) {
- QList <QVariant> pl;
+ QList<QVariant> pl;
for (int i = 0; i < 3; ++i) {
- pl << QVariant(QList <QVariant>() << QVariant(point[i].x() / width) << \
QVariant(point[i].y() / height)); + pl << QVariant(QList<QVariant>() << \
QVariant(point[i].x() / width) << QVariant(point[i].y() / height)); }
vlist << QVariant(pl);
}
if (m_data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> map = m_data.toMap();
+ QMap<QString, QVariant> map = m_data.toMap();
// replace or insert at position
// we have to fill with 0s to maintain the correct order
map[QString::number((pos < 0 ? m_keyframeWidget->getPosition() : pos) + \
m_in).rightJustified(log10((double)m_out) + 1, '0')] = QVariant(vlist); @@ -130,7 \
+130,7 @@ void RotoWidget::slotUpdateData(int pos, const QList <BPoint> &spline)
void RotoWidget::slotUpdateDataPoints(const QVariantList &points, int pos)
{
- QList <BPoint> bPoints;
+ QList<BPoint> bPoints;
for (int i = 0; i < points.size() / 3; i++) {
BPoint b(points.at(3 * i).toPointF(), points.at(3 * i + 1).toPointF(), \
points.at(3 * i + 2).toPointF()); bPoints << b;
@@ -155,12 +155,12 @@ void RotoWidget::slotPositionChanged(int pos, bool seek)
pos += m_in;
- QList <BPoint> p;
+ QList<BPoint> p;
bool isKeyframe = false;
if (m_data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> map = m_data.toMap();
- QMap <QString, QVariant>::const_iterator i = map.constBegin();
+ QMap<QString, QVariant> map = m_data.toMap();
+ QMap<QString, QVariant>::const_iterator i = map.constBegin();
int keyframe1, keyframe2;
keyframe1 = keyframe2 = i.key().toInt();
// find keyframes next to pos
@@ -174,8 +174,8 @@ void RotoWidget::slotPositionChanged(int pos, bool seek)
* in between two keyframes
* -> interpolate
*/
- QList <BPoint> p1 = getPoints(keyframe1);
- QList <BPoint> p2 = getPoints(keyframe2);
+ QList<BPoint> p1 = getPoints(keyframe1);
+ QList<BPoint> p2 = getPoints(keyframe2);
qreal relPos = (pos - keyframe1) / (qreal)(keyframe2 - keyframe1 + 1);
// additionally points are ignored (same behavior as MLT filter)
@@ -227,12 +227,12 @@ void RotoWidget::slotPositionChanged(int pos, bool seek)
}
}
-QList <BPoint> RotoWidget::getPoints(int keyframe)
+QList<BPoint> RotoWidget::getPoints(int keyframe)
{
int width = m_monitor->render->frameRenderWidth();
int height = m_monitor->render->renderHeight();
- QList <BPoint> points;
- QList <QVariant> data;
+ QList<BPoint> points;
+ QList<QVariant> data;
if (keyframe >= 0) {
data = m_data.toMap()[QString::number(keyframe).rightJustified(log10((double)m_out) \
+ 1, '0')].toList(); } else {
@@ -245,7 +245,7 @@ QList <BPoint> RotoWidget::getPoints(int keyframe)
}
foreach (const QVariant &bpoint, data) {
- QList <QVariant> l = bpoint.toList();
+ QList<QVariant> l = bpoint.toList();
BPoint p;
for (int i = 0; i < 3; ++i) {
p[i] = QPointF(l.at(i).toList().at(0).toDouble() * width, \
l.at(i).toList().at(1).toDouble() * height); @@ -315,8 +315,8 @@ void \
RotoWidget::keyframeTimelineFullUpdate() {
if (m_data.canConvert(QVariant::Map)) {
QList<int> keyframes;
- QMap <QString, QVariant> map = m_data.toMap();
- QMap <QString, QVariant>::const_iterator i = map.constBegin();
+ QMap<QString, QVariant> map = m_data.toMap();
+ QMap<QString, QVariant>::const_iterator i = map.constBegin();
while (i != map.constEnd()) {
keyframes.append(i.key().toInt() - m_in);
++i;
diff --git a/src/onmonitoritems/rotoscoping/rotowidget.h \
b/src/onmonitoritems/rotoscoping/rotowidget.h index 70ea45f86..ad2afe67e 100644
--- a/src/onmonitoritems/rotoscoping/rotowidget.h
+++ b/src/onmonitoritems/rotoscoping/rotowidget.h
@@ -75,7 +75,7 @@ private:
* The points are brought from the range [0, 1] into project resolution space.
* This function does not do any interpolation and therfore will only return a \
list when a keyframe at the given postion exists.
* Set @param keyframe to -1 if only one keyframe currently exists. */
- QList <BPoint> getPoints(int keyframe);
+ QList<BPoint> getPoints(int keyframe);
/** @brief Adds tracking_finished as listener for "tracking-finished" event in \
MLT rotoscoping filter. */ void setupTrackingListen(const ItemInfo &info);
diff --git a/src/onmonitoritems/rotoscoping/splineitem.cpp \
b/src/onmonitoritems/rotoscoping/splineitem.cpp index c95fecbe4..383bc7695 100644
--- a/src/onmonitoritems/rotoscoping/splineitem.cpp
+++ b/src/onmonitoritems/rotoscoping/splineitem.cpp
@@ -101,9 +101,9 @@ void SplineItem::updateSpline(bool editing)
}
}
-QList <BPoint> SplineItem::getPoints() const
+QList<BPoint> SplineItem::getPoints() const
{
- QList <BPoint> points;
+ QList<BPoint> points;
foreach (QGraphicsItem *child, childItems()) {
points << qgraphicsitem_cast<BPointItem *>(child)->getPoint();
}
@@ -173,7 +173,7 @@ void SplineItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
} else {
bool close = false;
- QList <QGraphicsItem *> items = childItems();
+ QList<QGraphicsItem *> items = childItems();
if (items.count() > 1) {
BPointItem *bp = qgraphicsitem_cast<BPointItem *>(items.at(0));
int selectionType = bp->getSelection(mapToItem(bp, event->pos()));
@@ -243,7 +243,7 @@ int SplineItem::getClosestPointOnCurve(const QPointF &point, \
double *tFinal) qreal diff = 10000, param = 0;
BPoint p1, p2;
int curveSegment = 0;
- QList <QGraphicsItem *> items = childItems();
+ QList<QGraphicsItem *> items = childItems();
for (int i = 0; i < items.count(); ++i) {
int j = (i + 1) % items.count();
p1 = qgraphicsitem_cast<BPointItem *>(items.at(i))->getPoint();
diff --git a/src/onmonitoritems/rotoscoping/splineitem.h \
b/src/onmonitoritems/rotoscoping/splineitem.h index 4fd8cde33..fac6c2f2b 100644
--- a/src/onmonitoritems/rotoscoping/splineitem.h
+++ b/src/onmonitoritems/rotoscoping/splineitem.h
@@ -29,7 +29,7 @@ class SplineItem : public QObject, public QGraphicsPathItem
Q_OBJECT
public:
- explicit SplineItem(const QList <BPoint> &points, QGraphicsItem *parent = \
Q_NULLPTR, QGraphicsScene *scene = Q_NULLPTR); + explicit SplineItem(const \
QList<BPoint> &points, QGraphicsItem *parent = Q_NULLPTR, QGraphicsScene *scene = \
Q_NULLPTR);
enum { Type = UserType + 10 };
@@ -38,8 +38,8 @@ public:
bool editing() const;
void initSpline(QGraphicsScene *scene, const QList< BPoint > &points);
void updateSpline(bool editing = false);
- QList <BPoint> getPoints() const;
- void setPoints(const QList <BPoint> &points);
+ QList<BPoint> getPoints() const;
+ void setPoints(const QList<BPoint> &points);
void removeChild(QGraphicsItem *child);
diff --git a/src/project/clipmanager.cpp b/src/project/clipmanager.cpp
index ea2f58463..11a3857c6 100644
--- a/src/project/clipmanager.cpp
+++ b/src/project/clipmanager.cpp
@@ -321,7 +321,7 @@ QString ClipManager::groupsXml()
for (int i = 0; i < m_groupsList.count(); ++i) {
QDomElement group = doc.createElement(QStringLiteral("group"));
groups.appendChild(group);
- QList <QGraphicsItem *> children = m_groupsList.at(i)->childItems();
+ QList<QGraphicsItem *> children = m_groupsList.at(i)->childItems();
for (int j = 0; j < children.count(); ++j) {
if (children.at(j)->type() == AVWidget || children.at(j)->type() == \
TransitionWidget) {
AbstractClipItem *item = static_cast <AbstractClipItem \
*>(children.at(j)); @@ -348,7 +348,7 @@ void ClipManager::slotClipMissing(const \
QString &path) {
qCDebug(KDENLIVE_LOG) << "// CLIP: " << path << " WAS MISSING";
//TODO
- const QList <DocClipBase *> list = getClipByResource(path);
+ const QList<DocClipBase *> list = getClipByResource(path);
for (int i = 0; i < list.count(); ++i) {
DocClipBase *clip = list.at(i);
if (clip != Q_NULLPTR) emit missingClip(clip->getId());
@@ -359,7 +359,7 @@ void ClipManager::slotClipAvailable(const QString &path)
{
qCDebug(KDENLIVE_LOG) << "// CLIP: " << path << " WAS ADDED";
//TODO
- const QList <DocClipBase *> list = getClipByResource(path);
+ const QList<DocClipBase *> list = getClipByResource(path);
for (int i = 0; i < list.count(); ++i) {
DocClipBase *clip = list.at(i);
if (clip != Q_NULLPTR) emit availableClip(clip->getId());
diff --git a/src/project/clipmanager.h b/src/project/clipmanager.h
index bf508ea56..2652f46e9 100644
--- a/src/project/clipmanager.h
+++ b/src/project/clipmanager.h
@@ -96,15 +96,15 @@ private slots:
private: // Private attributes
/** @brief the list of groups in the document */
- QList <AbstractGroupItem *> m_groupsList;
+ QList<AbstractGroupItem *> m_groupsList;
QMap<QString, QString> m_folderList;
- QList <QString> m_audioThumbsQueue;
+ QList<QString> m_audioThumbsQueue;
/** the document undo stack*/
KdenliveDoc *m_doc;
/** List of the clip IDs that need to be reloaded after being externally \
modified */
- QMap <QString, QTime> m_modifiedClips;
+ QMap<QString, QTime> m_modifiedClips;
/** Struct containing the list of clip thumbnails to request (clip id and \
frames) */
- QMap <QString, int> m_requestedThumbs;
+ QMap<QString, int> m_requestedThumbs;
QMutex m_thumbsMutex;
QFuture<void> m_thumbsThread;
/** @brief The id of currently processed clip for thumbs creation. */
diff --git a/src/project/dialogs/archivewidget.cpp \
b/src/project/dialogs/archivewidget.cpp index 9eeae28df..caf725433 100644
--- a/src/project/dialogs/archivewidget.cpp
+++ b/src/project/dialogs/archivewidget.cpp
@@ -34,7 +34,7 @@
#include <QTreeWidget>
#include <QtConcurrent>
-ArchiveWidget::ArchiveWidget(const QString &projectName, const QDomDocument &doc, \
const QList <ClipController *> &list, const QStringList &luma_list, QWidget *parent) \
: +ArchiveWidget::ArchiveWidget(const QString &projectName, const QDomDocument &doc, \
const QList<ClipController *> &list, const QStringList &luma_list, QWidget *parent) : \
QDialog(parent) , m_requestedSize(0)
, m_copyJob(Q_NULLPTR)
diff --git a/src/project/dialogs/archivewidget.h \
b/src/project/dialogs/archivewidget.h index 1eb67e3fb..883ef4ace 100644
--- a/src/project/dialogs/archivewidget.h
+++ b/src/project/dialogs/archivewidget.h
@@ -48,7 +48,7 @@ class ArchiveWidget : public QDialog, public Ui::ArchiveWidget_UI
Q_OBJECT
public:
- ArchiveWidget(const QString &projectName, const QDomDocument &doc, const QList \
<ClipController *> &list, const QStringList &luma_list, QWidget *parent = Q_NULLPTR); \
+ ArchiveWidget(const QString &projectName, const QDomDocument &doc, const \
QList<ClipController *> &list, const QStringList &luma_list, QWidget *parent = \
Q_NULLPTR); // Constructor for extracting widget
explicit ArchiveWidget(const QUrl &url, QWidget *parent = Q_NULLPTR);
~ArchiveWidget();
@@ -81,8 +81,8 @@ protected:
private:
KIO::filesize_t m_requestedSize;
KIO::CopyJob *m_copyJob;
- QMap <QUrl, QUrl> m_duplicateFiles;
- QMap <QUrl, QUrl> m_replacementList;
+ QMap<QUrl, QUrl> m_duplicateFiles;
+ QMap<QUrl, QUrl> m_replacementList;
QString m_name;
QDomDocument m_doc;
QTemporaryFile *m_temp;
diff --git a/src/project/dialogs/profilewidget.cpp \
b/src/project/dialogs/profilewidget.cpp index 18f8d4c93..eafe20107 100644
--- a/src/project/dialogs/profilewidget.cpp
+++ b/src/project/dialogs/profilewidget.cpp
@@ -124,7 +124,7 @@ void ProfileWidget::loadProfile(QString profile)
m_listSDWide.clear();
m_listCustom.clear();
m_currentProfile = ProfilesDialog::getVideoProfile(profile);
- QList <MltVideoProfile> list = ProfilesDialog::profilesList();
+ QList<MltVideoProfile> list = ProfilesDialog::profilesList();
for (int i = 0; i < list.count(); i++) {
MltVideoProfile prof = list.at(i);
switch (prof.height) {
@@ -202,7 +202,7 @@ void ProfileWidget::loadProfile(QString profile)
updateList();
}
-QList <MltVideoProfile> ProfileWidget::getList(VIDEOSTD std)
+QList<MltVideoProfile> ProfileWidget::getList(VIDEOSTD std)
{
switch (std) {
case Std4KDCI:
@@ -250,7 +250,7 @@ void ProfileWidget::updateList()
currentFps = m_rate_list->currentText();
}
m_rate_list->clear();
- QList <MltVideoProfile> currentStd = getList(std);
+ QList<MltVideoProfile> currentStd = getList(std);
QStringList frameRates;
QString text;
for (int i = 0; i < currentStd.count(); i++) {
@@ -283,7 +283,7 @@ void ProfileWidget::updateList()
void ProfileWidget::ratesUpdated()
{
VIDEOSTD std = (VIDEOSTD) m_standard->currentData().toInt();
- QList <MltVideoProfile> currentStd = getList(std);
+ QList<MltVideoProfile> currentStd = getList(std);
// insert all frame sizes related to frame rate
m_customSize->clear();
m_customSize->addItems(getFrameSizes(currentStd, m_rate_list->currentText()));
@@ -297,7 +297,7 @@ void ProfileWidget::ratesUpdated()
updateDisplay();
}
-QStringList ProfileWidget::getFrameSizes(const QList <MltVideoProfile> ¤tStd, \
const QString &rate) +QStringList ProfileWidget::getFrameSizes(const \
QList<MltVideoProfile> ¤tStd, const QString &rate) {
QStringList sizes;
for (int i = 0; i < currentStd.count(); i++) {
@@ -327,7 +327,7 @@ void ProfileWidget::slotCheckInterlace()
updateDisplay();
}
-void ProfileWidget::checkInterlace(const QList <MltVideoProfile> ¤tStd, const \
QString &size, const QString &rate) +void ProfileWidget::checkInterlace(const \
QList<MltVideoProfile> ¤tStd, const QString &size, const QString &rate) {
bool allowInterlaced = false;
bool allowProgressive = false;
@@ -401,8 +401,8 @@ const QString ProfileWidget::selectedProfile() const
void ProfileWidget::updateDisplay()
{
VIDEOSTD std = (VIDEOSTD) m_standard->currentData().toInt();
- QList <MltVideoProfile> currentStd = getList(std);
- QList <MltVideoProfile> matching;
+ QList<MltVideoProfile> currentStd = getList(std);
+ QList<MltVideoProfile> matching;
QString rate = m_rate_list->currentText();
QString size = m_customSize->currentText();
bool interlaced = m_interlaced->isChecked();
@@ -475,7 +475,7 @@ void ProfileWidget::updateDisplay()
void ProfileWidget::selectProfile()
{
VIDEOSTD std = (VIDEOSTD) m_standard->currentData().toInt();
- QList <MltVideoProfile> currentStd = getList(std);
+ QList<MltVideoProfile> currentStd = getList(std);
QString rate = m_rate_list->currentText();
QString size = m_customSize->currentText();
QString display = m_display_list->currentText();
diff --git a/src/project/dialogs/profilewidget.h \
b/src/project/dialogs/profilewidget.h index 5ddbfcacb..e67e83188 100644
--- a/src/project/dialogs/profilewidget.h
+++ b/src/project/dialogs/profilewidget.h
@@ -47,15 +47,15 @@ private:
/** @brief currently selected's profile path */
MltVideoProfile m_currentProfile;
void slotUpdateInfoDisplay();
- QList <MltVideoProfile> m_list4KDCI;
- QList <MltVideoProfile> m_list4KWide;
- QList <MltVideoProfile> m_list4K;
- QList <MltVideoProfile> m_list2K;
- QList <MltVideoProfile> m_listFHD;
- QList <MltVideoProfile> m_listHD;
- QList <MltVideoProfile> m_listSD;
- QList <MltVideoProfile> m_listSDWide;
- QList <MltVideoProfile> m_listCustom;
+ QList<MltVideoProfile> m_list4KDCI;
+ QList<MltVideoProfile> m_list4KWide;
+ QList<MltVideoProfile> m_list4K;
+ QList<MltVideoProfile> m_list2K;
+ QList<MltVideoProfile> m_listFHD;
+ QList<MltVideoProfile> m_listHD;
+ QList<MltVideoProfile> m_listSD;
+ QList<MltVideoProfile> m_listSDWide;
+ QList<MltVideoProfile> m_listCustom;
QComboBox *m_standard;
QComboBox *m_rate_list;
QCheckBox *m_interlaced;
@@ -82,7 +82,7 @@ private:
void updateCombos();
QStringList getFrameSizes(const QList<MltVideoProfile> ¤tStd, const \
QString &rate);
void checkInterlace(const QList<MltVideoProfile> ¤tStd, const QString \
&size, const QString &rate);
- QList <MltVideoProfile> getList(VIDEOSTD std);
+ QList<MltVideoProfile> getList(VIDEOSTD std);
private slots:
/** @brief Open project profile management dialog. */
diff --git a/src/project/dialogs/projectsettings.cpp \
b/src/project/dialogs/projectsettings.cpp index a4942ccf9..7a5956429 100644
--- a/src/project/dialogs/projectsettings.cpp
+++ b/src/project/dialogs/projectsettings.cpp
@@ -241,7 +241,7 @@ void ProjectSettings::slotDeleteUnused()
QStringList toDelete;
//TODO
/*
- QList <DocClipBase*> list = m_projectList->documentClipList();
+ QList<DocClipBase*> list = m_projectList->documentClipList();
for (int i = 0; i < list.count(); ++i) {
DocClipBase *clip = list.at(i);
if (clip->numReferences() == 0 && clip->clipType() != SlideShow) {
@@ -281,7 +281,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly)
if (cacheOnly) {
return;
}
- QList <ClipController *> list = pCore->binController()->getControllerList();
+ QList<ClipController *> list = pCore->binController()->getControllerList();
files_list->clear();
// List all files that are used in the project. That also means:
diff --git a/src/project/dialogs/temporarydata.cpp \
b/src/project/dialogs/temporarydata.cpp index 1e2f84902..a72d36a1d 100644
--- a/src/project/dialogs/temporarydata.cpp
+++ b/src/project/dialogs/temporarydata.cpp
@@ -40,7 +40,7 @@ along with this program. If not, see \
<http://www.gnu.org/licenses/>. #include <QTreeWidget>
#include <QPushButton>
-static QList <QColor> chartColors;
+static QList<QColor> chartColors;
ChartWidget::ChartWidget(QWidget *parent) :
QWidget(parent)
diff --git a/src/project/dialogs/temporarydata.h \
b/src/project/dialogs/temporarydata.h index 3b3d305ee..859bcf219 100644
--- a/src/project/dialogs/temporarydata.h
+++ b/src/project/dialogs/temporarydata.h
@@ -108,8 +108,8 @@ private:
QGridLayout *m_grid;
qulonglong m_totalCurrent;
qulonglong m_totalGlobal;
- QList <qulonglong> mCurrentSizes;
- QList <qulonglong> mGlobalSizes;
+ QList<qulonglong> mCurrentSizes;
+ QList<qulonglong> mGlobalSizes;
QStringList m_globalDirectories;
QString m_processingDirectory;
QDir m_globalDir;
diff --git a/src/project/jobs/cutclipjob.cpp b/src/project/jobs/cutclipjob.cpp
index 278309472..babba2386 100644
--- a/src/project/jobs/cutclipjob.cpp
+++ b/src/project/jobs/cutclipjob.cpp
@@ -243,14 +243,14 @@ bool CutClipJob::isExclusive()
}
// static
-QList <ProjectClip *> CutClipJob::filterClips(const QList <ProjectClip *> &clips, \
const QStringList ¶ms) +QList<ProjectClip *> CutClipJob::filterClips(const \
QList<ProjectClip *> &clips, const QStringList ¶ms) {
QString condition;
if (params.count() > 3) {
// there is a condition for this job, for example operate only on \
vcodec=mpeg1video condition = params.at(3);
}
- QList <ProjectClip *> result;
+ QList<ProjectClip *> result;
for (int i = 0; i < clips.count(); i++) {
ProjectClip *clip = clips.at(i);
ClipType type = clip->clipType();
@@ -349,7 +349,7 @@ 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;
QString params = parameters.at(0);
@@ -428,7 +428,7 @@ 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);
diff --git a/src/project/jobs/cutclipjob.h b/src/project/jobs/cutclipjob.h
index ae3647245..2505790a7 100644
--- a/src/project/jobs/cutclipjob.h
+++ b/src/project/jobs/cutclipjob.h
@@ -50,8 +50,8 @@ public:
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 QList <ProjectClip *> filterClips(const QList<ProjectClip *> &clips, \
const QStringList ¶ms); + 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:
QString m_dest;
diff --git a/src/project/jobs/filterjob.cpp b/src/project/jobs/filterjob.cpp
index 9031a5c15..bb4d424ad 100644
--- a/src/project/jobs/filterjob.cpp
+++ b/src/project/jobs/filterjob.cpp
@@ -33,14 +33,14 @@
#include <mlt++/Mlt.h>
// static
-QList <ProjectClip *> FilterJob::filterClips(const QList <ProjectClip *> &clips, \
const QStringList ¶ms) +QList<ProjectClip *> FilterJob::filterClips(const \
QList<ProjectClip *> &clips, const QStringList ¶ms) {
QString condition;
if (params.count() > 3) {
// there is a condition for this job, for example operate only on \
vcodec=mpeg1video condition = params.at(3);
}
- QList <ProjectClip *> result;
+ QList<ProjectClip *> result;
for (int i = 0; i < clips.count(); i++) {
ProjectClip *clip = clips.at(i);
ClipType type = clip->clipType();
@@ -57,7 +57,7 @@ QList <ProjectClip *> FilterJob::filterClips(const QList \
<ProjectClip *> &clips, 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;
QStringList sources;
diff --git a/src/project/jobs/filterjob.h b/src/project/jobs/filterjob.h
index b20e35bbd..b83757cb2 100644
--- a/src/project/jobs/filterjob.h
+++ b/src/project/jobs/filterjob.h
@@ -32,8 +32,8 @@ 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 QList<ProjectClip \
*> filterClips(const QList<ProjectClip *> &clips, const QStringList ¶ms); + \
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 58cbbb85b..db8522e5c 100644
--- a/src/project/jobs/jobmanager.cpp
+++ b/src/project/jobs/jobmanager.cpp
@@ -112,7 +112,7 @@ void JobManager::slotCheckJobProcess()
{
if (!m_jobThreads.futures().isEmpty()) {
// Remove inactive threads
- QList <QFuture<void> > futures = m_jobThreads.futures();
+ QList<QFuture<void> > futures = m_jobThreads.futures();
m_jobThreads.clearFutures();
for (int i = 0; i < futures.count(); ++i)
if (!futures.at(i).isFinished()) {
@@ -232,7 +232,7 @@ void JobManager::slotProcessJobs()
QTimer::singleShot(200, this, &JobManager::checkJobProcess);
}
-QList <ProjectClip *> JobManager::filterClips(const QList <ProjectClip *> &clips, \
AbstractClipJob::JOBTYPE jobType, const QStringList ¶ms) +QList<ProjectClip *> \
JobManager::filterClips(const QList<ProjectClip *> &clips, AbstractClipJob::JOBTYPE \
jobType, const QStringList ¶ms) {
//TODO: filter depending on clip type
if (jobType == AbstractClipJob::TRANSCODEJOB || jobType == \
AbstractClipJob::CUTJOB) { @@ -242,7 +242,7 @@ QList <ProjectClip *> \
JobManager::filterClips(const QList <ProjectClip *> &clips } else if (jobType == \
AbstractClipJob::PROXYJOB) { return ProxyJob::filterClips(clips);
}
- return QList <ProjectClip *> ();
+ return QList<ProjectClip *> ();
}
void JobManager::prepareJobFromTimeline(ProjectClip *clip, const QMap<QString, \
QString> &producerParams, const QMap<QString, QString> &filterParams, const \
QMap<QString, QString> &consumerParams, const QMap<QString, QString> &extraParams) @@ \
-255,7 +255,7 @@ void JobManager::prepareJobFromTimeline(ProjectClip *clip, const \
QMap<QString, Q void JobManager::prepareJobs(const QList<ProjectClip *> &clips, \
double fps, AbstractClipJob::JOBTYPE jobType, const QStringList ¶ms) {
//TODO filter clips
- QList <ProjectClip *> matching = filterClips(clips, jobType, params);
+ QList<ProjectClip *> matching = filterClips(clips, jobType, params);
if (matching.isEmpty()) {
m_bin->doDisplayMessage(i18n("No valid clip to process"), \
KMessageWidget::Information); return;
diff --git a/src/project/jobs/jobmanager.h b/src/project/jobs/jobmanager.h
index da1fb61b1..c7079d59f 100644
--- a/src/project/jobs/jobmanager.h
+++ b/src/project/jobs/jobmanager.h
@@ -73,7 +73,7 @@ public:
* @param jobType the jobtype requested
* @param type the parameters for the job
*/
- void prepareJobs(const QList <ProjectClip *> &clips, double fps, \
AbstractClipJob::JOBTYPE jobType, const QStringList ¶ms = QStringList()); + \
void prepareJobs(const QList<ProjectClip *> &clips, double fps, \
AbstractClipJob::JOBTYPE jobType, const QStringList ¶ms = QStringList());
/** @brief Filter a list of selected clips to keep only those that match the job \
type
* @param clips the list of selected clips
@@ -81,7 +81,7 @@ public:
* @param type the parameters for the job, might be relevant to filter clips
* @returns A QMap list (id, urls) of clip that match the job type
*/
- QList <ProjectClip *> filterClips(const QList<ProjectClip *> &clips, \
AbstractClipJob::JOBTYPE jobType, const QStringList ¶ms); + QList<ProjectClip \
*> filterClips(const QList<ProjectClip *> &clips, AbstractClipJob::JOBTYPE jobType, \
const QStringList ¶ms);
/** @brief Put the job in our queue.
* @param clip the clip to whom the job will be applied
@@ -112,7 +112,7 @@ private:
/** @brief Mutex preventing thread issues. */
QMutex m_jobMutex;
/** @brief Holds a list of active jobs. */
- QList <AbstractClipJob *> m_jobList;
+ QList<AbstractClipJob *> m_jobList;
/** @brief Holds the threads running a job. */
QFutureSynchronizer<void> m_jobThreads;
/** @brief Set to true to trigger abortion of all jobs. */
diff --git a/src/project/jobs/proxyclipjob.cpp b/src/project/jobs/proxyclipjob.cpp
index 6a13cdf04..9c161ea24 100644
--- a/src/project/jobs/proxyclipjob.cpp
+++ b/src/project/jobs/proxyclipjob.cpp
@@ -286,9 +286,9 @@ const QString ProxyJob::statusMessage()
}
// static
-QList <ProjectClip *> ProxyJob::filterClips(const QList <ProjectClip *> &clips)
+QList<ProjectClip *> ProxyJob::filterClips(const QList<ProjectClip *> &clips)
{
- QList <ProjectClip *> result;
+ QList<ProjectClip *> result;
for (int i = 0; i < clips.count(); i++) {
ProjectClip *clip = clips.at(i);
ClipType type = clip->clipType();
@@ -302,7 +302,7 @@ 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;
QSize renderSize = bin->getRenderSize();
diff --git a/src/project/jobs/proxyclipjob.h b/src/project/jobs/proxyclipjob.h
index c6e96af37..ae916e5f1 100644
--- a/src/project/jobs/proxyclipjob.h
+++ b/src/project/jobs/proxyclipjob.h
@@ -39,8 +39,8 @@ public:
stringMap cancelProperties() Q_DECL_OVERRIDE;
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 QList<ProjectClip *> filterClips(const \
QList<ProjectClip *> &clips); + static QHash <ProjectClip *, AbstractClipJob *> \
prepareJob(Bin *bin, const QList<ProjectClip *> &clips);
private:
QString m_dest;
diff --git a/src/project/projectcommands.cpp b/src/project/projectcommands.cpp
index afa102feb..90ac1aec4 100644
--- a/src/project/projectcommands.cpp
+++ b/src/project/projectcommands.cpp
@@ -151,7 +151,7 @@ void EditFolderCommand::redo()
//if (m_doIt) m_view->slotAddFolder(m_name, m_id, false, true);
}
-AddMarkerCommand::AddMarkerCommand(ProjectClip *clip, QList <CommentedTime> \
&oldMarkers, QList <CommentedTime> &newMarkers, QUndoCommand *parent) : \
+AddMarkerCommand::AddMarkerCommand(ProjectClip *clip, QList<CommentedTime> \
&oldMarkers, QList<CommentedTime> &newMarkers, QUndoCommand *parent) : \
QUndoCommand(parent), m_clip(clip),
m_oldMarkers(oldMarkers),
diff --git a/src/project/projectcommands.h b/src/project/projectcommands.h
index 4aecbcfc7..5959274c3 100644
--- a/src/project/projectcommands.h
+++ b/src/project/projectcommands.h
@@ -90,13 +90,13 @@ private:
class AddMarkerCommand : public QUndoCommand
{
public:
- AddMarkerCommand(ProjectClip *clip, QList <CommentedTime> &oldMarkers, QList \
<CommentedTime> &newMarkers, QUndoCommand *parent = Q_NULLPTR); + \
AddMarkerCommand(ProjectClip *clip, QList<CommentedTime> &oldMarkers, \
QList<CommentedTime> &newMarkers, QUndoCommand *parent = Q_NULLPTR); void undo() \
Q_DECL_OVERRIDE; void redo() Q_DECL_OVERRIDE;
private:
ProjectClip *m_clip;
- QList <CommentedTime> m_oldMarkers;
- QList <CommentedTime> m_newMarkers;
+ QList<CommentedTime> m_oldMarkers;
+ QList<CommentedTime> m_newMarkers;
};
#endif
diff --git a/src/project/projectmanager.cpp b/src/project/projectmanager.cpp
index ccbc07514..1a55381dd 100644
--- a/src/project/projectmanager.cpp
+++ b/src/project/projectmanager.cpp
@@ -188,7 +188,7 @@ void ProjectManager::newFile(bool showProjectSettings, bool \
force) doc->m_autosave = new KAutoSaveFile(startFile, doc);
bool ok;
pCore->bin()->setDocument(doc);
- QList <QAction *> rulerActions;
+ QList<QAction *> rulerActions;
rulerActions << \
pCore->window()->actionCollection()->action(QStringLiteral("set_render_timeline_zone"));
rulerActions << \
pCore->window()->actionCollection()->action(QStringLiteral("unset_render_timeline_zone"));
m_trackView = new Timeline(doc, \
pCore->window()->kdenliveCategoryMap.value(QStringLiteral("timeline"))->actions(), \
rulerActions, &ok, pCore->window()); @@ -540,7 +540,7 @@ void \
ProjectManager::doOpenFile(const QUrl &url, KAutoSaveFile *stale) \
m_progressDialog->setLabelText(i18n("Loading clips")); \
pCore->bin()->setDocument(doc);
- QList <QAction *> rulerActions;
+ QList<QAction *> rulerActions;
rulerActions << \
pCore->window()->actionCollection()->action(QStringLiteral("set_render_timeline_zone"));
rulerActions << \
pCore->window()->actionCollection()->action(QStringLiteral("unset_render_timeline_zone"));
rulerActions << \
pCore->window()->actionCollection()->action(QStringLiteral("clear_render_timeline_zone"));
diff --git a/src/project/transitionsettings.h b/src/project/transitionsettings.h
index ba805140a..d70e8da76 100644
--- a/src/project/transitionsettings.h
+++ b/src/project/transitionsettings.h
@@ -46,7 +46,7 @@ private:
GenTime m_transitionDuration;
GenTime m_transitionStart;
int m_autoTrackTransition;
- QList <TrackInfo> m_tracks;
+ QList<TrackInfo> m_tracks;
void updateTrackList();
protected:
diff --git a/src/qt-oauth-lib/oauth2.cpp b/src/qt-oauth-lib/oauth2.cpp
index bb05f3ea1..17adc2be6 100644
--- a/src/qt-oauth-lib/oauth2.cpp
+++ b/src/qt-oauth-lib/oauth2.cpp
@@ -238,7 +238,7 @@ void OAuth2::serviceRequestFinished(QNetworkReply *reply)
QVariant data = doc.toVariant();
if (data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> map = data.toMap();
+ QMap<QString, QVariant> map = data.toMap();
if (map.contains(QStringLiteral("access_token"))) {
m_strAccessToken = \
map.value(QStringLiteral("access_token")).toString();
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 3018d9460..972a3bd85 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1193,7 +1193,7 @@ void Render::unlockService(Mlt::Tractor *tractor)
service.unlock();
}
-void Render::mltInsertSpace(const QMap <int, int> &trackClipStartList, const QMap \
<int, int> &trackTransitionStartList, int track, const GenTime &duration, const \
GenTime &timeOffset) +void Render::mltInsertSpace(const QMap<int, int> \
&trackClipStartList, const QMap<int, int> &trackTransitionStartList, int track, const \
GenTime &duration, const GenTime &timeOffset) {
if (!m_mltProducer) {
//qCDebug(KDENLIVE_LOG) << "PLAYLIST NOT INITIALISED //////";
@@ -1466,9 +1466,9 @@ void Render::fillSlowMotionProducers()
}
//Updates all transitions
-QList <TransitionInfo> Render::mltInsertTrack(int ix, const QString &name, bool \
videoTrack) +QList<TransitionInfo> Render::mltInsertTrack(int ix, const QString \
&name, bool videoTrack) {
- QList <TransitionInfo> transitionInfos;
+ QList<TransitionInfo> transitionInfos;
// Track add / delete was only added recently in MLT (pre 0.9.8 release).
#if (LIBMLT_VERSION_INT < 0x0908)
Q_UNUSED(ix)
@@ -1480,7 +1480,7 @@ QList <TransitionInfo> Render::mltInsertTrack(int ix, const \
QString &name, bool Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) {
qCWarning(KDENLIVE_LOG) << "// TRACTOR PROBLEM";
- return QList <TransitionInfo> ();
+ return QList<TransitionInfo> ();
}
blockSignals(true);
service.lock();
diff --git a/src/renderer.h b/src/renderer.h
index f24701cdc..431c433ce 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -191,9 +191,9 @@ Q_OBJECT public:
int mltGetSpaceLength(const GenTime &pos, int track, bool fromBlankStart);
bool mltResizeClipCrop(const ItemInfo &info, GenTime newCropStart);
- QList <TransitionInfo> mltInsertTrack(int ix, const QString &name, bool \
videoTrack); + QList<TransitionInfo> mltInsertTrack(int ix, const QString &name, \
bool videoTrack);
- //const QList <Mlt::Producer *> producersList();
+ //const QList<Mlt::Producer *> producersList();
void setDropFrames(bool show);
/** @brief Sets an MLT consumer property. */
void setConsumerProperty(const QString &name, const QString &value);
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index aadacfe59..ae237d44b 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -139,7 +139,7 @@ void StatusBarMessageLabel::setMessage(const QString &text, \
MessageType type, in }
if (item.type == ProcessingJobMessage) {
// This is a job progress info, discard previous ones
- QList <StatusBarMessageItem> cleanList;
+ QList<StatusBarMessageItem> cleanList;
foreach (const StatusBarMessageItem &msg, m_messageQueue) {
if (msg.type != ProcessingJobMessage) {
cleanList << msg;
diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp
index 226839e40..736facada 100644
--- a/src/stopmotion/stopmotion.cpp
+++ b/src/stopmotion/stopmotion.cpp
@@ -226,7 +226,7 @@ StopmotionWidget::StopmotionWidget(MonitorManager *manager, const \
QUrl &projectF effectsMenu->addAction(brightEffect);
effectsMenu->addAction(invertEffect);
effectsMenu->addAction(thresEffect);
- QList <QAction *> list = effectsMenu->actions();
+ QList<QAction *> list = effectsMenu->actions();
for (int i = 0; i < list.count(); ++i) {
list.at(i)->setCheckable(true);
if (list.at(i)->data().toInt() == m_effectIndex) {
diff --git a/src/timeline/abstractclipitem.cpp b/src/timeline/abstractclipitem.cpp
index 166496699..adcc4a0a6 100644
--- a/src/timeline/abstractclipitem.cpp
+++ b/src/timeline/abstractclipitem.cpp
@@ -101,7 +101,7 @@ bool AbstractClipItem::isAttachedToEnd() const
return m_keyframeView.activeKeyframe == m_keyframeView.attachToEnd;
}
-QAction *AbstractClipItem::parseKeyframeActions(const QList <QAction *> &list)
+QAction *AbstractClipItem::parseKeyframeActions(const QList<QAction *> &list)
{
return m_keyframeView.parseKeyframeActions(list);
}
@@ -244,7 +244,7 @@ void AbstractClipItem::resizeEnd(int posx, bool /*emitChange*/)
setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
if (durationDiff > GenTime()) {
- QList <QGraphicsItem *> collisionList = \
collidingItems(Qt::IntersectsItemBoundingRect); + QList<QGraphicsItem *> \
collisionList = collidingItems(Qt::IntersectsItemBoundingRect); bool fixItem = \
false; for (int i = 0; i < collisionList.size(); ++i) {
if (!collisionList.at(i)->isEnabled()) {
diff --git a/src/timeline/abstractgroupitem.cpp b/src/timeline/abstractgroupitem.cpp
index d205af478..34024f4f2 100644
--- a/src/timeline/abstractgroupitem.cpp
+++ b/src/timeline/abstractgroupitem.cpp
@@ -479,7 +479,7 @@ void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent \
*event)
// User want to do a rectangle selection, so ignore the event to pass it to \
the view event->ignore();
} else {
- QList <QGraphicsItem *>list = scene()->items(event->scenePos());
+ QList<QGraphicsItem *>list = scene()->items(event->scenePos());
// only allow group move if we click over an item in the group
foreach (const QGraphicsItem *item, list) {
if (item->type() == TransitionWidget || item->type() == AVWidget) {
@@ -514,7 +514,7 @@ void AbstractGroupItem::mouseMoveEvent(QGraphicsSceneMouseEvent \
*event)
void AbstractGroupItem::resizeStart(int diff)
{
- QList <QGraphicsItem *> children = childItems();
+ QList<QGraphicsItem *> children = childItems();
for (int i = 0; i < children.count(); ++i) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
if (item && item->type() == AVWidget) {
@@ -526,7 +526,7 @@ void AbstractGroupItem::resizeStart(int diff)
void AbstractGroupItem::resizeEnd(int diff)
{
- QList <QGraphicsItem *> children = childItems();
+ QList<QGraphicsItem *> children = childItems();
for (int i = 0; i < children.count(); ++i) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
if (item && item->type() == AVWidget) {
@@ -538,7 +538,7 @@ void AbstractGroupItem::resizeEnd(int diff)
GenTime AbstractGroupItem::duration() const
{
- QList <QGraphicsItem *> children = childItems();
+ QList<QGraphicsItem *> children = childItems();
GenTime start = GenTime(-1.0);
GenTime end = GenTime();
for (int i = 0; i < children.count(); ++i) {
@@ -561,7 +561,7 @@ GenTime AbstractGroupItem::duration() const
GenTime AbstractGroupItem::startPos() const
{
- QList <QGraphicsItem *> children = childItems();
+ QList<QGraphicsItem *> children = childItems();
GenTime start = GenTime(-1.0);
for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() != GroupWidget) {
@@ -591,10 +591,10 @@ QGraphicsItem *AbstractGroupItem::otherClip(QGraphicsItem \
*item) }
}
-QList <AbstractClipItem *> AbstractGroupItem::childClips() const
+QList<AbstractClipItem *> AbstractGroupItem::childClips() const
{
- QList <AbstractClipItem *> childClips;
- QList <QGraphicsItem *>children = childItems();
+ QList<AbstractClipItem *> childClips;
+ QList<QGraphicsItem *>children = childItems();
for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() != GroupWidget) {
AbstractClipItem *item = static_cast <AbstractClipItem \
*>(children.at(i));
diff --git a/src/timeline/abstractgroupitem.h b/src/timeline/abstractgroupitem.h
index fb96d15f4..6bc6416e6 100644
--- a/src/timeline/abstractgroupitem.h
+++ b/src/timeline/abstractgroupitem.h
@@ -45,7 +45,7 @@ public:
QPainterPath transitionGroupShape(const QPointF &offset) const;
void setItemLocked(bool locked);
bool isItemLocked() const;
- QList <AbstractClipItem *> childClips() const;
+ QList<AbstractClipItem *> childClips() const;
// ItemInfo info() const;
/** @brief Resizes all clips in this group from start.
diff --git a/src/timeline/clipitem.cpp b/src/timeline/clipitem.cpp
index 3b578406a..d77106b6e 100644
--- a/src/timeline/clipitem.cpp
+++ b/src/timeline/clipitem.cpp
@@ -868,8 +868,8 @@ void ClipItem::paint(QPainter *painter,
// draw markers
//TODO:
if (isEnabled()) {
- QList < CommentedTime > markers = m_binClip->commentedSnapMarkers();
- QList < CommentedTime >::Iterator it = markers.begin();
+ QList< CommentedTime > markers = m_binClip->commentedSnapMarkers();
+ QList< CommentedTime >::Iterator it = markers.begin();
GenTime pos;
double framepos;
QBrush markerBrush(QColor(120, 120, 0, 140));
@@ -1055,9 +1055,9 @@ void ClipItem::resetFrameWidth(int width)
update();
}
-QList <GenTime> ClipItem::snapMarkers(const QList < GenTime > &markers) const
+QList<GenTime> ClipItem::snapMarkers(const QList< GenTime > &markers) const
{
- QList < GenTime > snaps;
+ QList< GenTime > snaps;
GenTime pos;
for (int i = 0; i < markers.size(); ++i) {
@@ -1073,13 +1073,13 @@ QList <GenTime> ClipItem::snapMarkers(const QList < GenTime > \
&markers) const return snaps;
}
-QList <CommentedTime> ClipItem::commentedSnapMarkers() const
+QList<CommentedTime> ClipItem::commentedSnapMarkers() const
{
- QList < CommentedTime > snaps;
+ QList< CommentedTime > snaps;
if (!m_binClip) {
return snaps;
}
- QList < CommentedTime > markers = m_binClip->commentedSnapMarkers();
+ QList< CommentedTime > markers = m_binClip->commentedSnapMarkers();
GenTime pos;
for (int i = 0; i < markers.size(); ++i) {
@@ -1960,7 +1960,7 @@ bool ClipItem::updateNormalKeyframes(QDomElement parameter, \
const ItemInfo &oldI bool keyFrameUpdated = false;
const QStringList data = \
parameter.attribute(QStringLiteral("keyframes")).split(';', \
QString::SkipEmptyParts);
- QMap <int, double> keyframes;
+ QMap<int, double> keyframes;
foreach (const QString &keyframe, data) {
int keyframepos = keyframe.section('=', 0, 0).toInt();
// if keyframe was at clip start, update it
diff --git a/src/timeline/clipitem.h b/src/timeline/clipitem.h
index a8ddf0a42..535892450 100644
--- a/src/timeline/clipitem.h
+++ b/src/timeline/clipitem.h
@@ -125,8 +125,8 @@ public:
/** @brief Gets clip's marker times.
* @return A list of the times. */
- QList <GenTime> snapMarkers(const QList<GenTime> &markers) const;
- QList <CommentedTime> commentedSnapMarkers() const;
+ QList<GenTime> snapMarkers(const QList<GenTime> &markers) const;
+ QList<CommentedTime> commentedSnapMarkers() const;
/** @brief Gets the position of the fade in effect. */
int fadeIn() const;
@@ -232,7 +232,7 @@ private:
int m_strobe;
EffectsList m_effectList;
- QList <Transition *> m_transitionsList;
+ QList<Transition *> m_transitionsList;
QMap<int, QPixmap> m_audioThumbCachePic;
bool m_audioThumbReady;
double m_framePixelWidth;
diff --git a/src/timeline/customtrackscene.cpp b/src/timeline/customtrackscene.cpp
index 3fa27cf8c..0e1571478 100644
--- a/src/timeline/customtrackscene.cpp
+++ b/src/timeline/customtrackscene.cpp
@@ -54,7 +54,7 @@ double CustomTrackScene::getSnapPointForPos(double pos, bool \
doSnap) return GenTime(pos, m_timeline->fps()).frames(m_timeline->fps());
}
-void CustomTrackScene::setSnapList(const QList <GenTime> &snaps)
+void CustomTrackScene::setSnapList(const QList<GenTime> &snaps)
{
m_snapPoints = snaps;
}
diff --git a/src/timeline/customtrackscene.h b/src/timeline/customtrackscene.h
index a90d3061d..9eb599836 100644
--- a/src/timeline/customtrackscene.h
+++ b/src/timeline/customtrackscene.h
@@ -42,7 +42,7 @@ class CustomTrackScene : public QGraphicsScene
public:
explicit CustomTrackScene(Timeline *timeline, QObject *parent = Q_NULLPTR);
~CustomTrackScene();
- void setSnapList(const QList <GenTime> &snaps);
+ void setSnapList(const QList<GenTime> &snaps);
GenTime previousSnapPoint(const GenTime &pos) const;
GenTime nextSnapPoint(const GenTime &pos) const;
double getSnapPointForPos(double pos, bool doSnap = true);
@@ -58,7 +58,7 @@ private:
Timeline *m_timeline;
QPointF m_scale;
TimelineMode::EditMode m_editMode;
- QList <GenTime> m_snapPoints;
+ QList<GenTime> m_snapPoints;
};
#endif
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index b44dd8aac..4499eca17 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -260,7 +260,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu \
*clip, QMenu *transi m_markerMenu->setEnabled(false);
markermenu->addMenu(m_markerMenu);
connect(m_markerMenu, &QMenu::triggered, this, \
&CustomTrackView::slotGoToMarker);
- QList <QAction *> list = m_timelineContextClipMenu->actions();
+ QList<QAction *> list = m_timelineContextClipMenu->actions();
for (int i = 0; i < list.count(); ++i) {
if (list.at(i)->data().toString() == QLatin1String("paste_effects")) {
m_pasteEffectsAction = list.at(i);
@@ -750,7 +750,7 @@ int CustomTrackView::spaceToolSelectTrackOnly(int track, \
QList<QGraphicsItem *>
GenTime CustomTrackView::createGroupForSelectedItems(QList<QGraphicsItem *> \
&selection) {
- QList <GenTime> offsetList;
+ QList<GenTime> offsetList;
// create group to hold selected items
m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
@@ -786,7 +786,7 @@ GenTime \
CustomTrackView::createGroupForSelectedItems(QList<QGraphicsItem *> &sel \
m_selectionMutex.unlock(); if (!offsetList.isEmpty()) {
qSort(offsetList);
- QList <GenTime> cleandOffsetList;
+ QList<GenTime> cleandOffsetList;
GenTime startOffset = offsetList.takeFirst();
for (int k = 0; k < offsetList.size(); ++k) {
GenTime newoffset = offsetList.at(k) - startOffset;
@@ -1041,7 +1041,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent *event)
// Handle ctrl click events
resetSelectionGroup();
m_dragItem->setSelected(selected);
- groupSelectedItems(QList <QGraphicsItem *>(), false, true);
+ groupSelectedItems(QList<QGraphicsItem *>(), false, true);
if (selected) {
m_selectionMutex.lock();
if (m_selectionGroup) {
@@ -1137,7 +1137,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent *event)
}
} else {
m_selectionMutex.lock();
- QList <GenTime> offsetList;
+ QList<GenTime> offsetList;
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == AVWidget || children.at(i)->type() == \
TransitionWidget) { @@ -1149,7 +1149,7 @@ void \
CustomTrackView::mousePressEvent(QMouseEvent *event) if (!offsetList.isEmpty()) {
qSort(offsetList);
GenTime startOffset = offsetList.takeFirst();
- QList <GenTime> cleandOffsetList;
+ QList<GenTime> cleandOffsetList;
for (int k = 0; k < offsetList.size(); ++k) {
GenTime newoffset = offsetList.at(k) - startOffset;
if (newoffset != GenTime() && !cleandOffsetList.contains(newoffset)) \
{ @@ -1290,7 +1290,7 @@ void CustomTrackView::rebuildGroup(AbstractGroupItem *group)
if (group == m_selectionGroup) {
m_selectionGroup = Q_NULLPTR;
}
- QList <QGraphicsItem *> children = group->childItems();
+ QList<QGraphicsItem *> children = group->childItems();
m_document->clipManager()->removeGroup(group);
for (int i = 0; i < children.count(); ++i) {
group->removeFromGroup(children.at(i));
@@ -1329,7 +1329,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems)
}
}
-GenTime CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool \
createNewGroup, bool selectNewGroup) +GenTime \
CustomTrackView::groupSelectedItems(QList<QGraphicsItem *> selection, bool \
createNewGroup, bool selectNewGroup) {
QMutexLocker lock(&m_selectionMutex);
if (m_selectionGroup) {
@@ -1688,7 +1688,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, \
AbstractClipItem *clip) //build go to marker menu
ClipController *controller = \
m_document->getClipController(item->getBinId()); if (controller) {
- QList <CommentedTime> markers = controller->commentedSnapMarkers();
+ QList<CommentedTime> markers = controller->commentedSnapMarkers();
int offset = (item->startPos() - \
item->cropStart()).frames(m_document->fps()); if (!markers.isEmpty()) {
for (int i = 0; i < markers.count(); ++i) {
@@ -1847,7 +1847,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, \
const QPoint &pos)
connect(item, &AbstractClipItem::selectItem, this, \
&CustomTrackView::slotSelectItem); m_selectionGroup->addItem(item);
- QList <GenTime> offsetList;
+ QList<GenTime> offsetList;
offsetList.append(info.endPos);
updateSnapPoints(Q_NULLPTR, offsetList);
@@ -1857,8 +1857,8 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, \
const QPoint &pos) m_selectionGroup->setSelected(true);
} else if (data->hasFormat(QStringLiteral("kdenlive/producerslist"))) {
QStringList ids = \
QString(data->data(QStringLiteral("kdenlive/producerslist"))).split(';');
- QList <GenTime> offsetList;
- QList <ItemInfo> infoList;
+ QList<GenTime> offsetList;
+ QList<ItemInfo> infoList;
GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps());
framePos.setX((int)(framePos.x() + 0.5));
framePos.setY(getPositionFromTrack(track));
@@ -3247,28 +3247,28 @@ void CustomTrackView::dropEvent(QDropEvent *event)
m_scene->clearSelection();
QUndoCommand *addCommand = new QUndoCommand();
addCommand->setText(i18n("Add timeline clip"));
- QList <ClipItem *> brokenClips;
+ QList<ClipItem *> brokenClips;
// Add refresh command for undo
RefreshMonitorCommand *firstRefresh = new RefreshMonitorCommand(this, \
ItemInfo(), false, true, addCommand); for (int i = 0; i < items.count(); ++i) {
m_scene->removeItem(items.at(i));
}
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
if (m_scene->editMode() == TimelineMode::InsertEdit) {
- cutTimeline(startPos.frames(m_document->fps()), QList <ItemInfo>(), \
QList <ItemInfo>(), addCommand); + \
cutTimeline(startPos.frames(m_document->fps()), QList<ItemInfo>(), QList<ItemInfo>(), \
addCommand); ItemInfo info;
info.startPos = startPos;
info.cropDuration = duration;
- new AddSpaceCommand(this, info, QList <ItemInfo>(), true, addCommand);
+ new AddSpaceCommand(this, info, QList<ItemInfo>(), true, addCommand);
} else if (m_scene->editMode() == TimelineMode::OverwriteEdit) {
// Should we really overwrite all unlocked tracks ? If not we need to \
calculate the track for audio split first
- extractZone(QPoint(startPos.frames(m_document->fps()), (startPos + \
duration).frames(m_document->fps())), false, QList <ItemInfo>(), addCommand); + \
extractZone(QPoint(startPos.frames(m_document->fps()), (startPos + \
duration).frames(m_document->fps())), false, QList<ItemInfo>(), addCommand); /*for \
(int i = 0; i < items.count(); ++i) { if (items.at(i)->type() != AVWidget)
continue;
ItemInfo info = items.at(i)->info();
- extractZone(QPoint(info.startPos.frames(m_document->fps()), \
(info.startPos+info.cropDuration).frames(m_document->fps())), false, QList \
<ItemInfo>(), addCommand, info.track); + \
extractZone(QPoint(info.startPos.frames(m_document->fps()), \
(info.startPos+info.cropDuration).frames(m_document->fps())), false, \
QList<ItemInfo>(), addCommand, info.track); }*/
}
ItemInfo info;
@@ -3342,7 +3342,7 @@ void CustomTrackView::dropEvent(QDropEvent *event)
setFocus();
}
-void CustomTrackView::cutTimeline(int cutPos, const QList <ItemInfo> &excludedClips, \
const 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) {
@@ -3413,7 +3413,7 @@ void CustomTrackView::cutTimeline(int cutPos, const QList \
<ItemInfo> &excludedCl }
}
-void CustomTrackView::extractZone(QPoint z, bool closeGap, const 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) {
@@ -3474,7 +3474,7 @@ void CustomTrackView::extractZone(QPoint z, bool closeGap, \
const QList <ItemInfo
breakLockedGroups(clipsToMove, transitionsToMove, masterCommand);
}
}
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
RefreshMonitorCommand *firstRefresh = new RefreshMonitorCommand(this, \
ItemInfo(), false, true, masterCommand); for (int i = 0; i < selection.count(); ++i) \
{ if (!selection.at(i)->isEnabled()) {
@@ -3690,7 +3690,7 @@ void CustomTrackView::addTrack(const TrackInfo &type, int ix)
{
clearSelection();
emit transitionItemSelected(Q_NULLPTR);
- QList <TransitionInfo> transitionInfos;
+ QList<TransitionInfo> transitionInfos;
if (ix == -1 || ix > m_timeline->tracksCount()) {
ix = m_timeline->tracksCount() + 1;
}
@@ -3833,7 +3833,7 @@ void CustomTrackView::removeTrack(int ix)
loadGroups(groups);
}
-void CustomTrackView::configTracks(const QList < TrackInfo > &trackInfos)
+void CustomTrackView::configTracks(const QList< TrackInfo > &trackInfos)
{
//TODO: fix me, use UNDO/REDO
for (int i = 0; i < trackInfos.count(); ++i) {
@@ -3877,7 +3877,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool \
requestUpdate)
bool changeGroupLock = true;
bool hasClipOnTrack = false;
- QList <QGraphicsItem *> children = selection.at(i)->childItems();
+ QList<QGraphicsItem *> children = selection.at(i)->childItems();
for (int j = 0; j < children.count(); ++j) {
if (children.at(j)->isSelected()) {
if (children.at(j)->type() == AVWidget) {
@@ -4012,7 +4012,7 @@ void CustomTrackView::slotRemoveSpace(bool multiTrack)
}
}
createGroupForSelectedItems(selection);
- QList <AbstractClipItem *> items;
+ QList<AbstractClipItem *> items;
foreach (QGraphicsItem *item, selection) {
if (item->type() == AVWidget || item->type() == TransitionWidget) {
items << (AbstractClipItem *) item;
@@ -4071,7 +4071,7 @@ void CustomTrackView::slotInsertSpace()
completeSpaceOperation(track, spaceDuration, true);
}
-void CustomTrackView::insertTimelineSpace(GenTime startPos, GenTime duration, int \
track, const QList <ItemInfo> &excludeList) +void \
CustomTrackView::insertTimelineSpace(GenTime startPos, GenTime duration, int track, \
const QList<ItemInfo> &excludeList) {
int pos = startPos.frames(m_document->fps());
QRectF rect;
@@ -4122,8 +4122,8 @@ void CustomTrackView::insertSpace(const QList<ItemInfo> \
&clipsToMove, const QLis scene()->addItem(m_selectionGroup);
// Create lists with start pos for each track
- QMap <int, int> trackClipStartList;
- QMap <int, int> trackTransitionStartList;
+ QMap<int, int> trackClipStartList;
+ QMap<int, int> trackTransitionStartList;
for (int i = 1; i < m_timeline->tracksCount() + 1; ++i) {
trackClipStartList[i] = -1;
@@ -4208,7 +4208,7 @@ void CustomTrackView::deleteClip(const QString &clipId, \
QUndoCommand *deleteComm resetSelectionGroup();
QList<QGraphicsItem *> itemList = items();
int count = 0;
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
RefreshMonitorCommand *firstRefresh = new RefreshMonitorCommand(this, \
ItemInfo(), false, true, deleteCommand); for (int i = 0; i < itemList.count(); ++i) \
{ if (itemList.at(i)->type() == AVWidget) {
@@ -4316,7 +4316,7 @@ void CustomTrackView::scrollToStart()
void CustomTrackView::completeSpaceOperation(int track, GenTime &timeOffset, bool \
fromStart) {
- QList <AbstractGroupItem *> groups;
+ QList<AbstractGroupItem *> groups;
if (timeOffset != GenTime()) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
@@ -4325,8 +4325,8 @@ void CustomTrackView::completeSpaceOperation(int track, GenTime \
&timeOffset, boo QList<ItemInfo> transitionsToMove;
// Create lists with start pos for each track
- QMap <int, int> trackClipStartList;
- QMap <int, int> trackTransitionStartList;
+ QMap<int, int> trackClipStartList;
+ QMap<int, int> trackTransitionStartList;
for (int i = 1; i < m_timeline->tracksCount() + 1; ++i) {
trackClipStartList[i] = -1;
@@ -4471,13 +4471,13 @@ void CustomTrackView::deleteSelectedClips()
int clipCount = 0;
int transitionCount = 0;
// expand & destroy groups
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == GroupWidget) {
groupCount++;
QList<QGraphicsItem *> children = itemList.at(i)->childItems();
- QList <ItemInfo> clipInfos;
- QList <ItemInfo> transitionInfos;
+ QList<ItemInfo> clipInfos;
+ QList<ItemInfo> transitionInfos;
for (int j = 0; j < children.count(); ++j) {
if (children.at(j)->type() == AVWidget) {
AbstractClipItem *clip = static_cast <AbstractClipItem \
*>(children.at(j)); @@ -4611,13 +4611,13 @@ void \
CustomTrackView::cutSelectedClips(QList<QGraphicsItem *> itemList, GenTime void \
CustomTrackView::razorGroup(AbstractGroupItem *group, GenTime cutPos) {
if (group) {
- QList <QGraphicsItem *> children = group->childItems();
+ QList<QGraphicsItem *> children = group->childItems();
QUndoCommand *command = new QUndoCommand;
command->setText(i18n("Cut Group"));
groupClips(false, children, false, command);
- QList <ItemInfo> clips1, transitions1;
- QList <ItemInfo> transitionsCut;
- QList <ItemInfo> clips2, transitions2;
+ QList<ItemInfo> clips1, transitions1;
+ QList<ItemInfo> transitionsCut;
+ QList<ItemInfo> clips2, transitions2;
QVector <QGraphicsItem *> clipsToCut;
// Collect info
@@ -4675,8 +4675,8 @@ void CustomTrackView::groupClips(bool group, \
QList<QGraphicsItem *> itemList, bo if (itemList.isEmpty()) {
itemList = scene()->selectedItems();
}
- QList <ItemInfo> clipInfos;
- QList <ItemInfo> transitionInfos;
+ QList<ItemInfo> clipInfos;
+ QList<ItemInfo> transitionInfos;
QList<QGraphicsItem *> existingGroups;
// Expand groups
@@ -4693,7 +4693,7 @@ void CustomTrackView::groupClips(bool group, \
QList<QGraphicsItem *> itemList, bo itemList += grp->childItems();
}
}
- QList <AbstractClipItem *> processedClips;
+ QList<AbstractClipItem *> processedClips;
for (int i = 0; i < itemList.count(); ++i) {
if (itemList.at(i)->type() == AVWidget) {
AbstractClipItem *clip = static_cast <AbstractClipItem \
*>(itemList.at(i)); @@ -4718,9 +4718,9 @@ void CustomTrackView::groupClips(bool \
group, QList<QGraphicsItem *> itemList, bo }
for (int i = 0; group && i < existingGroups.count(); ++i) {
AbstractGroupItem *grp = static_cast <AbstractGroupItem \
*>(existingGroups.at(i));
- QList <ItemInfo> clipGrpInfos;
- QList <ItemInfo> transitionGrpInfos;
- QList <QGraphicsItem *> items = grp->childItems();
+ QList<ItemInfo> clipGrpInfos;
+ QList<ItemInfo> transitionGrpInfos;
+ QList<QGraphicsItem *> items = grp->childItems();
for (int j = 0; j < items.count(); ++j) {
if (items.at(j)->type() == AVWidget) {
AbstractClipItem *clip = static_cast <AbstractClipItem \
*>(items.at(j)); @@ -4765,7 +4765,7 @@ void CustomTrackView::groupClips(bool group, \
QList<QGraphicsItem *> itemList, bo }
}
-void CustomTrackView::doGroupClips(const QList <ItemInfo> &clipInfos, const QList \
<ItemInfo> &transitionInfos, bool group) +void CustomTrackView::doGroupClips(const \
QList<ItemInfo> &clipInfos, const QList<ItemInfo> &transitionInfos, bool group) {
resetSelectionGroup();
m_scene->clearSelection();
@@ -4805,7 +4805,7 @@ void CustomTrackView::doGroupClips(const QList <ItemInfo> \
&clipInfos, const QLis }
return;
}
- QList <QGraphicsItem *>list;
+ QList<QGraphicsItem *>list;
for (int i = 0; i < clipInfos.count(); ++i) {
ClipItem *clip = getClipItemAtStart(clipInfos.at(i).startPos, \
clipInfos.at(i).track); if (clip && !list.contains(clip)) {
@@ -4931,7 +4931,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, \
bool reload) {
QMutexLocker locker(&m_mutex);
QList<QGraphicsItem *> list = scene()->items();
- QList <ClipItem *>clipList;
+ QList<ClipItem *>clipList;
ClipItem *clip = Q_NULLPTR;
//TODO: move the track replacement code in track.cpp
Mlt::Tractor *tractor = m_document->renderer()->lockService();
@@ -5145,7 +5145,7 @@ bool CustomTrackView::moveClip(const ItemInfo &start, const \
ItemInfo &end, bool qCDebug(KDENLIVE_LOG) << end;
#endif
bool success = m_timeline->moveClip(start.track, start.startPos.seconds(), \
end.track, end.startPos.seconds(), item->clipState(), m_scene->editMode(), \
item->needsDuplicate());
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
if (item->hasVisibleVideo()) {
range << start << end;
} else {
@@ -5205,7 +5205,7 @@ void CustomTrackView::moveGroup(QList<ItemInfo> startClip, \
QList<ItemInfo> start m_selectionMutex.lock();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
m_document->renderer()->blockSignals(true);
for (int i = 0; i < startClip.count(); ++i) {
if (reverseMove) {
@@ -5287,12 +5287,12 @@ void CustomTrackView::moveGroup(QList<ItemInfo> startClip, \
QList<ItemInfo> start }
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- QList <AbstractGroupItem *> groupList;
+ QList<AbstractGroupItem *> groupList;
// Expand groups
int max = children.count();
for (int i = 0; i < max; ++i) {
if (children.at(i)->type() == GroupWidget) {
- QList <QGraphicsItem *> groupChildren = \
children.at(i)->childItems(); + QList<QGraphicsItem *> groupChildren = \
children.at(i)->childItems(); for (int j = 0; j < groupChildren.count(); j++) {
AbstractClipItem *item = static_cast<AbstractClipItem \
*>(groupChildren.at(j)); ItemInfo nfo = item->info();
@@ -5416,7 +5416,7 @@ void CustomTrackView::moveTransition(const ItemInfo &start, \
const ItemInfo &end,
emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p);
}
if (refresh) {
- monitorRefresh(QList <ItemInfo>() << start << end, true);
+ monitorRefresh(QList<ItemInfo>() << start << end, true);
}
}
@@ -5841,9 +5841,9 @@ double CustomTrackView::getSnapPointForPos(double pos)
return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints());
}
-void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList <GenTime> \
offsetList, bool skipSelectedItems) +void \
CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList<GenTime> \
offsetList, bool skipSelectedItems) {
- QList <GenTime> snaps;
+ QList<GenTime> snaps;
if (selected && offsetList.isEmpty()) {
offsetList.append(selected->cropDuration());
}
@@ -6050,9 +6050,9 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
goMenu->setEnabled(!m_guides.isEmpty());
}
-QMap <double, QString> CustomTrackView::guidesData() const
+QMap<double, QString> CustomTrackView::guidesData() const
{
- QMap <double, QString> data;
+ QMap<double, QString> data;
for (int i = 0; i < m_guides.count(); ++i) {
data.insert(m_guides.at(i)->position().seconds(), m_guides.at(i)->label());
}
@@ -6399,7 +6399,7 @@ void CustomTrackView::initSearchStrings()
m_searchPoints.append(t);
// add all clip markers
ClipController *controller = \
m_document->getClipController(item->getBinId());
- QList < CommentedTime > markers = controller->commentedSnapMarkers();
+ QList< CommentedTime > markers = controller->commentedSnapMarkers();
m_searchPoints += markers;
}
}
@@ -6486,7 +6486,7 @@ bool CustomTrackView::canBePastedTo(const ItemInfo &info, int \
type, const QList< return true;
}
-bool CustomTrackView::canBePastedTo(const QList <ItemInfo> &infoList, int type) \
const +bool CustomTrackView::canBePastedTo(const QList<ItemInfo> &infoList, int type) \
const {
QPainterPath path;
for (int i = 0; i < infoList.count(); ++i) {
@@ -6502,7 +6502,7 @@ bool CustomTrackView::canBePastedTo(const QList <ItemInfo> \
&infoList, int type) return true;
}
-bool CustomTrackView::canBePasted(const QList<AbstractClipItem *> &items, GenTime \
offset, int trackOffset, QList <AbstractClipItem *>excluded) const +bool \
CustomTrackView::canBePasted(const QList<AbstractClipItem *> &items, GenTime offset, \
int trackOffset, QList<AbstractClipItem *>excluded) const {
excluded << items;
for (int i = 0; i < items.count(); ++i) {
@@ -6572,7 +6572,7 @@ void CustomTrackView::pasteClip()
QUndoCommand *pasteClips = new QUndoCommand();
pasteClips->setText(QStringLiteral("Paste clips"));
RefreshMonitorCommand *firstRefresh = new RefreshMonitorCommand(this, \
ItemInfo(), false, true, pasteClips);
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
for (int i = 0; i < m_copiedItems.count(); ++i) {
// parse all clip names
if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWidget) {
@@ -6826,7 +6826,7 @@ void CustomTrackView::setInPoint()
// Resizing a group
QUndoCommand *resizeCommand = new QUndoCommand();
resizeCommand->setText(i18n("Resize group"));
- QList <QGraphicsItem *> items = parent->childItems();
+ QList<QGraphicsItem *> items = parent->childItems();
GenTime min = parent->startPos();
GenTime max = min;
for (int i = 0; i < items.count(); ++i) {
@@ -6886,7 +6886,7 @@ void CustomTrackView::setOutPoint()
// Resizing a group
QUndoCommand *resizeCommand = new QUndoCommand();
resizeCommand->setText(i18n("Resize group"));
- QList <QGraphicsItem *> items = parent->childItems();
+ QList<QGraphicsItem *> items = parent->childItems();
GenTime min = parent->startPos() + parent->duration();
GenTime max = min;
for (int i = 0; i < items.count(); ++i) {
@@ -7119,11 +7119,11 @@ void CustomTrackView::deleteTimelineTrack(int ix, const \
TrackInfo &trackinfo) }
for (int i = 0; i < groupsToProceed.count(); i++) {
AbstractGroupItem *grp = static_cast<AbstractGroupItem \
*>(groupsToProceed.at(i));
- QList <QGraphicsItem *> items = grp->childItems();
- QList <ItemInfo> clipGrpInfos;
- QList <ItemInfo> transitionGrpInfos;
- QList <ItemInfo> newClipGrpInfos;
- QList <ItemInfo> newTransitionGrpInfos;
+ QList<QGraphicsItem *> items = grp->childItems();
+ QList<ItemInfo> clipGrpInfos;
+ QList<ItemInfo> transitionGrpInfos;
+ QList<ItemInfo> newClipGrpInfos;
+ QList<ItemInfo> newTransitionGrpInfos;
for (int j = 0; j < items.count(); ++j) {
if (items.at(j)->type() == AVWidget) {
AbstractClipItem *clip = static_cast <AbstractClipItem \
*>(items.at(j)); @@ -7150,7 +7150,7 @@ void CustomTrackView::deleteTimelineTrack(int \
ix, const TrackInfo &trackinfo) }
RefreshMonitorCommand *firstRefresh = new RefreshMonitorCommand(this, \
ItemInfo(), false, true, deleteTrack); // Delete all clips in selected track
- QList <ItemInfo> ranges;
+ QList<ItemInfo> ranges;
for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == AVWidget) {
ClipItem *item = static_cast <ClipItem *>(selection.at(i));
@@ -7248,7 +7248,7 @@ void CustomTrackView::loadGroups(const QDomNodeList &groups)
for (int i = 0; i < groups.count(); ++i) {
QDomNodeList children = groups.at(i).childNodes();
scene()->clearSelection();
- QList <QGraphicsItem *>list;
+ QList<QGraphicsItem *>list;
for (int nodeindex = 0; nodeindex < children.count(); ++nodeindex) {
QDomElement elem = children.item(nodeindex).toElement();
int track = elem.attribute(QStringLiteral("track")).toInt();
@@ -7519,7 +7519,7 @@ bool CustomTrackView::doSplitAudio(const GenTime &pos, int \
track, int destTrack, videoIx++;
}
}
- groupSelectedItems(QList <QGraphicsItem *>() << clip << audioClip, \
true); + groupSelectedItems(QList<QGraphicsItem *>() << clip << \
audioClip, true); }
}
} else {
@@ -7610,18 +7610,18 @@ void CustomTrackView::disableClip()
}
QUndoCommand *videoCommand = new QUndoCommand();
videoCommand->setText(i18n("Disable clip"));
- QList <ItemInfo> range;
+ QList<ItemInfo> range;
// Expand groups
for (int i = 0; i < selection.count(); ++i) {
if (selection.at(i)->type() == GroupWidget) {
- QList <QGraphicsItem *>children = selection.at(i)->childItems();
+ QList<QGraphicsItem *>children = selection.at(i)->childItems();
foreach (QGraphicsItem *item, children) {
if (!selection.contains(item)) {
selection << item;
}
}
} else if (selection.at(i)->parentItem() && \
!selection.contains(selection.at(i)->parentItem())) {
- QList <QGraphicsItem *>children = \
selection.at(i)->parentItem()->childItems(); + QList<QGraphicsItem \
*>children = selection.at(i)->parentItem()->childItems(); foreach (QGraphicsItem \
*item, children) { if (!selection.contains(item)) {
selection << item;
@@ -7652,7 +7652,7 @@ void CustomTrackView::disableClip()
monitorRefresh(range, true);
}
-void CustomTrackView::monitorRefresh(const QList <ItemInfo> &range, bool \
invalidateRange) +void CustomTrackView::monitorRefresh(const QList<ItemInfo> &range, \
bool invalidateRange) {
bool refreshMonitor = false;
for (int i = 0; i < range.count(); i++) {
@@ -7764,7 +7764,7 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip)
hasAV = false;
m_clipTypeGroup->setEnabled(false);
}
- QList <QAction *> actions = m_clipTypeGroup->actions();
+ QList<QAction *> actions = m_clipTypeGroup->actions();
for (int i = 0; i < actions.count(); ++i) {
if (actions.at(i)->data().toInt() == clip->clipState()) {
actions.at(i)->setChecked(true);
@@ -8134,11 +8134,11 @@ int CustomTrackView::insertZone(TimelineMode::EditMode \
sceneMode, const QString addCommand->setText(i18n("Insert clip"));
if (sceneMode == TimelineMode::OverwriteEdit) {
// We clear the selected zone in all non locked tracks
- extractZone(QPoint(timelineZone.x(), info.endPos.frames(m_document->fps())), \
false, QList <ItemInfo>(), addCommand); + extractZone(QPoint(timelineZone.x(), \
info.endPos.frames(m_document->fps())), false, QList<ItemInfo>(), addCommand); } \
else { // Cut and move clips forward
- cutTimeline(timelineZone.x(), QList <ItemInfo>(), QList <ItemInfo>(), \
addCommand);
- new AddSpaceCommand(this, info, QList <ItemInfo>(), true, addCommand);
+ cutTimeline(timelineZone.x(), QList<ItemInfo>(), QList<ItemInfo>(), \
addCommand); + new AddSpaceCommand(this, info, QList<ItemInfo>(), true, \
addCommand); }
if (KdenliveSettings::splitaudio()) {
if (extractVideo) {
@@ -8397,7 +8397,7 @@ void CustomTrackView::slotReplaceTimelineProducer(const QString \
&id) {
Mlt::Producer *prod = m_document->renderer()->getBinProducer(id);
Mlt::Producer *videoProd = m_document->renderer()->getBinVideoProducer(id);
- QList <Track::SlowmoInfo> allSlows;
+ QList<Track::SlowmoInfo> allSlows;
for (int i = 1; i < m_timeline->tracksCount(); i++) {
allSlows << m_timeline->track(i)->getSlowmotionInfos(id);
}
@@ -8405,7 +8405,7 @@ void CustomTrackView::slotReplaceTimelineProducer(const QString \
&id) QString url = prod->get("resource");
// generate all required slowmo producers
QStringList processedUrls;
- QMap <QString, Mlt::Producer *> newSlowMos;
+ QMap<QString, Mlt::Producer *> newSlowMos;
for (int i = 0; i < allSlows.count(); i++) {
// find out speed and strobe values
Track::SlowmoInfo info = allSlows.at(i);
@@ -8425,7 +8425,7 @@ void CustomTrackView::slotReplaceTimelineProducer(const QString \
&id) slowProd->set("id", producerid.toUtf8().constData());
newSlowMos.insert(info.toString(locale), slowProd);
}
- QList <ItemInfo> toUpdate;
+ QList<ItemInfo> toUpdate;
for (int i = 1; i < m_timeline->tracksCount(); i++) {
toUpdate << m_timeline->track(i)->replaceAll(id, prod, videoProd, \
newSlowMos); }
@@ -8790,7 +8790,7 @@ void CustomTrackView::dropClipGeometry(ClipItem *clip, const \
QString &geometry)
void CustomTrackView::breakLockedGroups(const QList<ItemInfo> &clipsToMove, const \
QList<ItemInfo> &transitionsToMove, QUndoCommand *masterCommand, bool doIt) {
- QList <AbstractGroupItem *> processedGroups;
+ QList<AbstractGroupItem *> processedGroups;
for (int i = 0; i < clipsToMove.count(); ++i) {
ClipItem *clip = getClipItemAtStart(clipsToMove.at(i).startPos, \
clipsToMove.at(i).track); if (clip == Q_NULLPTR || !clip->parentItem()) {
@@ -8985,7 +8985,7 @@ bool CustomTrackView::rippleClip(ClipItem *clip, int diff)
QList<QGraphicsItem *> selection;
spaceToolSelectTrackOnly(clip->track(), selection, clip->endPos());
createGroupForSelectedItems(selection);
- QList <AbstractClipItem *> items;
+ QList<AbstractClipItem *> items;
foreach (QGraphicsItem *item, selection) {
if (item->type() == AVWidget || item->type() == TransitionWidget) {
items << (AbstractClipItem *) item;
@@ -8993,7 +8993,7 @@ bool CustomTrackView::rippleClip(ClipItem *clip, int diff)
}
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- QList <AbstractClipItem *> excluded;
+ QList<AbstractClipItem *> excluded;
excluded << clip;
if (canBePasted(items, timeOffset, 0, excluded)) {
m_selectionGroup->setTransform(QTransform::fromTranslate(diff, 0), true);
diff --git a/src/timeline/customtrackview.h b/src/timeline/customtrackview.h
index 972a1dff4..8ea2010c2 100644
--- a/src/timeline/customtrackview.h
+++ b/src/timeline/customtrackview.h
@@ -231,7 +231,7 @@ public:
GenTime createGroupForSelectedItems(QList<QGraphicsItem *> &selection);
void resetSelectionGroup(bool selectItems = true);
/** @brief Returns all infos necessary to save guides. */
- QMap <double, QString> guidesData() const;
+ QMap<double, QString> guidesData() const;
/** @brief Reset scroll bar to 0. */
void scrollToStart();
/** @brief Returns a track index (in MLT values) from an y position in timeline. \
*/ @@ -265,7 +265,7 @@ public:
void switchTrackLock();
void switchAllTrackLock();
/** @brief Insert space in timeline. track = -1 means all tracks */
- void insertTimelineSpace(GenTime startPos, GenTime duration, int track = -1, \
const QList<ItemInfo> &excludeList = QList <ItemInfo>()); + void \
insertTimelineSpace(GenTime startPos, GenTime duration, int track = -1, const \
QList<ItemInfo> &excludeList = QList<ItemInfo>()); void trimMode(bool enable, int \
ripplePos = -1); /** @brief Returns a clip from timeline
* @param pos the end time position
@@ -321,7 +321,7 @@ public:
* @param cutPos The absolute position of the cut */
void razorGroup(AbstractGroupItem *group, GenTime cutPos);
void reloadTrack(const ItemInfo &info, bool includeLastFrame);
- GenTime groupSelectedItems(QList <QGraphicsItem *> selection = QList \
<QGraphicsItem *>(), bool createNewGroup = false, bool selectNewGroup = false); + \
GenTime groupSelectedItems(QList<QGraphicsItem *> selection = QList<QGraphicsItem \
*>(), bool createNewGroup = false, bool selectNewGroup = false); void sortGuides();
void initTools();
AbstractToolManager *toolManager(AbstractToolManager::ToolManagerType trimType);
@@ -396,7 +396,7 @@ public slots:
* @param selected The currently selected clip if any
* @param offsetList The list of points that should also snap (for example when \
movin a clip, start and end points should snap
* @param skipSelectedItems if true, the selected item start and end points will \
not be added to snap list */
- void updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList = \
QList <GenTime> (), bool skipSelectedItems = false); + 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>()); @@ -409,7 \
+409,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, const 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 */
@@ -458,11 +458,11 @@ private:
QColor m_tipColor;
QPen m_tipPen;
QPoint m_clickEvent;
- QList <CommentedTime> m_searchPoints;
- QList <Guide *> m_guides;
+ QList<CommentedTime> m_searchPoints;
+ QList<Guide *> m_guides;
QColor m_selectedTrackColor;
QColor m_lockedTrackColor;
- QMap <AbstractToolManager::ToolManagerType, AbstractToolManager *> \
m_toolManagers; + QMap<AbstractToolManager::ToolManagerType, AbstractToolManager \
*> m_toolManagers; AbstractToolManager *m_currentToolManager;
/** @brief Returns a clip from timeline
@@ -498,8 +498,8 @@ private:
QAction *m_disableClipAction;
QAction *m_editGuide;
QAction *m_deleteGuide;
- QList <QAction *> m_audioActions;
- QList <QAction *> m_avActions;
+ QList<QAction *> m_audioActions;
+ QList<QAction *> m_avActions;
QActionGroup *m_clipTypeGroup;
bool m_clipDrag;
@@ -523,7 +523,7 @@ private:
void updatePositionEffects(ClipItem *item, const ItemInfo &info, bool standalone \
= true); bool insertDropClips(const QMimeData *data, 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; + bool canBePasted(const QList<AbstractClipItem *> &items, GenTime offset, \
int trackOffset, QList<AbstractClipItem *>excluded = QList<AbstractClipItem *>()) \
const; ClipItem *getClipUnderCursor() const;
AbstractClipItem *getMainActiveClip() const;
/** Get available space for clip move (min and max free positions) */
diff --git a/src/timeline/effectmanager.cpp b/src/timeline/effectmanager.cpp
index 826ca9f42..94b9cc296 100644
--- a/src/timeline/effectmanager.cpp
+++ b/src/timeline/effectmanager.cpp
@@ -73,7 +73,7 @@ bool EffectManager::addEffect(const EffectsParameterList ¶ms, \
int duration) bool updateIndex = false;
const int filter_ix = params.paramValue(QStringLiteral("kdenlive_ix")).toInt();
int ct = 0;
- QList <Mlt::Filter *> filters;
+ QList<Mlt::Filter *> filters;
m_producer.lock();
Mlt::Filter *filter = m_producer.filter(ct);
while (filter) {
@@ -107,7 +107,7 @@ bool EffectManager::addEffect(const EffectsParameterList ¶ms, \
int duration) }
// temporarily remove all effects after insert point
- QList <Mlt::Filter *> filtersList;
+ QList<Mlt::Filter *> filtersList;
ct = 0;
filter = m_producer.filter(ct);
while (filter) {
@@ -296,7 +296,7 @@ bool EffectManager::editEffect(const EffectsParameterList \
¶ms, int duration, }
ct = 0;
QString ser = filter->get("mlt_service");
- QList <Mlt::Filter *> filtersList;
+ QList<Mlt::Filter *> filtersList;
m_producer.lock();
if (ser != tag) {
// Effect service changes, delete effect and re-add it
@@ -351,7 +351,7 @@ bool EffectManager::removeEffect(int effectIndex, bool \
updateIndex) int ct = 0;
bool success = false;
Mlt::Filter *filter = m_producer.filter(ct);
- QList <Mlt::Filter *> filters;
+ QList<Mlt::Filter *> filters;
while (filter) {
filters << filter;
if ((effectIndex == -1 && strcmp(filter->get("kdenlive_id"), "")) || \
filter->get_int("kdenlive_ix") == effectIndex) { @@ -406,8 +406,8 @@ bool \
EffectManager::enableEffects(const QList<int> &effectIndexes, bool disable, bool \
EffectManager::moveEffect(int oldPos, int newPos) {
int ct = 0;
- QList <Mlt::Filter *> filtersList;
- QList <Mlt::Filter *> toDelete;
+ QList<Mlt::Filter *> filtersList;
+ QList<Mlt::Filter *> toDelete;
Mlt::Filter *filter = m_producer.filter(ct);
if (newPos > oldPos) {
bool found = false;
diff --git a/src/timeline/headertrack.cpp b/src/timeline/headertrack.cpp
index bb9a7b907..ea8c3d69b 100644
--- a/src/timeline/headertrack.cpp
+++ b/src/timeline/headertrack.cpp
@@ -35,7 +35,7 @@
#include <QDomDocument>
#include <QMimeData>
-HeaderTrack::HeaderTrack(const TrackInfo &info, const QList <QAction *> &actions, \
Track *parent, int height, QWidget *parentWidget) : +HeaderTrack::HeaderTrack(const \
TrackInfo &info, const QList<QAction *> &actions, Track *parent, int height, QWidget \
*parentWidget) : QWidget(parentWidget),
isTarget(false),
m_type(info.type),
diff --git a/src/timeline/headertrack.h b/src/timeline/headertrack.h
index 1f52b7ad6..fe04f0464 100644
--- a/src/timeline/headertrack.h
+++ b/src/timeline/headertrack.h
@@ -34,7 +34,7 @@ class HeaderTrack : public QWidget, public Ui::TrackHeader_UI
Q_OBJECT
public:
- HeaderTrack(const TrackInfo &info, const QList <QAction *> &actions, Track \
*parent, int height, QWidget *parentWidget); + HeaderTrack(const TrackInfo &info, \
const QList<QAction *> &actions, Track *parent, int height, QWidget *parentWidget); \
virtual ~HeaderTrack(); bool isTarget;
void setLock(bool lock);
diff --git a/src/timeline/keyframeview.cpp b/src/timeline/keyframeview.cpp
index 3f730bdc0..a19672cdc 100644
--- a/src/timeline/keyframeview.cpp
+++ b/src/timeline/keyframeview.cpp
@@ -249,7 +249,7 @@ void KeyframeView::drawKeyFrames(const QRectF &br, int length, \
bool active, QPai painter->restore();
}
-void KeyframeView::drawKeyFrameChannels(const QRectF &br, int in, int out, QPainter \
*painter, const QList <QPoint> &maximas, int limitKeyframes, const QColor &textColor) \
+void KeyframeView::drawKeyFrameChannels(const QRectF &br, int in, int out, QPainter \
*painter, const QList<QPoint> &maximas, int limitKeyframes, const QColor &textColor) \
{ double frameFactor = (double)(out - in) / br.width();
int offset = 1;
@@ -723,7 +723,7 @@ void KeyframeView::removeKeyframe(int frame)
m_keyAnim = m_keyProperties.get_animation(m_inTimeline.toUtf8().constData());
}
-QAction *KeyframeView::parseKeyframeActions(const QList <QAction *> &actions)
+QAction *KeyframeView::parseKeyframeActions(const QList<QAction *> &actions)
{
mlt_keyframe_type type = m_keyAnim.keyframe_type(activeKeyframe);
@@ -807,9 +807,9 @@ const QString KeyframeView::serialize(const QString &name, bool \
rectAnimation) return result.join(QStringLiteral(";"));
}
-QList <QPoint> KeyframeView::loadKeyframes(const QString &data)
+QList<QPoint> KeyframeView::loadKeyframes(const QString &data)
{
- QList <QPoint> result;
+ QList<QPoint> result;
m_keyframeType = NoKeyframe;
m_inTimeline = QStringLiteral("imported");
m_keyProperties.set(m_inTimeline.toUtf8().constData(), \
data.toUtf8().constData());
diff --git a/src/timeline/keyframeview.h b/src/timeline/keyframeview.h
index 0db983f91..9b6217c87 100644
--- a/src/timeline/keyframeview.h
+++ b/src/timeline/keyframeview.h
@@ -80,7 +80,7 @@ public:
void addDefaultKeyframe(ProfileInfo profile, int frame, mlt_keyframe_type type);
const QString serialize(const QString &name = QString(), bool rectAnimation = \
false);
/** @brief Loads a rect animation and returns minimas/maximas for x,y,w,h **/
- QList <QPoint> loadKeyframes(const QString &data);
+ QList<QPoint> loadKeyframes(const QString &data);
bool loadKeyframes(const QLocale &locale, const QDomElement &e, int cropStart, \
int length); void reset();
/** @brief Draw the keyframes of a clip
@@ -132,7 +132,7 @@ private:
double max;
QString defaultValue;
};
- QMap <QString, ParameterInfo> m_paramInfos;
+ QMap<QString, ParameterInfo> m_paramInfos;
signals:
void updateKeyframes(const QRectF &r = QRectF());
diff --git a/src/timeline/managers/movemanager.cpp \
b/src/timeline/managers/movemanager.cpp index b2cf3cb8c..1a6e4251a 100644
--- a/src/timeline/managers/movemanager.cpp
+++ b/src/timeline/managers/movemanager.cpp
@@ -103,15 +103,15 @@ void MoveManager::mouseRelease(QMouseEvent *, GenTime pos)
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Move clip"));
if (item->hasVisibleVideo()) {
- new RefreshMonitorCommand(m_view, QList <ItemInfo>() << info << \
m_dragItemInfo, false, true, moveCommand); + new \
RefreshMonitorCommand(m_view, QList<ItemInfo>() << info << m_dragItemInfo, false, \
true, moveCommand); }
- QList <ItemInfo> excluded;
+ QList<ItemInfo> excluded;
excluded << info;
item->setItemLocked(true);
//item->setEnabled(false);
ItemInfo initialClip = m_dragItemInfo;
if (m_view->sceneEditMode() == TimelineMode::InsertEdit) {
- m_view->cutTimeline(info.startPos.frames(m_view->fps()), \
excluded, QList <ItemInfo>(), moveCommand, info.track); + \
m_view->cutTimeline(info.startPos.frames(m_view->fps()), excluded, QList<ItemInfo>(), \
moveCommand, info.track);
new AddSpaceCommand(m_view, info, excluded, true, moveCommand, \
true); bool isLastClip = m_view->isLastClip(info);
if (!isLastClip && info.track == m_dragItemInfo.track && \
info.startPos < m_dragItemInfo.startPos) { @@ -266,11 +266,11 @@ void \
MoveManager::mouseRelease(QMouseEvent *, GenTime pos) }
bool refresh = item->hasVisibleVideo();
if (refresh) {
- new RefreshMonitorCommand(m_view, QList <ItemInfo>() << info << \
m_dragItemInfo, false, false, moveCommand); + new \
RefreshMonitorCommand(m_view, QList<ItemInfo>() << info << m_dragItemInfo, false, \
false, moveCommand); }
m_commandStack->push(moveCommand);
if (refresh) {
- m_view->monitorRefresh(QList <ItemInfo>() << info << \
m_dragItemInfo, true); + m_view->monitorRefresh(QList<ItemInfo>() \
<< info << m_dragItemInfo, true); }
item = m_view->getClipItemAtStart(info.startPos, info.track, \
info.endPos); if (item) {
@@ -302,7 +302,7 @@ void MoveManager::mouseRelease(QMouseEvent *, GenTime pos)
m_view->updateTrackDuration(m_dragItemInfo.track, moveCommand);
}
m_commandStack->push(moveCommand);
- m_view->monitorRefresh(QList <ItemInfo>() << info << m_dragItemInfo, \
true); + m_view->monitorRefresh(QList<ItemInfo>() << info << \
m_dragItemInfo, true); m_view->updateTransitionWidget(transition, info);
}
}
@@ -332,8 +332,8 @@ void MoveManager::mouseRelease(QMouseEvent *, GenTime pos)
items += items.at(i)->childItems();
}
}
- QList <ItemInfo> updatedClipsToMove;
- QList <ItemInfo> updatedTransitionsToMove;
+ QList<ItemInfo> updatedClipsToMove;
+ QList<ItemInfo> updatedTransitionsToMove;
for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() != AVWidget && items.at(i)->type() != \
TransitionWidget) { continue;
diff --git a/src/timeline/managers/resizemanager.cpp \
b/src/timeline/managers/resizemanager.cpp index 8fe628249..0a1e0ded1 100644
--- a/src/timeline/managers/resizemanager.cpp
+++ b/src/timeline/managers/resizemanager.cpp
@@ -47,7 +47,7 @@ bool ResizeManager::mousePress(QMouseEvent *event, const ItemInfo \
&info, const Q // Store start infos
AbstractGroupItem *parent = static_cast <AbstractGroupItem \
*>(dragItem->parentItem()); if (parent) {
- QList <QGraphicsItem *> items = parent->childItems();
+ QList<QGraphicsItem *> items = parent->childItems();
for (int i = 0; i < items.count(); ++i) {
if (items.at(i)->type() == AVWidget) {
AbstractClipItem *item = static_cast<AbstractClipItem \
*>(items.at(i)); @@ -102,7 +102,7 @@ void ResizeManager::mouseRelease(QMouseEvent *, \
GenTime pos) if (parent) {
QUndoCommand *resizeCommand = new QUndoCommand();
resizeCommand->setText(i18n("Resize group"));
- QList <QGraphicsItem *> items = parent->childItems();
+ QList<QGraphicsItem *> items = parent->childItems();
GenTime min = parent->startPos();
GenTime max = min;
int itemcount = 0;
@@ -155,7 +155,7 @@ void ResizeManager::mouseRelease(QMouseEvent *, GenTime pos)
}
} else {
// Resized transition
- m_view->monitorRefresh(QList <ItemInfo>() << m_dragItemInfo \
<< dragItem->info(), true); + \
m_view->monitorRefresh(QList<ItemInfo>() << m_dragItemInfo << dragItem->info(), \
true); }
if (!dragItem) {
qCDebug(KDENLIVE_LOG) << " * * ** SOMETHING WRONG HERE: " << \
m_dragItemInfo.endPos.frames(m_view->fps()); @@ -170,7 +170,7 @@ void \
ResizeManager::mouseRelease(QMouseEvent *, GenTime pos) if (parent) {
QUndoCommand *resizeCommand = new QUndoCommand();
resizeCommand->setText(i18n("Resize group"));
- QList <QGraphicsItem *> items = parent->childItems();
+ QList<QGraphicsItem *> items = parent->childItems();
GenTime min = parent->startPos() + parent->duration();
GenTime max = min;
int itemcount = 0;
@@ -213,7 +213,7 @@ void ResizeManager::mouseRelease(QMouseEvent *, GenTime pos)
m_view->monitorRefresh(range, true);
}
} else {
- m_view->monitorRefresh(QList <ItemInfo>() << m_dragItemInfo \
<< dragItem->info(), true); + \
m_view->monitorRefresh(QList<ItemInfo>() << m_dragItemInfo << dragItem->info(), \
true); }
}
}
diff --git a/src/timeline/managers/resizemanager.h \
b/src/timeline/managers/resizemanager.h index 2af6633e0..3f6c9739a 100644
--- a/src/timeline/managers/resizemanager.h
+++ b/src/timeline/managers/resizemanager.h
@@ -39,7 +39,7 @@ public:
private:
ItemInfo m_dragItemInfo;
- QList <ItemInfo> m_startInfos;
+ QList<ItemInfo> m_startInfos;
Qt::KeyboardModifiers m_controlModifier;
};
diff --git a/src/timeline/spacerdialog.h b/src/timeline/spacerdialog.h
index f6c97fd4c..a115609bd 100644
--- a/src/timeline/spacerdialog.h
+++ b/src/timeline/spacerdialog.h
@@ -36,7 +36,7 @@ class SpacerDialog : public QDialog, public Ui::SpacerDialog_UI
Q_OBJECT
public:
- SpacerDialog(const GenTime &duration, const Timecode &tc, int track, const QList \
<TrackInfo> &tracks, QWidget *parent = Q_NULLPTR); + SpacerDialog(const GenTime \
&duration, const Timecode &tc, int track, const QList<TrackInfo> &tracks, QWidget \
*parent = Q_NULLPTR); GenTime selectedDuration() const;
int selectedTrack() const;
diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp
index 70a326de4..cbe26f3fa 100644
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@ -703,9 +703,9 @@ void Timeline::setTrackInfo(int ix, const TrackInfo &info)
tk->setInfo(info);
}
-QList <TrackInfo> Timeline::getTracksInfo()
+QList<TrackInfo> Timeline::getTracksInfo()
{
- QList <TrackInfo> tracks;
+ QList<TrackInfo> tracks;
for (int i = 0; i < tracksCount(); i++) {
tracks << track(i)->info();
}
@@ -1095,7 +1095,7 @@ int Timeline::loadTrack(int ix, int offset, Mlt::Playlist \
&playlist, int start, return playlist.get_length();
}
-void Timeline::loadGuides(const QMap <double, QString> &guidesData)
+void Timeline::loadGuides(const QMap<double, QString> &guidesData)
{
QMapIterator<double, QString> i(guidesData);
while (i.hasNext()) {
@@ -2017,7 +2017,7 @@ void Timeline::invalidateTrack(int ix)
return;
}
Track *tk = track(ix);
- QList <QPoint> visibleRange = tk->visibleClips();
+ QList<QPoint> visibleRange = tk->visibleClips();
foreach (const QPoint &p, visibleRange) {
m_timelinePreview->invalidatePreview(p.x(), p.y());
}
diff --git a/src/timeline/timeline.h b/src/timeline/timeline.h
index 8dc26c641..8bfd0ebde 100644
--- a/src/timeline/timeline.h
+++ b/src/timeline/timeline.h
@@ -61,7 +61,7 @@ class Timeline : public QWidget, public Ui::TimeLine_UI
Q_OBJECT
public:
- explicit Timeline(KdenliveDoc *doc, const QList <QAction *> &actions, const \
QList<QAction *> &rulerActions, bool *ok, QWidget *parent = Q_NULLPTR); + explicit \
Timeline(KdenliveDoc *doc, const QList<QAction *> &actions, const QList<QAction *> \
&rulerActions, bool *ok, QWidget *parent = Q_NULLPTR); virtual ~ Timeline();
/** @brief is multitrack view (split screen for tracks) enabled */
@@ -119,7 +119,7 @@ public:
* deprecated use string version with track name instead */
TrackInfo getTrackInfo(int ix);
void setTrackInfo(int trackIndex, const TrackInfo &info);
- QList <TrackInfo> getTracksInfo();
+ QList<TrackInfo> getTracksInfo();
QStringList getTrackNames();
void addTrackEffect(int trackIndex, QDomElement effect, bool addToPlaylist = \
true);
bool removeTrackEffect(int trackIndex, int effectIndex, const QDomElement \
&effect); @@ -206,13 +206,13 @@ public slots:
private:
Mlt::Tractor *m_tractor;
- QList <Track *> m_tracks;
+ QList<Track *> m_tracks;
/** @brief number of special overlay tracks to preview effects */
bool m_hasOverlayTrack;
Mlt::Producer *m_overlayTrack;
CustomRuler *m_ruler;
CustomTrackView *m_trackview;
- QList <QString> m_invalidProducers;
+ QList<QString> m_invalidProducers;
double m_scale;
QString m_editMode;
CustomTrackScene *m_scene;
@@ -222,7 +222,7 @@ private:
KdenliveDoc *m_doc;
int m_verticalZoom;
QString m_documentErrors;
- QList <QAction *> m_trackActions;
+ QList<QAction *> m_trackActions;
/** @brief sometimes grouped commands quickly send invalidate commands, so wait \
a little bit before processing*/ PreviewManager *m_timelinePreview;
bool m_usePreview;
diff --git a/src/timeline/timelinecommands.cpp b/src/timeline/timelinecommands.cpp
index 45a8d4a93..9b1a61a59 100644
--- a/src/timeline/timelinecommands.cpp
+++ b/src/timeline/timelinecommands.cpp
@@ -440,7 +440,7 @@ void EditTransitionCommand::redo()
m_doIt = true;
}
-GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> \
&clipInfos, const QList <ItemInfo> &transitionInfos, bool group, bool doIt, \
QUndoCommand *parent) : +GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, \
const QList<ItemInfo> &clipInfos, const QList<ItemInfo> &transitionInfos, bool group, \
bool doIt, QUndoCommand *parent) : QUndoCommand(parent),
m_view(view),
m_clips(clipInfos),
@@ -468,7 +468,7 @@ void GroupClipsCommand::redo()
m_doIt = true;
}
-AddSpaceCommand::AddSpaceCommand(CustomTrackView *view, const ItemInfo &spaceInfo, \
const QList <ItemInfo> &excludeList, bool doIt, QUndoCommand *parent, bool trackonly) \
: +AddSpaceCommand::AddSpaceCommand(CustomTrackView *view, const ItemInfo &spaceInfo, \
const QList<ItemInfo> &excludeList, bool doIt, QUndoCommand *parent, bool trackonly) \
: QUndoCommand(parent),
m_view(view),
m_spaceInfo(spaceInfo),
@@ -618,7 +618,7 @@ void MoveEffectCommand::redo()
m_view->moveEffect(m_track, m_pos, m_oldindex, m_newindex);
}
-MoveGroupCommand::MoveGroupCommand(CustomTrackView *view, const QList <ItemInfo> \
&startClip, const QList <ItemInfo> &startTransition, const GenTime &offset, const int \
trackOffset, bool alreadyMoved, bool doIt, QUndoCommand *parent) : \
+MoveGroupCommand::MoveGroupCommand(CustomTrackView *view, const QList<ItemInfo> \
&startClip, const QList<ItemInfo> &startTransition, const GenTime &offset, const int \
trackOffset, bool alreadyMoved, bool doIt, QUndoCommand *parent) : \
QUndoCommand(parent), m_view(view),
m_startClip(startClip),
@@ -720,7 +720,7 @@ void RazorTransitionCommand::redo()
}
/*
-RazorGroupCommand::RazorGroupCommand(CustomTrackView *view, QList <ItemInfo> clips1, \
QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> \
transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime \
cutPos, QUndoCommand * parent) : \
+RazorGroupCommand::RazorGroupCommand(CustomTrackView *view, QList<ItemInfo> clips1, \
QList<ItemInfo> transitions1, QList<ItemInfo> clipsCut, QList<ItemInfo> \
transitionsCut, QList<ItemInfo> clips2, QList<ItemInfo> transitions2, GenTime cutPos, \
QUndoCommand * parent) : QUndoCommand(parent),
m_view(view),
m_clips1(clips1),
@@ -763,7 +763,7 @@ void RebuildGroupCommand::redo()
m_view->rebuildGroup(m_childTrack, m_childPos);
}
-RefreshMonitorCommand::RefreshMonitorCommand(CustomTrackView *view, const QList \
<ItemInfo> &info, bool execute, bool refreshOnUndo, QUndoCommand *parent) : \
+RefreshMonitorCommand::RefreshMonitorCommand(CustomTrackView *view, const \
QList<ItemInfo> &info, bool execute, bool refreshOnUndo, QUndoCommand *parent) : \
QUndoCommand(parent), m_view(view),
m_info(info),
@@ -775,7 +775,7 @@ RefreshMonitorCommand::RefreshMonitorCommand(CustomTrackView \
*view, const QList RefreshMonitorCommand::RefreshMonitorCommand(CustomTrackView \
*view, const ItemInfo &info, bool execute, bool refreshOnUndo, QUndoCommand *parent) \
: QUndoCommand(parent),
m_view(view),
- m_info(QList <ItemInfo>() << info),
+ m_info(QList<ItemInfo>() << info),
m_exec(execute),
m_execOnUndo(refreshOnUndo)
{
@@ -797,7 +797,7 @@ void RefreshMonitorCommand::redo()
m_exec = true;
}
-void RefreshMonitorCommand::updateRange(const QList <ItemInfo> &info)
+void RefreshMonitorCommand::updateRange(const QList<ItemInfo> &info)
{
m_info.clear();
m_info = info;
diff --git a/src/timeline/timelinecommands.h b/src/timeline/timelinecommands.h
index 069dd90b0..a76a7512f 100644
--- a/src/timeline/timelinecommands.h
+++ b/src/timeline/timelinecommands.h
@@ -220,14 +220,14 @@ private:
class GroupClipsCommand : public QUndoCommand
{
public:
- GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> &clipInfos, \
const QList <ItemInfo> &transitionInfos, bool group, bool doIt = true, QUndoCommand \
*parent = Q_NULLPTR); + GroupClipsCommand(CustomTrackView *view, const \
QList<ItemInfo> &clipInfos, const QList<ItemInfo> &transitionInfos, bool group, bool \
doIt = true, QUndoCommand *parent = Q_NULLPTR); void undo() Q_DECL_OVERRIDE;
void redo() Q_DECL_OVERRIDE;
private:
CustomTrackView *m_view;
- const QList <ItemInfo> m_clips;
- const QList <ItemInfo> m_transitions;
+ const QList<ItemInfo> m_clips;
+ const QList<ItemInfo> m_transitions;
bool m_group;
bool m_doIt;
};
@@ -256,7 +256,7 @@ public:
private:
CustomTrackView *m_view;
ItemInfo m_spaceInfo;
- QList <ItemInfo> m_excludeList;
+ QList<ItemInfo> m_excludeList;
bool m_doIt;
bool m_trackOnly;
};
@@ -308,13 +308,13 @@ private:
class MoveGroupCommand : public QUndoCommand
{
public:
- MoveGroupCommand(CustomTrackView *view, const QList <ItemInfo> &startClip, const \
QList <ItemInfo> &startTransition, const GenTime &offset, const int trackOffset, bool \
alreadyMoved, bool doIt, QUndoCommand *parent = Q_NULLPTR); + \
MoveGroupCommand(CustomTrackView *view, const QList<ItemInfo> &startClip, const \
QList<ItemInfo> &startTransition, const GenTime &offset, const int trackOffset, bool \
alreadyMoved, bool doIt, QUndoCommand *parent = Q_NULLPTR); void undo() \
Q_DECL_OVERRIDE; void redo() Q_DECL_OVERRIDE;
private:
CustomTrackView *m_view;
- const QList <ItemInfo> m_startClip;
- const QList <ItemInfo> m_startTransition;
+ const QList<ItemInfo> m_startClip;
+ const QList<ItemInfo> m_startTransition;
const GenTime m_offset;
const int m_trackOffset;
bool m_alreadyMoved;
@@ -367,17 +367,17 @@ private:
class RazorGroupCommand : public QUndoCommand
{
public:
- RazorGroupCommand(CustomTrackView *view, QList <ItemInfo> clips1, QList \
<ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, \
QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, QUndoCommand \
* parent = Q_NULLPTR); + RazorGroupCommand(CustomTrackView *view, QList<ItemInfo> \
clips1, QList<ItemInfo> transitions1, QList<ItemInfo> clipsCut, QList<ItemInfo> \
transitionsCut, QList<ItemInfo> clips2, QList<ItemInfo> transitions2, GenTime cutPos, \
QUndoCommand * parent = Q_NULLPTR); virtual void undo();
virtual void redo();
private:
CustomTrackView *m_view;
- QList <ItemInfo> m_clips1;
- QList <ItemInfo> m_transitions1;
- QList <ItemInfo> m_clipsCut;
- QList <ItemInfo> m_transitionsCut;
- QList <ItemInfo> m_clips2;
- QList <ItemInfo> m_transitions2;
+ QList<ItemInfo> m_clips1;
+ QList<ItemInfo> m_transitions1;
+ QList<ItemInfo> m_clipsCut;
+ QList<ItemInfo> m_transitionsCut;
+ QList<ItemInfo> m_clips2;
+ QList<ItemInfo> m_transitions2;
GenTime m_cutPos;
};
*/
@@ -400,10 +400,10 @@ public:
RefreshMonitorCommand(CustomTrackView *view, const ItemInfo &info, bool execute, \
bool refreshOnUndo, QUndoCommand *parent = Q_NULLPTR); void undo() Q_DECL_OVERRIDE;
void redo() Q_DECL_OVERRIDE;
- void updateRange(const QList <ItemInfo> &info);
+ void updateRange(const QList<ItemInfo> &info);
private:
CustomTrackView *m_view;
- QList <ItemInfo> m_info;
+ QList<ItemInfo> m_info;
bool m_exec;
bool m_execOnUndo;
};
diff --git a/src/timeline/track.cpp b/src/timeline/track.cpp
index 85d680be8..28acd2e4e 100644
--- a/src/timeline/track.cpp
+++ b/src/timeline/track.cpp
@@ -310,9 +310,9 @@ void Track::replaceId(const QString &id)
}
}
-QList <Track::SlowmoInfo> Track::getSlowmotionInfos(const QString &id)
+QList<Track::SlowmoInfo> Track::getSlowmotionInfos(const QString &id)
{
- QList <Track::SlowmoInfo> list;
+ QList<Track::SlowmoInfo> list;
QLocale locale;
for (int i = 0; i < m_playlist.count(); i++) {
if (m_playlist.is_blank(i)) continue;
@@ -331,7 +331,7 @@ QList <Track::SlowmoInfo> Track::getSlowmotionInfos(const QString \
&id) return list;
}
-QList <ItemInfo> Track::replaceAll(const QString &id, Mlt::Producer *original, \
Mlt::Producer *videoOnlyProducer, const QMap <QString, Mlt::Producer *> &newSlowMos) \
+QList<ItemInfo> Track::replaceAll(const QString &id, Mlt::Producer *original, \
Mlt::Producer *videoOnlyProducer, const QMap<QString, Mlt::Producer *> &newSlowMos) \
{ QString idForAudioTrack;
QString idForVideoTrack;
@@ -346,7 +346,7 @@ QList <ItemInfo> Track::replaceAll(const QString &id, \
Mlt::Producer *original, M }
Mlt::Producer *trackProducer = Q_NULLPTR;
Mlt::Producer *audioTrackProducer = Q_NULLPTR;
- QList <ItemInfo> replaced;
+ QList<ItemInfo> replaced;
Mlt::ClipInfo *info = new Mlt::ClipInfo();
for (int i = 0; i < m_playlist.count(); i++) {
if (m_playlist.is_blank(i)) continue;
@@ -971,9 +971,9 @@ bool Track::moveTrackEffect(int oldPos, int newPos)
return effect.moveEffect(oldPos, newPos);
}
-QList <QPoint> Track::visibleClips()
+QList<QPoint> Track::visibleClips()
{
- QList <QPoint> clips;
+ QList<QPoint> clips;
int tkState = state();
if (tkState & 1) {
// Video is hidden for this track, nothing visible
diff --git a/src/timeline/track.h b/src/timeline/track.h
index b10c5f478..6552e1c76 100644
--- a/src/timeline/track.h
+++ b/src/timeline/track.h
@@ -141,7 +141,7 @@ public:
* @param videoOnlyProducer is the video only (without sound) replacement clip
* @param newSlowMos the slowmotion producers required for replacement
* @return list of in/out that were replaced */
- QList <ItemInfo> replaceAll(const QString &id, Mlt::Producer *original, \
Mlt::Producer *videoOnlyProducer, const QMap<QString, Mlt::Producer *> &newSlowMos); \
+ QList<ItemInfo> replaceAll(const QString &id, Mlt::Producer *original, \
Mlt::Producer *videoOnlyProducer, const QMap<QString, Mlt::Producer *> &newSlowMos); \
void updateEffects(const QString &id, Mlt::Producer *original); /** @brief replace \
an instance of a clip with another resource
* @param t is the clip time in playlist
@@ -190,7 +190,7 @@ public:
/** @brief Update producer properties on all instances of this clip. */
void updateClipProperties(const QString &id, const QMap<QString, QString> \
&properties);
/** @brief Returns a list of speed info for all slowmotion producer used on this \
track for an id. */
- QList <SlowmoInfo> getSlowmotionInfos(const QString &id);
+ QList<SlowmoInfo> getSlowmotionInfos(const QString &id);
/** @brief Returns the length of blank space from a position pos. */
int spaceLength(int pos, bool fromBlankStart);
/** @brief Dis/enable all effects on this track. */
@@ -207,7 +207,7 @@ public:
bool enableTrackEffects(const QList<int> &effectIndexes, bool disable, bool \
remember = false); bool moveEffect(double start, int oldPos, int newPos);
bool moveTrackEffect(int oldPos, int newPos);
- QList <QPoint> visibleClips();
+ QList<QPoint> visibleClips();
bool resize_in_out(int pos, int in, int out);
signals:
diff --git a/src/timeline/tracksconfigdialog.cpp \
b/src/timeline/tracksconfigdialog.cpp index e14433bd3..6c0cf7618 100644
--- a/src/timeline/tracksconfigdialog.cpp
+++ b/src/timeline/tracksconfigdialog.cpp
@@ -108,9 +108,9 @@ TracksConfigDialog::TracksConfigDialog(Timeline *timeline, int \
selected, QWidget
connect(table, &QTableWidget::itemChanged, this, \
&TracksConfigDialog::slotUpdateRow); }
-const QList <TrackInfo> TracksConfigDialog::tracksList()
+const QList<TrackInfo> TracksConfigDialog::tracksList()
{
- QList <TrackInfo> tracks;
+ QList<TrackInfo> tracks;
TrackInfo info;
tracks.reserve(table->rowCount());
for (int i = 0; i < table->rowCount(); i++) {
diff --git a/src/timeline/tracksconfigdialog.h b/src/timeline/tracksconfigdialog.h
index 25ea17e12..621bc80e6 100644
--- a/src/timeline/tracksconfigdialog.h
+++ b/src/timeline/tracksconfigdialog.h
@@ -57,7 +57,7 @@ public:
explicit TracksConfigDialog(Timeline *timeline, int selected = -1, QWidget \
*parent = Q_NULLPTR);
/** @brief Returns the new list of tracks created from the table. */
- const QList <TrackInfo> tracksList();
+ const QList<TrackInfo> tracksList();
/** @brief A list of tracks, which sould be deleted. */
QList<int> deletedTracks() const;
diff --git a/src/timeline/transition.h b/src/timeline/transition.h
index d828f63b5..ea5ddc159 100644
--- a/src/timeline/transition.h
+++ b/src/timeline/transition.h
@@ -58,7 +58,7 @@ public:
void updateKeyframes(const QDomElement &effect) Q_DECL_OVERRIDE;
static int itemHeight();
static int itemOffset();
- //const QMap < QString, QString > transitionParameters() const;
+ //const QMap< QString, QString > transitionParameters() const;
void setTransitionParameters(const QDomElement ¶ms);
void setTransitionTrack(int track);
diff --git a/src/timeline/transitionhandler.cpp b/src/timeline/transitionhandler.cpp
index 5f1097d61..b731e494b 100644
--- a/src/timeline/transitionhandler.cpp
+++ b/src/timeline/transitionhandler.cpp
@@ -183,7 +183,7 @@ void TransitionHandler::plantTransition(Mlt::Field *field, \
Mlt::Transition &tr,
mlt_service nextservice = mlt_service_get_producer(field->get_service());
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString resource = mlt_properties_get(properties, "mlt_service");
- QList <Mlt::Transition *> trList;
+ QList<Mlt::Transition *> trList;
mlt_properties insertproperties = tr.get_properties();
QString insertresource = mlt_properties_get(insertproperties, "mlt_service");
bool isMixTransition = insertresource == QLatin1String("mix");
diff --git a/src/timeline/transitionhandler.h b/src/timeline/transitionhandler.h
index e88226742..a0e9e2bf4 100644
--- a/src/timeline/transitionhandler.h
+++ b/src/timeline/transitionhandler.h
@@ -46,7 +46,7 @@ public:
bool deleteTransition(const QString &tag, int a_track, int b_track, GenTime in, \
GenTime out, const QDomElement &xml, bool refresh = true); void \
deleteTrackTransitions(int ix);
bool moveTransition(const QString &type, int startTrack, int newTrack, int \
newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, \
GenTime newOut);
- QList <TransitionInfo> mltInsertTrack(int ix, const QString &name, bool \
videoTrack); + QList<TransitionInfo> mltInsertTrack(int ix, const QString &name, \
bool videoTrack);
void duplicateTransitionOnPlaylist(int in, int out, const QString &tag, const \
QDomElement &xml, int a_track, int b_track, Mlt::Field *field); /** @brief Get a \
transition with tag name. */
Mlt::Transition *getTransition(const QString &name, int b_track, int a_track = \
-1, bool internalTransition = false) const;
diff --git a/src/titler/gradientwidget.cpp b/src/titler/gradientwidget.cpp
index b5d514ee0..fdd7fac43 100644
--- a/src/titler/gradientwidget.cpp
+++ b/src/titler/gradientwidget.cpp
@@ -207,9 +207,9 @@ QMap<QString, QString> GradientWidget::gradients() const
return gradients;
}
-QList <QIcon> GradientWidget::icons() const
+QList<QIcon> GradientWidget::icons() const
{
- QList <QIcon> icons;
+ QList<QIcon> icons;
icons.reserve(gradient_list->count());
for (int i = 0; i < gradient_list->count(); i++) {
QPixmap pix = gradient_list->item(i)->icon().pixmap(6 * m_height, m_height);
diff --git a/src/titler/gradientwidget.h b/src/titler/gradientwidget.h
index 2a7910b77..3bb97a594 100644
--- a/src/titler/gradientwidget.h
+++ b/src/titler/gradientwidget.h
@@ -47,7 +47,7 @@ public:
QString gradientToString() const;
static QLinearGradient gradientFromString(const QString &str, int width, int \
height); QMap<QString, QString> gradients() const;
- QList <QIcon> icons() const;
+ QList<QIcon> icons() const;
int selectedGradient() const;
private:
diff --git a/src/titler/titlewidget.cpp b/src/titler/titlewidget.cpp
index 76c6ea23b..9a9860b0c 100644
--- a/src/titler/titlewidget.cpp
+++ b/src/titler/titlewidget.cpp
@@ -1906,7 +1906,7 @@ void TitleWidget::saveTitle(QUrl url)
bool embed_image = false;
// If we have images in the title, ask for embed
- QList <QGraphicsItem *> list = graphicsView->scene()->items();
+ QList<QGraphicsItem *> list = graphicsView->scene()->items();
QGraphicsPixmapItem pix;
int pixmapType = pix.type();
foreach (const QGraphicsItem *item, list) {
@@ -1966,7 +1966,7 @@ void TitleWidget::setXml(const QDomDocument &doc)
QDomElement e = doc.documentElement();
m_transformations.clear();
- QList <QGraphicsItem *> items = graphicsView->scene()->items();
+ QList<QGraphicsItem *> items = graphicsView->scene()->items();
const double PI = 4.0 * atan(1.0);
for (int i = 0; i < items.count(); ++i) {
QTransform t = items.at(i)->transform();
@@ -2841,7 +2841,7 @@ void TitleWidget::slotEditGradient()
if (d.exec() == QDialog::Accepted) {
// Save current gradients
QMap<QString, QString> gradients = d.gradients();
- QList <QIcon> icons = d.icons();
+ QList<QIcon> icons = d.icons();
QMap<QString, QString>::const_iterator i = gradients.constBegin();
KSharedConfigPtr config = KSharedConfig::openConfig();
KConfigGroup group(config, "TitleGradients");
diff --git a/src/utils/archiveorg.cpp b/src/utils/archiveorg.cpp
index e9b913157..22896bc4b 100644
--- a/src/utils/archiveorg.cpp
+++ b/src/utils/archiveorg.cpp
@@ -95,17 +95,17 @@ void ArchiveOrg::slotShowResults(KJob *job)
QVariant sounds;
if (data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> map = data.toMap();
+ QMap<QString, QVariant> map = data.toMap();
QMap<QString, QVariant>::const_iterator i = map.constBegin();
while (i != map.constEnd()) {
if (i.key() == QLatin1String("response")) {
sounds = i.value();
if (sounds.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> soundsList = sounds.toMap();
+ QMap<QString, QVariant> soundsList = sounds.toMap();
if (soundsList.contains(QStringLiteral("numFound"))) {
emit searchInfo(i18np("Found %1 result", "Found %1 results", \
soundsList.value("numFound").toInt())); }
- QList <QVariant> resultsList;
+ QList<QVariant> resultsList;
if (soundsList.contains(QStringLiteral("docs"))) {
resultsList = \
soundsList.value(QStringLiteral("docs")).toList();
/* docs element has a sub element for each search result. \
And each of the sub elements look like: @@ -119,7 +119,7 @@ void \
ArchiveOrg::slotShowResults(KJob *job)
for (int j = 0; j < resultsList.count(); ++j) {
if (resultsList.at(j).canConvert(QVariant::Map)) {
- QMap <QString, QVariant> soundmap = \
resultsList.at(j).toMap(); + QMap<QString, QVariant> \
soundmap = resultsList.at(j).toMap();
if (soundmap.contains(QStringLiteral("title"))) {
QListWidgetItem *item = new \
QListWidgetItem(soundmap.value(QStringLiteral("title")).toString(), \
m_listWidget);
item->setData(descriptionRole, \
soundmap.value(QStringLiteral("description")).toString()); @@ -207,7 +207,7 @@ void \
ArchiveOrg::slotParseResults(KJob *job)
QString html = QStringLiteral("<style type=\"text/css\">tr.cellone \
{background-color: \
%1;}").arg(qApp->palette().alternateBase().color().name());
html += QLatin1String("</style><table width=\"100%\" cellspacing=\"0\" \
cellpadding=\"2\">"); if (data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> map = data.toMap();
+ QMap<QString, QVariant> map = data.toMap();
QMap<QString, QVariant>::const_iterator i = map.constBegin();
while (i != map.constEnd()) {
// qCDebug(KDENLIVE_LOG)<<"ArchiveOrg::slotParseResults - i.key"<< \
i.key(); @@ -220,7 +220,7 @@ void ArchiveOrg::slotParseResults(KJob *job)
QString minsLong;
files = i.value();
if (files.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> filesList = files.toMap();
+ QMap<QString, QVariant> filesList = files.toMap();
QMap<QString, QVariant>::const_iterator j = \
filesList.constBegin(); bool bThumbNailFound = false;
while (j != filesList.constEnd()) {
@@ -228,7 +228,7 @@ void ArchiveOrg::slotParseResults(KJob *job)
sDownloadUrl = "https://archive.org/download/" + \
m_metaInfo.value(QStringLiteral("id")) + j.key(); fileMetaData = j.value();
if (fileMetaData.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> filesMetaDataList = \
fileMetaData.toMap(); + QMap<QString, QVariant> \
filesMetaDataList = fileMetaData.toMap();
QMap<QString, QVariant>::const_iterator k = \
filesMetaDataList.constBegin(); while (k != filesMetaDataList.constEnd()) {
// qCDebug(KDENLIVE_LOG)<< k.key()<<": \
"<<k.value().toString();
diff --git a/src/utils/freesound.cpp b/src/utils/freesound.cpp
index 4792b3800..2db1ba4fc 100644
--- a/src/utils/freesound.cpp
+++ b/src/utils/freesound.cpp
@@ -99,7 +99,7 @@ void FreeSound::slotShowResults(KJob *job)
QVariant data = doc.toVariant();
QVariant sounds;
if (data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> map = data.toMap();
+ QMap<QString, QVariant> map = data.toMap();
QMap<QString, QVariant>::const_iterator i = map.constBegin();
while (i != map.constEnd()) {
@@ -111,10 +111,10 @@ void FreeSound::slotShowResults(KJob *job)
sounds = i.value();
if (sounds.canConvert(QVariant::List)) {
- QList <QVariant> soundsList = sounds.toList();
+ QList<QVariant> soundsList = sounds.toList();
for (int j = 0; j < soundsList.count(); ++j) {
if (soundsList.at(j).canConvert(QVariant::Map)) {
- QMap <QString, QVariant> soundmap = \
soundsList.at(j).toMap(); + QMap<QString, QVariant> \
soundmap = soundsList.at(j).toMap();
if (soundmap.contains(QStringLiteral("name"))) {
QListWidgetItem *item = new \
QListWidgetItem(soundmap.value(QStringLiteral("name")).toString(), m_listWidget); @@ \
-197,7 +197,7 @@ void FreeSound::slotParseResults(KJob *job)
QString html = QStringLiteral("<style type=\"text/css\">tr.cellone \
{background-color: %1;}</style>").arg(qApp->palette().alternateBase().color().name());
if (data.canConvert(QVariant::Map)) {
- QMap <QString, QVariant> info = data.toMap();
+ QMap<QString, QVariant> info = data.toMap();
html += QLatin1String("<table width=\"100%\" cellspacing=\"0\" \
cellpadding=\"2\">");
@@ -230,7 +230,7 @@ void FreeSound::slotParseResults(KJob *job)
}
if (info.contains(QStringLiteral("previews"))) {
- QMap <QString, QVariant> previews = \
info.value(QStringLiteral("previews")).toMap(); + QMap<QString, QVariant> \
previews = info.value(QStringLiteral("previews")).toMap();
if (previews.contains(QStringLiteral("preview-lq-mp3"))) {
m_metaInfo.insert(QStringLiteral("itemPreview"), \
previews.value(QStringLiteral("preview-lq-mp3")).toString()); @@ -244,7 +244,7 @@ \
void FreeSound::slotParseResults(KJob *job) }
if (info.contains(QStringLiteral("images"))) {
- QMap <QString, QVariant> images = \
info.value(QStringLiteral("images")).toMap(); + QMap<QString, QVariant> \
images = info.value(QStringLiteral("images")).toMap();
if (images.contains(QStringLiteral("waveform_m"))) {
m_metaInfo.insert(QStringLiteral("itemImage"), \
images.value(QStringLiteral("waveform_m")).toString());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic