From e0fa1332f109b6455207ea701da386b2fddddf09 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 14 May 2013 22:48:57 +0200 Subject: [PATCH] Better to use ++i than i++ (minor optimization) --- src/abstractgroupitem.cpp | 28 +- src/archivewidget.cpp | 30 +- src/clipitem.cpp | 42 +-- src/clipmanager.cpp | 30 +- src/clipproperties.cpp | 4 +- src/clipstabilize.cpp | 2 +- src/cliptranscode.cpp | 4 +- src/colorcorrection/rgbparadegenerator.cpp | 8 +- src/colorcorrection/waveformgenerator.cpp | 10 +- src/commands/moveeffectcommand.cpp | 2 +- src/cornerswidget.cpp | 2 +- src/customtrackview.cpp | 330 +++++++++--------- src/databackup/backupwidget.cpp | 2 +- src/definitions.h | 2 +- src/docclipbase.cpp | 50 +-- src/documentchecker.cpp | 46 +-- src/documentvalidator.cpp | 32 +- src/dvdwizard.cpp | 12 +- src/dvdwizardchapters.cpp | 18 +- src/dvdwizardmenu.cpp | 32 +- src/dvdwizardmenu.h | 2 +- src/dvdwizardvob.cpp | 16 +- src/effectslist.cpp | 34 +- src/effectslistview.cpp | 4 +- src/effectslistwidget.cpp | 12 +- src/effectstack/collapsibleeffect.cpp | 6 +- src/effectstack/collapsiblegroup.cpp | 16 +- src/effectstack/effectstackview2.cpp | 38 +- src/effectstack/parametercontainer.cpp | 16 +- src/geometrywidget.cpp | 14 +- src/headertrack.cpp | 2 +- src/initeffects.cpp | 6 +- src/jogaction.cpp | 2 +- src/jogshuttleconfig.cpp | 2 +- src/kdenlivedoc.cpp | 48 +-- src/kdenlivesettingsdialog.cpp | 16 +- src/keyframeedit.cpp | 10 +- src/keyframehelper.cpp | 8 +- src/kis_cubic_curve.cpp | 14 +- src/kthumb.cpp | 4 +- src/lib/audio/audioCorrelation.cpp | 2 +- src/lib/audio/audioCorrelationInfo.cpp | 4 +- src/lib/audio/audioEnvelope.cpp | 6 +- src/lib/audio/audioInfo.cpp | 2 +- src/lib/audio/fftCorrelation.cpp | 12 +- src/lib/audio/fftTools.cpp | 16 +- src/mainwindow.cpp | 32 +- src/managecapturesdialog.cpp | 6 +- src/mltdevicecapture.cpp | 2 +- src/monitor.cpp | 4 +- src/monitormanager.cpp | 4 +- src/onmonitoritems/onmonitorpathitem.cpp | 6 +- .../rotoscoping/nearestpoint.cpp | 20 +- src/parameterplotter.cpp | 12 +- src/profilesdialog.cpp | 6 +- src/projectitem.cpp | 2 +- src/projectlist.cpp | 72 ++-- src/projectlistview.cpp | 2 +- src/projectsettings.cpp | 18 +- src/recmonitor.cpp | 2 +- src/renderer.cpp | 66 ++-- src/renderwidget.cpp | 26 +- src/scopes/audioscopes/audiosignal.cpp | 6 +- src/scopes/audioscopes/audiospectrum.cpp | 8 +- src/scopes/audioscopes/spectrogram.cpp | 2 +- src/scopes/scopemanager.cpp | 16 +- src/slideshowclip.cpp | 8 +- src/smallruler.cpp | 4 +- src/stopmotion/stopmotion.cpp | 4 +- src/titledocument.cpp | 6 +- src/titlewidget.cpp | 40 +-- src/tracksconfigdialog.cpp | 2 +- src/trackview.cpp | 38 +- src/transition.cpp | 14 +- src/transitionsettings.cpp | 2 +- src/unicodedialog.cpp | 4 +- src/utils/archiveorg.cpp | 4 +- src/utils/openclipart.cpp | 2 +- src/wizard.cpp | 22 +- 79 files changed, 730 insertions(+), 730 deletions(-) diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index 83f5e59f..588c58ec 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -111,7 +111,7 @@ QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, QPointF offset { QPainterPath path; QList children = childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == (int)type) { QRectF r(children.at(i)->sceneBoundingRect()); r.translate(offset); @@ -134,7 +134,7 @@ QPainterPath AbstractGroupItem::spacerGroupShape(GRAPHICSRECTITEM type, QPointF { QPainterPath path; QList children = childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == (int)type) { QRectF r(children.at(i)->sceneBoundingRect()); r.translate(offset); @@ -221,7 +221,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant int topTrack = -1; QList groupTracks; QList children = childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { int currentTrack = 0; if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { currentTrack = static_cast (children.at(i))->track(); @@ -267,7 +267,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant // Check no clip in the group goes outside of existing tracks int maximumTrack = projectScene()->tracksCount() - 1; int groupHeight = 0; - for (int i = 0; i < groupTracks.count(); i++) { + for (int i = 0; i < groupTracks.count(); ++i) { int offset = groupTracks.at(i) - topTrack; if (offset > groupHeight) groupHeight = offset; } @@ -276,7 +276,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant proposedTrack = qMax(proposedTrack, 0); int groupOffset = proposedTrack - topTrack; if (!lockedTracks.isEmpty()) { - for (int i = 0; i < groupTracks.count(); i++) { + for (int i = 0; i < groupTracks.count(); ++i) { if (lockedTracks.contains(QString::number(groupTracks.at(i) + groupOffset))) { return pos(); } @@ -296,7 +296,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant shape = clipGroupShape(newPos - pos()); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(this); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { @@ -309,7 +309,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant if (!collidingItems.isEmpty()) { bool forwardMove = xpos > start.x(); int offset = 0; - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { QGraphicsItem *collision = collidingItems.at(i); if (collision->type() == AVWIDGET) { // Collision @@ -342,7 +342,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant // If there is still a collision after our position adjust, restore original pos collidingItems = scene()->items(clipGroupShape(newPos - pos()), Qt::IntersectsItemShape); collidingItems.removeAll(this); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { @@ -351,7 +351,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant } collidingItems.removeAll(children.at(i)); } - for (int i = 0; i < collidingItems.count(); i++) + for (int i = 0; i < collidingItems.count(); ++i) if (collidingItems.at(i)->type() == AVWIDGET) return pos(); } } @@ -360,7 +360,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant shape = transitionGroupShape(newPos - pos()); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(this); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) { @@ -374,7 +374,7 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant else { bool forwardMove = xpos > start.x(); int offset = 0; - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { QGraphicsItem *collision = collidingItems.at(i); if (collision->type() == TRANSITIONWIDGET) { // Collision @@ -406,10 +406,10 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant } // If there is still a collision after our position adjust, restore original pos collidingItems = scene()->items(transitionGroupShape(newPos - pos()), Qt::IntersectsItemShape); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { collidingItems.removeAll(children.at(i)); } - for (int i = 0; i < collidingItems.count(); i++) + for (int i = 0; i < collidingItems.count(); ++i) if (collidingItems.at(i)->type() == TRANSITIONWIDGET) return pos(); } } @@ -430,7 +430,7 @@ void AbstractGroupItem::dropEvent(QGraphicsSceneDragDropEvent * event) QPointF dropPos = event->scenePos(); QList selection = scene()->items(dropPos); AbstractClipItem *dropChild = NULL; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { dropChild = (AbstractClipItem *) selection.at(i); break; diff --git a/src/archivewidget.cpp b/src/archivewidget.cpp index e942b152..7bc3ed40 100644 --- a/src/archivewidget.cpp +++ b/src/archivewidget.cpp @@ -281,7 +281,7 @@ void ArchiveWidget::openArchiveForExtraction() // Check that it is a kdenlive project archive bool isProjectArchive = false; QStringList files = m_extractArchive->directory()->entries(); - for (int i = 0; i < files.count(); i++) { + for (int i = 0; i < files.count(); ++i) { if (files.at(i).endsWith(".kdenlive")) { m_projectName = files.at(i); isProjectArchive = true; @@ -349,7 +349,7 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, const QStringList QFileInfoList resultList = dir.entryInfoList(QDir::Files); QStringList slideImages; qint64 totalSize = 0; - for (int i = 0; i < resultList.count(); i++) { + for (int i = 0; i < resultList.count(); ++i) { totalSize += resultList.at(i).size(); slideImages << resultList.at(i).absoluteFilePath(); } @@ -434,7 +434,7 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, const QMap topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { parentItem = files_list->topLevelItem(i); if (parentItem->isDisabled()) { parentItem->setExpanded(false); @@ -616,7 +616,7 @@ bool ArchiveWidget::slotStartArchiving(bool firstPass) if (isArchive) { m_foldersList.append(destPath); - for (int i = 0; i < files.count(); i++) { + for (int i = 0; i < files.count(); ++i) { m_filesList.insert(files.at(i).path(), destPath + files.at(i).fileName()); } slotArchivingFinished(); @@ -664,7 +664,7 @@ void ArchiveWidget::slotArchivingFinished(KJob *job, bool finished) archive_url->setEnabled(true); proxy_only->setEnabled(true); compressed_archive->setEnabled(true); - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { files_list->topLevelItem(i)->setDisabled(false); for (int j = 0; j < files_list->topLevelItem(i)->childCount(); j++) files_list->topLevelItem(i)->child(j)->setDisabled(false); @@ -684,7 +684,7 @@ bool ArchiveWidget::processProjectFile() QTreeWidgetItem *item; bool isArchive = compressed_archive->isChecked(); - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { QTreeWidgetItem *parentItem = files_list->topLevelItem(i); if (parentItem->childCount() > 0) { destUrl = KUrl(archive_url->url().path(KUrl::AddTrailingSlash) + parentItem->data(0, Qt::UserRole).toString()); @@ -720,7 +720,7 @@ bool ArchiveWidget::processProjectFile() // process kdenlive producers QDomNodeList prods = mlt.elementsByTagName("kdenlive_producer"); - for (int i = 0; i < prods.count(); i++) { + for (int i = 0; i < prods.count(); ++i) { QDomElement e = prods.item(i).toElement(); if (e.isNull()) continue; if (e.hasAttribute("resource")) { @@ -737,7 +737,7 @@ bool ArchiveWidget::processProjectFile() // process mlt producers prods = mlt.elementsByTagName("producer"); - for (int i = 0; i < prods.count(); i++) { + for (int i = 0; i < prods.count(); ++i) { QDomElement e = prods.item(i).toElement(); if (e.isNull()) continue; QString src = EffectsList::property(e, "resource"); @@ -752,7 +752,7 @@ bool ArchiveWidget::processProjectFile() // process mlt transitions (for luma files) prods = mlt.elementsByTagName("transition"); QString attribute; - for (int i = 0; i < prods.count(); i++) { + for (int i = 0; i < prods.count(); ++i) { QDomElement e = prods.item(i).toElement(); if (e.isNull()) continue; attribute = "resource"; @@ -853,7 +853,7 @@ void ArchiveWidget::slotArchivingFinished(bool result) archive_url->setEnabled(true); proxy_only->setEnabled(true); compressed_archive->setEnabled(true); - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { files_list->topLevelItem(i)->setDisabled(false); for (int j = 0; j < files_list->topLevelItem(i)->childCount(); j++) files_list->topLevelItem(i)->child(j)->setDisabled(false); @@ -953,7 +953,7 @@ void ArchiveWidget::slotProxyOnly(int onlyProxy) QTreeWidgetItem *parentItem = NULL; // Build list of existing proxy ids - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { parentItem = files_list->topLevelItem(i); if (parentItem->data(0, Qt::UserRole).toString() == "proxy") break; } @@ -964,7 +964,7 @@ void ArchiveWidget::slotProxyOnly(int onlyProxy) } // Parse all items to disable original clips for existing proxies - for (int i = 0; i < proxyIdList.count(); i++) { + for (int i = 0; i < proxyIdList.count(); ++i) { QString id = proxyIdList.at(i); if (id.isEmpty()) continue; for (int j = 0; j < files_list->topLevelItemCount(); j++) { @@ -983,7 +983,7 @@ void ArchiveWidget::slotProxyOnly(int onlyProxy) } else { // Archive all clips - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { QTreeWidgetItem *parentItem = files_list->topLevelItem(i); int items = parentItem->childCount(); for (int j = 0; j < items; j++) { @@ -994,7 +994,7 @@ void ArchiveWidget::slotProxyOnly(int onlyProxy) // Calculate requested size int total = 0; - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { QTreeWidgetItem *parentItem = files_list->topLevelItem(i); int items = parentItem->childCount(); int itemsCount = 0; diff --git a/src/clipitem.cpp b/src/clipitem.cpp index e19ef61a..fb62f053 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -160,7 +160,7 @@ void ClipItem::setEffectList(const EffectsList effectList) m_effectList.clone(effectList); m_effectNames = m_effectList.effectNames().join(" / "); if (!m_effectList.isEmpty()) { - for (int i = 0; i < m_effectList.count(); i++) { + for (int i = 0; i < m_effectList.count(); ++i) { QDomElement effect = m_effectList.at(i); QString effectId = effect.attribute("id"); // check if it is a fade effect @@ -238,7 +238,7 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) // Init parameter value & keyframes if required QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.isNull()) @@ -433,7 +433,7 @@ void ClipItem::setKeyframes(const int ix, const QStringList keyframes) QLocale locale; QDomNodeList params = effect.elementsByTagName("parameter"); int keyframeParams = 0; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && (!e.hasAttribute("intimeline") || e.attribute("intimeline") == "1")) { e.setAttribute("keyframes", keyframes.at(keyframeParams)); @@ -470,7 +470,7 @@ void ClipItem::setSelectedEffect(const int ix) QDomElement effect = effectAtIndex(m_selectedEffect); if (!effect.isNull() && effect.attribute("disable") != "1") { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && (!e.hasAttribute("intimeline") || e.attribute("intimeline") == "1")) { m_keyframes.clear(); @@ -510,7 +510,7 @@ void ClipItem::resizeGeometries(const int index, int width, int height, int prev QDomElement effect = m_effectList.at(index); QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && e.attribute("type") == "geometry") { geom = e.attribute("value"); @@ -526,7 +526,7 @@ QStringList ClipItem::keyframes(const int index) QDomElement effect = m_effectList.at(index); QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) result.append(e.attribute("keyframes")); @@ -857,7 +857,7 @@ void ClipItem::paint(QPainter *painter, QPointF startPos = mapped.topLeft(); int startOffset = m_info.cropStart.frames(m_fps); if (clipType() == IMAGE || clipType() == TEXT) { - for (int i = left; i <= right; i++) { + for (int i = left; i <= right; ++i) { painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix); } } @@ -869,7 +869,7 @@ void ClipItem::paint(QPainter *painter, QPen pen(Qt::white); pen.setStyle(Qt::DotLine); QList missing; - for (int i = left; i <= right; i++) { + for (int i = left; i <= right; ++i) { img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)); QPointF xpos = startPos + QPointF(FRAME_SIZE *(i - startOffset), 0); if (img.isNull()) missing << i; @@ -1081,7 +1081,7 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) if (parentItem()) { QGraphicsItemGroup *dragGroup = static_cast (parentItem()); QList list = dragGroup->childItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == AVWIDGET) { ClipItem *c = static_cast (list.at(i)); if (c->startPos() != startPos()) return MOVE; @@ -1096,7 +1096,7 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) if (parentItem()) { QGraphicsItemGroup *dragGroup = static_cast (parentItem()); QList list = dragGroup->childItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == AVWIDGET) { ClipItem *c = static_cast (list.at(i)); if (c->endPos() != endPos()) return MOVE; @@ -1131,7 +1131,7 @@ QList ClipItem::snapMarkers() const QList < GenTime > markers = m_clip->snapMarkers(); GenTime pos; - for (int i = 0; i < markers.size(); i++) { + for (int i = 0; i < markers.size(); ++i) { pos = GenTime((int)(markers.at(i).frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; @@ -1148,7 +1148,7 @@ QList ClipItem::commentedSnapMarkers() const QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); GenTime pos; - for (int i = 0; i < markers.size(); i++) { + for (int i = 0; i < markers.size(); ++i) { pos = GenTime((int)(markers.at(i).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; @@ -1194,7 +1194,7 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in QPainter pixpainter(&m_audioThumbCachePic[startCache]); - for (int i = 0; i < channels; i++) { + for (int i = 0; i < channels; ++i) { if (simplifiedAudio) { positiveChannelPaths[i].moveTo(-1, channelHeight); } @@ -1252,7 +1252,7 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in pixpainter.setBrush(Qt::NoBrush); } pixpainter.setRenderHint(QPainter::Antialiasing, false); - for (int i = 0; i < channels; i++) { + for (int i = 0; i < channels; ++i) { if (fullAreaDraw) { pixpainter.drawPath(positiveChannelPaths[i].united(negativeChannelPaths.value(i))); } else @@ -1419,7 +1419,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) bool forwardMove = newPos.x() > pos().x(); int offset = 0; if (!items.isEmpty()) { - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (!items.at(i)->isEnabled()) continue; if (items.at(i)->type() == type()) { // Collision! @@ -1639,7 +1639,7 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) }*/ } - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { @@ -1789,7 +1789,7 @@ const ItemInfo ClipItem::speedIndependantInfo() const int ClipItem::nextFreeEffectGroupIndex() const { int freeGroupIndex = 0; - for (int i = 0; i < m_effectList.count(); i++) { + for (int i = 0; i < m_effectList.count(); ++i) { QDomElement effect = m_effectList.at(i); EffectInfo effectInfo; effectInfo.fromString(effect.attribute("kdenlive_info")); @@ -1814,7 +1814,7 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) QDomNodeList effectlist = e.elementsByTagName("effect"); int freeGroupIndex = nextFreeEffectGroupIndex(); EffectInfo effectInfo; - for (int i = 0; i < effectlist.count(); i++) { + for (int i = 0; i < effectlist.count(); ++i) { QDomElement effect = effectlist.at(i).toElement(); effectInfo.fromString(effect.attribute("kdenlive_info")); effectInfo.groupIndex = freeGroupIndex; @@ -1895,7 +1895,7 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) effect.setAttribute("active_keyframe", pos); m_editedKeyframe = pos; QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString kfr = e.attribute("keyframes"); @@ -1935,7 +1935,7 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double QDomNodeList params = effect.elementsByTagName("parameter"); int start = cropStart().frames(m_fps); int end = (cropStart() + cropDuration()).frames(m_fps) - 1; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString kfr = e.attribute("keyframes"); @@ -1995,7 +1995,7 @@ Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) QMap ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo) { QMap effects; - for (int i = 0; i < m_effectList.count(); i++) { + for (int i = 0; i < m_effectList.count(); ++i) { QDomElement effect = m_effectList.at(i); if (effect.attribute("id").startsWith("fade")) { diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index b764ee72..e661c6eb 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -227,7 +227,7 @@ void ClipManager::checkAudioThumbs() } m_thumbsMutex.lock(); - for (int i = 0; i < m_clipList.count(); i++) { + for (int i = 0; i < m_clipList.count(); ++i) { DocClipBase *clip = m_clipList.at(i); if (clip->hasAudioThumb() && !clip->audioThumbCreated()) m_audioThumbsQueue.append(m_clipList.at(i)->getId()); @@ -294,7 +294,7 @@ void ClipManager::slotGetAudioThumbs() h3 = 0; for (int c = 0; c < channels; c++) { QByteArray audioArray(arrayWidth, '\x00'); - for (int i = 0; i < arrayWidth; i++) { + for (int i = 0; i < arrayWidth; ++i) { audioArray[i] = channelarray.at(h2 + h3 + i); if (audioArray.at(i) > maxVolume) maxVolume = audioArray.at(i); } @@ -353,7 +353,7 @@ void ClipManager::slotGetAudioThumbs() for (int c = 0; c < channels; c++) { QByteArray audioArray; audioArray.resize(arrayWidth); - for (int i = 0; i < audioArray.size(); i++) { + for (int i = 0; i < audioArray.size(); ++i) { double pcmval = *(pcm + c + i * samples / audioArray.size()); if (pcmval >= 0) { pcmval = sqrt(pcmval) / 2.83 + 64; @@ -420,7 +420,7 @@ void ClipManager::slotDeleteClips(QStringList ids) QUndoCommand *delClips = new QUndoCommand(); delClips->setText(i18np("Delete clip", "Delete clips", ids.size())); - for (int i = 0; i < ids.size(); i++) { + for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = getClipById(ids.at(i)); if (clip) { new AddClipCommand(m_doc, clip->toXML(), ids.at(i), false, delClips); @@ -431,7 +431,7 @@ void ClipManager::slotDeleteClips(QStringList ids) void ClipManager::deleteClip(const QString &clipId) { - for (int i = 0; i < m_clipList.count(); i++) { + for (int i = 0; i < m_clipList.count(); ++i) { if (m_clipList.at(i)->getId() == clipId) { DocClipBase *clip = m_clipList.takeAt(i); if (clip->clipType() != COLOR && clip->clipType() != SLIDESHOW && !clip->fileURL().isEmpty()) { @@ -455,7 +455,7 @@ DocClipBase *ClipManager::getClipById(QString clipId) { //kDebug() << "++++ CLIP MAN, LOOKING FOR CLIP ID: " << clipId; clipId = clipId.section('_', 0, 0); - for (int i = 0; i < m_clipList.count(); i++) { + for (int i = 0; i < m_clipList.count(); ++i) { if (m_clipList.at(i)->getId() == clipId) { //kDebug() << "++++ CLIP MAN, FOUND FOR CLIP ID: " << clipId; return m_clipList.at(i); @@ -469,7 +469,7 @@ const QList ClipManager::getClipByResource(const QString &resour QList list; QString clipResource; QString proxyResource; - for (int i = 0; i < m_clipList.count(); i++) { + for (int i = 0; i < m_clipList.count(); ++i) { clipResource = m_clipList.at(i)->getProperty("resource"); proxyResource = m_clipList.at(i)->getProperty("proxy"); if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour"); @@ -483,14 +483,14 @@ const QList ClipManager::getClipByResource(const QString &resour void ClipManager::clearUnusedProducers() { - for (int i = 0; i < m_clipList.count(); i++) { + for (int i = 0; i < m_clipList.count(); ++i) { if (m_clipList.at(i)->numReferences() == 0) m_clipList.at(i)->deleteProducers(); } } void ClipManager::resetProducersList(const QList prods, bool displayRatioChanged, bool fpsChanged) { - for (int i = 0; i < m_clipList.count(); i++) { + for (int i = 0; i < m_clipList.count(); ++i) { if (m_clipList.at(i)->numReferences() > 0 || displayRatioChanged || fpsChanged) { m_clipList.at(i)->deleteProducers(); } @@ -498,7 +498,7 @@ void ClipManager::resetProducersList(const QList prods, bool d QString id; Mlt::Producer *prod; QStringList brokenClips; - for (int i = 0; i < prods.count(); i++) { + for (int i = 0; i < prods.count(); ++i) { prod = prods.at(i); id = prod->get("id"); if (id.contains('_')) id = id.section('_', 0, 0); @@ -600,7 +600,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, QMap prod.setAttribute("type", (int) TEXT); // extract embeded images QDomNodeList items = txtdoc.elementsByTagName("content"); - for (int i = 0; i < items.count() ; i++) { + for (int i = 0; i < items.count() ; ++i) { QDomElement content = items.item(i).toElement(); if (content.hasAttribute("base64")) { QString titlesFolder = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; @@ -813,7 +813,7 @@ QDomElement ClipManager::groupsXml() const QDomDocument doc; QDomElement groups = doc.createElement("groups"); doc.appendChild(groups); - for (int i = 0; i < m_groupsList.count(); i++) { + for (int i = 0; i < m_groupsList.count(); ++i) { QDomElement group = doc.createElement("group"); groups.appendChild(group); QList children = m_groupsList.at(i)->childItems(); @@ -843,7 +843,7 @@ void ClipManager::slotClipModified(const QString &path) { //kDebug() << "// CLIP: " << path << " WAS MODIFIED"; const QList list = getClipByResource(path); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip != NULL) { QString id = clip->getId(); @@ -875,7 +875,7 @@ void ClipManager::slotClipMissing(const QString &path) { // kDebug() << "// CLIP: " << path << " WAS MISSING"; const QList list = getClipByResource(path); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip != NULL) emit missingClip(clip->getId()); } @@ -885,7 +885,7 @@ void ClipManager::slotClipAvailable(const QString &path) { // kDebug() << "// CLIP: " << path << " WAS ADDED"; const QList list = getClipByResource(path); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip != NULL) emit availableClip(clip->getId()); } diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index d2c76470..589f5894 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -365,7 +365,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps m_view.animation->setCurrentIndex(0); QString path = props.value("resource"); QString ext = path.section('.', -1); - for (int i = 0; i < m_view.image_type->count(); i++) { + for (int i = 0; i < m_view.image_type->count(); ++i) { if (m_view.image_type->itemData(i).toString() == ext) { m_view.image_type->setCurrentIndex(i); break; @@ -867,7 +867,7 @@ void ClipProperties::slotDeleteMarker() { QList < CommentedTime > marks = m_clip->commentedSnapMarkers(); QList < CommentedTime > toDelete; - for (int i = 0; i < marks.count(); i++) { + for (int i = 0; i < marks.count(); ++i) { if (m_view.markers_list->topLevelItem(i)->isSelected()) { CommentedTime marker = marks.at(i); marker.setMarkerType(-1); diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp index 093d9350..ba659015 100644 --- a/src/clipstabilize.cpp +++ b/src/clipstabilize.cpp @@ -234,7 +234,7 @@ void ClipStabilize::slotStartStabilize() void ClipStabilize::slotUpdateParams() { - for (int i=0;icount();i++){ + for (int i=0;icount();++i){ QWidget* w=vbox->itemAt(i)->widget(); QString name=w->objectName(); if (!name.isEmpty() && m_ui_params.contains(name)){ diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp index 664eb5fa..87797a88 100644 --- a/src/cliptranscode.cpp +++ b/src/cliptranscode.cpp @@ -65,7 +65,7 @@ ClipTranscode::ClipTranscode(const KUrl::List &urls, const QString ¶ms, cons dest_url->setMode(KFile::Directory); dest_url->setUrl(KUrl(m_urls.at(0).directory())); dest_url->fileDialog()->setOperationMode(KFileDialog::Saving); - for (int i = 0; i < m_urls.count(); i++) + for (int i = 0; i < m_urls.count(); ++i) urls_list->addItem(m_urls.at(i).path()); } if (!params.isEmpty()) { @@ -261,7 +261,7 @@ void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exi //Refill url list in case user wants to transcode to another format if (urls_list->count() > 0) { m_urls.clear(); - for (int i = 0; i < urls_list->count(); i++) + for (int i = 0; i < urls_list->count(); ++i) m_urls << urls_list->item(i)->text(); } } diff --git a/src/colorcorrection/rgbparadegenerator.cpp b/src/colorcorrection/rgbparadegenerator.cpp index e81cdc45..97ae402d 100644 --- a/src/colorcorrection/rgbparadegenerator.cpp +++ b/src/colorcorrection/rgbparadegenerator.cpp @@ -80,7 +80,7 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm const float wPrediv = (float)(partW-1)/(iw-1); StructRGB paradeVals[partW][256]; - for (uint i = 0; i < partW; i++) { + for (uint i = 0; i < partW; ++i) { for (uint j = 0; j < 256; j++) { paradeVals[i][j].r = 0; paradeVals[i][j].g = 0; @@ -121,7 +121,7 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm const uint offset2 = 2*partW + 2*offset; switch(paintMode) { case PaintMode_RGB: - for (uint i = 0; i < partW; i++) { + for (uint i = 0; i < partW; ++i) { for (uint j = 0; j < 256; j++) { unscaled.setPixel(i, j, qRgba(255,10,10, CHOP255(gain*paradeVals[i][j].r))); unscaled.setPixel(i+offset1, j, qRgba(10,255,10, CHOP255(gain*paradeVals[i][j].g))); @@ -130,7 +130,7 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm } break; default: - for (uint i = 0; i < partW; i++) { + for (uint i = 0; i < partW; ++i) { for (uint j = 0; j < 256; j++) { unscaled.setPixel(i, j, qRgba(255,255,255, CHOP255(gain*paradeVals[i][j].r))); unscaled.setPixel(i+offset1, j, qRgba(255,255,255, CHOP255(gain*paradeVals[i][j].g))); @@ -147,7 +147,7 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm if (drawAxis) { QRgb opx; - for (uint i = 0; i <= 10; i++) { + for (uint i = 0; i <= 10; ++i) { dy = (float)i/10 * (partH-1); for (uint x = 0; x < ww-distRight; x++) { opx = parade.pixel(x, dy); diff --git a/src/colorcorrection/waveformgenerator.cpp b/src/colorcorrection/waveformgenerator.cpp index a1d2162f..8571023f 100644 --- a/src/colorcorrection/waveformgenerator.cpp +++ b/src/colorcorrection/waveformgenerator.cpp @@ -57,7 +57,7 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm const uint byteCount = iw*ih; uint waveValues[waveformSize.width()][waveformSize.height()]; - for (int i = 0; i < waveformSize.width(); i++) { + for (int i = 0; i < waveformSize.width(); ++i) { for (int j = 0; j < waveformSize.height(); j++) { waveValues[i][j] = 0; } @@ -110,7 +110,7 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm switch (paintMode) { case PaintMode_Green: - for (int i = 0; i < waveformSize.width(); i++) { + for (int i = 0; i < waveformSize.width(); ++i) { for (int j = 0; j < waveformSize.height(); j++) { // Logarithmic scale. Needs fine tuning by hand, but looks great. wave.setPixel(i, waveformSize.height()-j-1, qRgba(CHOP255(52*log(0.1*gain*waveValues[i][j])), @@ -121,14 +121,14 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm } break; case PaintMode_Yellow: - for (int i = 0; i < waveformSize.width(); i++) { + for (int i = 0; i < waveformSize.width(); ++i) { for (int j = 0; j < waveformSize.height(); j++) { wave.setPixel(i, waveformSize.height()-j-1, qRgba(255,242,0, CHOP255(gain*waveValues[i][j]))); } } break; default: - for (int i = 0; i < waveformSize.width(); i++) { + for (int i = 0; i < waveformSize.width(); ++i) { for (int j = 0; j < waveformSize.height(); j++) { wave.setPixel(i, waveformSize.height()-j-1, qRgba(255,255,255, CHOP255(2*gain*waveValues[i][j]))); } @@ -141,7 +141,7 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm QRgb opx; davinci.setPen(qRgba(150,255,200,32)); davinci.setCompositionMode(QPainter::CompositionMode_Overlay); - for (uint i = 0; i <= 10; i++) { + for (uint i = 0; i <= 10; ++i) { dy = (float)i/10 * (wh-1); for (uint x = 0; x < ww; x++) { opx = wave.pixel(x, dy); diff --git a/src/commands/moveeffectcommand.cpp b/src/commands/moveeffectcommand.cpp index ba394793..e290ff2a 100644 --- a/src/commands/moveeffectcommand.cpp +++ b/src/commands/moveeffectcommand.cpp @@ -30,7 +30,7 @@ MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, con m_oldindex(oldPos), m_pos(pos) { - for (int i = 0; i < m_oldindex.count(); i++) { + for (int i = 0; i < m_oldindex.count(); ++i) { m_newindex << newPos + i; } /* QString effectName; diff --git a/src/cornerswidget.cpp b/src/cornerswidget.cpp index aacebe35..372a6bb2 100644 --- a/src/cornerswidget.cpp +++ b/src/cornerswidget.cpp @@ -223,7 +223,7 @@ void CornersWidget::slotInsertKeyframe() QPolygonF pol = m_item->polygon(); double val; - for (int i = 0; i < keyframe_list->columnCount(); i++) { + for (int i = 0; i < keyframe_list->columnCount(); ++i) { if (i < 8) { if (i % 2 == 0) val = pol.at(i / 2).x() / (double)m_monitor->render->frameRenderWidth(); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 7cc62201..72f07a98 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -241,7 +241,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi markermenu->addMenu(m_markerMenu); connect(m_markerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToMarker(QAction*))); QList list = m_timelineContextClipMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i)); @@ -250,7 +250,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_timelineContextTransitionMenu = transition; list = m_timelineContextTransitionMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "auto") { m_autoTransition = list.at(i); break; @@ -298,7 +298,7 @@ void CustomTrackView::updateSceneFrameWidth() int frameWidth = getFrameWidth(); QList itemList = items(); ClipItem *item; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); item->resetFrameWidth(frameWidth); @@ -318,7 +318,7 @@ bool CustomTrackView::checkTrackHeight() int frameWidth = getFrameWidth(); bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = (ClipItem*) itemList.at(i); item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1); @@ -333,7 +333,7 @@ bool CustomTrackView::checkTrackHeight() } double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); m_cursorLine->setLine(0, 0, 0, newHeight - 1); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } @@ -519,7 +519,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) QPainterPath shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); QList collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -529,7 +529,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } bool collision = false; int offset = 0; - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (!collidingItems.at(i)->isEnabled()) continue; if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { AbstractClipItem *item = static_cast (collidingItems.at(i)); @@ -545,7 +545,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -554,7 +554,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) collidingItems.removeAll(children.at(i)); } - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (!collidingItems.at(i)->isEnabled()) continue; if (collidingItems.at(i)->type() == AVWIDGET) { collision = true; @@ -568,7 +568,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -578,7 +578,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } offset = 0; - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) { AbstractClipItem *item = static_cast (collidingItems.at(i)); // Moving backward, determine best pos @@ -594,7 +594,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { QList subchildren = children.at(i)->childItems(); for (int j = 0; j < subchildren.count(); j++) @@ -602,7 +602,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } collidingItems.removeAll(children.at(i)); } - for (int i = 0; i < collidingItems.count(); i++) { + for (int i = 0; i < collidingItems.count(); ++i) { if (collidingItems.at(i)->type() == TRANSITIONWIDGET) { collision = true; break; @@ -629,7 +629,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) { opMode = MOVEGUIDE; setCursor(Qt::SplitHCursor); - } else for (int i = 0; i < itemList.count(); i++) { + } else for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { item = (QGraphicsRectItem*) itemList.at(i); break; @@ -845,7 +845,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem = collisionClip; } found = true; - for (int i = 0; i < m_document->tracksCount(); i++) { + for (int i = 0; i < m_document->tracksCount(); ++i) { if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); } yOffset = mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y(); @@ -907,7 +907,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (!m_dragItem && !m_dragGuide) { // check if there is a guide close to mouse click QList guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide - for (int i = 0; i < guidesCollisionList.count(); i++) { + for (int i = 0; i < guidesCollisionList.count(); ++i) { if (guidesCollisionList.at(i)->type() == GUIDEITEM) { m_dragGuide = static_cast (guidesCollisionList.at(i)); break; @@ -970,7 +970,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) { AbstractClipItem *item = static_cast(selection.at(i)); if (item->isItemLocked()) continue; @@ -1071,7 +1071,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (dragGroup) { dragGroup->setSelected(selected); QList children = dragGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(selected); } if (dragGroup->parentItem()) { @@ -1102,7 +1102,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionMutex.lock(); if (m_selectionGroup) { QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(itemSelected); } m_selectionGroup->setSelected(itemSelected); @@ -1153,7 +1153,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionMutex.lock(); QList offsetList; QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (children.at(i)); offsetList.append(item->startPos()); @@ -1203,7 +1203,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { @@ -1236,7 +1236,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { @@ -1259,7 +1259,7 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos) const QPointF p((int)childPos.frames(m_document->fps()), childTrack * m_tracksHeight + m_tracksHeight / 2); QList list = scene()->items(p); AbstractGroupItem *group = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == GROUPWIDGET) { group = static_cast (list.at(i)); @@ -1276,7 +1276,7 @@ void CustomTrackView::rebuildGroup(AbstractGroupItem *group) if (group == m_selectionGroup) m_selectionGroup = NULL; QList children = group->childItems(); m_document->clipManager()->removeGroup(group); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { group->removeFromGroup(children.at(i)); } scene()->destroyItemGroup(group); @@ -1296,7 +1296,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) QList children = m_selectionGroup->childItems(); scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->parentItem() == 0) { if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { if (!static_cast (children.at(i))->isItemLocked()) { @@ -1325,7 +1325,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool QSet groupsList; QSet itemsList; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selectNewGroup) selection.at(i)->setSelected(true); if (selection.at(i)->type() == GROUPWIDGET) { AbstractGroupItem *it = static_cast (selection.at(i)); @@ -1336,7 +1336,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool groupsList.insert(it); } } - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) { AbstractGroupItem *it = static_cast (selection.at(i)->parentItem()); @@ -1386,7 +1386,7 @@ void CustomTrackView::groupSelectedItems(QList selection, bool foreach (QGraphicsItemGroup *value, groupsList) { QList children = value->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) itemsList.insert(children.at(i)); } @@ -1606,7 +1606,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs QList markers = item->baseClip()->commentedSnapMarkers(); int offset = (item->startPos()- item->cropStart()).frames(m_document->fps()); if (!markers.isEmpty()) { - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.count(); ++i) { int pos = (int) markers.at(i).time().frames(m_document->timecode().fps()); QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); QAction *go = m_markerMenu->addAction(position); @@ -1721,7 +1721,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); QStringList lockedTracks; - for (int i = 0; i < m_document->tracksCount(); i++) { + for (int i = 0; i < m_document->tracksCount(); ++i) { if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); } m_selectionGroup->setProperty("locked_tracks", lockedTracks); @@ -1800,7 +1800,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) updateSnapPoints(NULL, offsetList); QStringList lockedTracks; - for (int i = 0; i < m_document->tracksCount(); i++) { + for (int i = 0; i < m_document->tracksCount(); ++i) { if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); } @@ -1842,7 +1842,7 @@ bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos) collindingItems.removeAll(item); if (collindingItems.isEmpty()) return false; else { - for (int i = 0; i < collindingItems.count(); i++) { + for (int i = 0; i < collindingItems.count(); ++i) { QGraphicsItem *collision = collindingItems.at(i); if (collision->type() == item->type()) { // Collision @@ -1863,7 +1863,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) return; } bool success = true; - for (int i = 0; i < clip->effectsCount(); i++) { + for (int i = 0; i < clip->effectsCount(); ++i) { if (!m_document->renderer()->mltAddEffect(track, pos, getEffectArgs(clip->effect(i)), false)) success = false; } if (!success) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); @@ -1959,7 +1959,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { itemList << itemList.at(i)->childItems(); } @@ -2043,7 +2043,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } //expand groups - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { QList subitems = itemList.at(i)->childItems(); for (int j = 0; j < subitems.count(); j++) { @@ -2052,7 +2052,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (effect.tagName() == "effectgroup") { @@ -2080,7 +2080,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) setDocumentModified(); /*if (effectCommand->childCount() == 1) { // Display newly added clip effect - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(itemList.at(i)); clip->setSelectedEffect(clip->effectsCount()); @@ -2096,7 +2096,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } } else { - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(itemList.at(i)); if (clip->isMainSelectedClip()) { @@ -2166,7 +2166,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef delCommand->setText(i18n("Delete %1", effectName)); //expand groups - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == GROUPWIDGET) { QList subitems = items.at(i)->childItems(); for (int j = 0; j < subitems.count(); j++) { @@ -2175,7 +2175,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef } } - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (items.at(i)); int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id")); @@ -2326,7 +2326,7 @@ void CustomTrackView::moveEffect(int track, GenTime pos, QList oldPos, QLi new_position = max; } int old_position = oldPos.at(0); - for (int i = 0; i < newPos.count(); i++) { + for (int i = 0; i < newPos.count(); ++i) { QDomElement act = m_document->getTrackEffect(documentTrack, new_position); if (old_position > new_position) { // Moving up, we need to adjust index @@ -2349,7 +2349,7 @@ void CustomTrackView::moveEffect(int track, GenTime pos, QList oldPos, QLi new_position = clip->effectsCount(); } int old_position = oldPos.at(0); - for (int i = 0; i < newPos.count(); i++) { + for (int i = 0; i < newPos.count(); ++i) { QDomElement act = clip->effectAtIndex(new_position); if (old_position > new_position) { // Moving up, we need to adjust index @@ -2384,7 +2384,7 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int track, QList speedEffectIndexes; - for (int i = 0; i < effectIndexes.count(); i++) { + for (int i = 0; i < effectIndexes.count(); ++i) { QDomElement effect = clip->effectAtIndex(effectIndexes.at(i)); if (effect.attribute("id") == "speed") { // speed effect @@ -2589,7 +2589,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { @@ -2615,7 +2615,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) { @@ -2627,7 +2627,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); } } - } else for (int i = 0; i < itemList.count(); i++) { + } else for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *) itemList.at(i); ItemInfo info; @@ -2640,7 +2640,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2); QList selection = m_scene->items(r); bool transitionAccepted = true; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (selection.at(i)); if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) { @@ -2799,7 +2799,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) // Add refresh command for undo new RefreshMonitorCommand(this, false, true, addCommand); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { ClipItem *item = static_cast (items.at(i)); if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; if (items.count() == 1) { @@ -2860,7 +2860,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) QStringList timelineList; kDebug()<<"// ITEMS on TRACK: "<type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); int start = clip->startPos().frames(m_document->fps()); @@ -2901,7 +2901,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); QList selection = m_scene->items(rect); if (item) selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (!selection.at(i)->isEnabled()) continue; if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(selection.at(i)); @@ -2952,7 +2952,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); QList selection = m_scene->items(rect); if (item) selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(selection.at(i)); if (clip->startPos() < info.startPos) { @@ -2988,7 +2988,7 @@ void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item, QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5); QList selection = m_scene->items(rect); selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (!selection.at(i)->isEnabled()) continue; if (selection.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast(selection.at(i)); @@ -3067,7 +3067,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addItem(selection.at(i)); } @@ -3078,7 +3078,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) // adjust track number Mlt::Tractor *tractor = m_document->renderer()->lockService(); QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast(children.at(i)); children << grp->childItems(); @@ -3110,7 +3110,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) // Sync transition tracks with MLT playlist Transition *tr; TransitionInfo info; - for (int i = 0; i < transitionInfos.count(); i++) { + for (int i = 0; i < transitionInfos.count(); ++i) { info = transitionInfos.at(i); tr = getTransitionItem(info); if (tr) tr->setForcedTrack(info.forceTrack, info.a_track); @@ -3122,7 +3122,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) } int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } @@ -3151,7 +3151,7 @@ void CustomTrackView::removeTrack(int ix) m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addItem(selection.at(i)); } @@ -3164,7 +3164,7 @@ void CustomTrackView::removeTrack(int ix) // adjust track number QList children = m_selectionGroup->childItems(); //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast(children.at(i)); children << grp->childItems(); @@ -3196,7 +3196,7 @@ void CustomTrackView::removeTrack(int ix) m_document->renderer()->unlockService(tractor); int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } m_cursorLine->setLine(0, 0, 0, maxHeight - 1); @@ -3223,7 +3223,7 @@ void CustomTrackView::configTracks(QList < TrackInfo > trackInfos) void CustomTrackView::slotSwitchTrackAudio(int ix) { - /*for (int i = 0; i < m_document->tracksCount(); i++) + /*for (int i = 0; i < m_document->tracksCount(); ++i) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute); @@ -3249,7 +3249,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate) AbstractClipItem *clip = NULL; QList selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) { if (selection.at(i)->parentItem() && m_selectionGroup) { selection.removeAll((QGraphicsItem*)m_selectionGroup); @@ -3325,7 +3325,7 @@ QList CustomTrackView::checkForGroups(const QRectF &rect, bool QList selection = scene()->items(rect); *ok = true; int maxHeight = m_tracksHeight * 1.5; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { // Check that we don't try to move a group with clips on other tracks if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) { *ok = false; @@ -3393,7 +3393,7 @@ void CustomTrackView::slotRemoveSpace() QList clipsToMove; QList transitionsToMove; - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3409,14 +3409,14 @@ void CustomTrackView::slotRemoveSpace() // Make sure that by moving the items, we don't get a transition collision // Find first transition ItemInfo info = transitionsToMove.at(0); - for (int i = 1; i < transitionsToMove.count(); i++) + for (int i = 1; i < transitionsToMove.count(); ++i) if (transitionsToMove.at(i).startPos < info.startPos) info = transitionsToMove.at(i); // make sure there are no transitions on the way QRectF rect(info.startPos.frames(m_document->fps()) - length, track * m_tracksHeight + m_tracksHeight / 2, length - 1, m_tracksHeight / 2 - 2); items = scene()->items(rect); int transitionCorrection = -1; - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == TRANSITIONWIDGET) { // There is a transition on the way AbstractClipItem *item = static_cast (items.at(i)); @@ -3489,7 +3489,7 @@ void CustomTrackView::slotInsertSpace() QList clipsToMove; QList transitionsToMove; - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3521,12 +3521,12 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t QMap trackClipStartList; QMap trackTransitionStartList; - for (int i = 1; i < m_document->tracksCount() + 1; i++) { + for (int i = 1; i < m_document->tracksCount() + 1; ++i) { trackClipStartList[i] = -1; trackTransitionStartList[i] = -1; } - if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) { + if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); ++i) { clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); if (clip) { if (clip->parentItem()) { @@ -3540,7 +3540,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); } } - if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { + if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); ++i) { transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); if (transition) { if (transition->parentItem()) { @@ -3557,7 +3557,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t // update items coordinates QList itemList = m_selectionGroup->childItems(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); } else if (itemList.at(i)->type() == GROUPWIDGET) { @@ -3582,7 +3582,7 @@ void CustomTrackView::deleteClip(const QString &clipId) QUndoCommand *deleteCommand = new QUndoCommand(); new RefreshMonitorCommand(this, false, true, deleteCommand); int count = 0; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { @@ -3725,12 +3725,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) QMap trackClipStartList; QMap trackTransitionStartList; - for (int i = 1; i < m_document->tracksCount() + 1; i++) { + for (int i = 1; i < m_document->tracksCount() + 1; ++i) { trackClipStartList[i] = -1; trackTransitionStartList[i] = -1; } - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == GROUPWIDGET) { AbstractGroupItem* group = (AbstractGroupItem*)items.at(i); if (!groups.contains(group)) groups.append(group); @@ -3738,7 +3738,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() == AVWIDGET) { AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3765,7 +3765,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } resetSelectionGroup(); - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { rebuildGroup(groups.at(i)); } @@ -3970,13 +3970,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) // Expand groups int max = items.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { if (items.at(i)->type() == GROUPWIDGET) { items += items.at(i)->childItems(); } } m_document->renderer()->blockSignals(true); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); @@ -3994,7 +3994,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } m_document->renderer()->blockSignals(false); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { // re-add items in correct place if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); @@ -4013,7 +4013,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) info.track = m_document->tracksCount() - info.track; adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup); m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT); - for (int i = 0; i < clip->effectsCount(); i++) { + for (int i = 0; i < clip->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false); } } else { @@ -4323,7 +4323,7 @@ void CustomTrackView::deleteSelectedClips() int clipCount = 0; int transitionCount = 0; // expand & destroy groups - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { groupCount++; QList children = itemList.at(i)->childItems(); @@ -4351,7 +4351,7 @@ void CustomTrackView::deleteSelectedClips() } emit clipItemSelected(NULL); emit transitionItemSelected(NULL); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { clipCount++; ClipItem *item = static_cast (itemList.at(i)); @@ -4472,7 +4472,7 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) return; } // Process the cut - for (int i = 0; i < clipsToCut.count(); i++) { + for (int i = 0; i < clipsToCut.count(); ++i) { ClipItem *clip = static_cast(clipsToCut.at(i)); new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos, false, command); ClipItem *secondClip = cutClip(clip->info(), cutPos, true); @@ -4493,13 +4493,13 @@ void CustomTrackView::groupClips(bool group, QList itemList, QU // Expand groups int max = itemList.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { if (itemList.at(i)->type() == GROUPWIDGET) { itemList += itemList.at(i)->childItems(); } } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { AbstractClipItem *clip = static_cast (itemList.at(i)); if (!clip->isItemLocked()) clipInfos.append(clip->info()); @@ -4524,7 +4524,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList m_scene->clearSelection(); if (!group) { // ungroup, find main group to destroy it... - for (int i = 0; i < clipInfos.count(); i++) { + for (int i = 0; i < clipInfos.count(); ++i) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip == NULL) continue; if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { @@ -4535,7 +4535,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList } clip->setFlag(QGraphicsItem::ItemIsMovable, true); } - for (int i = 0; i < transitionInfos.count(); i++) { + for (int i = 0; i < transitionInfos.count(); ++i) { Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); if (tr == NULL) continue; if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { @@ -4551,14 +4551,14 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList return; } QList list; - for (int i = 0; i < clipInfos.count(); i++) { + for (int i = 0; i < clipInfos.count(); ++i) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip) { list.append(clip); //clip->setSelected(true); } } - for (int i = 0; i < transitionInfos.count(); i++) { + for (int i = 0; i < transitionInfos.count(); ++i) { Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); if (clip) { list.append(clip); @@ -4583,7 +4583,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i emit displayMessage(i18n("Waiting for clip..."), InformationMessage); emit forceClipProcessing(clipId); qApp->processEvents(); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; ++i) { if (baseclip->getProducer() == NULL) { qApp->processEvents(); m_producerNotReady.wait(&m_mutex, 200); @@ -4613,7 +4613,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, xml, item->getProducer(producerTrack), overwrite, push); - for (int i = 0; i < item->effectsCount(); i++) { + for (int i = 0; i < item->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false); } setDocumentModified(); @@ -4652,7 +4652,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload) } } } - for (int i = 0; i < clipList.count(); i++) + for (int i = 0; i < clipList.count(); ++i) clipList.at(i)->refreshClip(true, true); m_document->renderer()->unlockService(tractor); } @@ -4662,7 +4662,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); @@ -4677,7 +4677,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { ClipItem *test = static_cast (list.at(i)); @@ -4693,7 +4693,7 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) const QPointF p(pos, track * m_tracksHeight + m_tracksHeight / 2); QList list = scene()->items(p); ClipItem *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); @@ -4721,7 +4721,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track) const QPointF p(pos, track * m_tracksHeight + Transition::itemOffset() + 1); QList list = scene()->items(p); Transition *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { clip = static_cast (list.at(i)); @@ -4742,7 +4742,7 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) const QPointF p(framepos - 1, track * m_tracksHeight + Transition::itemOffset() + 1); QList list = scene()->items(p); Transition *clip = NULL; - for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); ++i) { if (!list.at(i)->isEnabled()) continue; if (list.at(i)->type() == TRANSITIONWIDGET) { Transition *test = static_cast (list.at(i)); @@ -4840,7 +4840,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta scene()->addItem(m_selectionGroup); m_document->renderer()->blockSignals(true); - for (int i = 0; i < startClip.count(); i++) { + for (int i = 0; i < startClip.count(); ++i) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; startClip[i].track = startClip.at(i).track - trackOffset; @@ -4856,7 +4856,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); } - for (int i = 0; i < startTransition.count(); i++) { + for (int i = 0; i < startTransition.count(); ++i) { if (reverseMove) { startTransition[i].startPos = startTransition.at(i).startPos - offset; startTransition[i].track = startTransition.at(i).track - trackOffset; @@ -4885,7 +4885,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta QList groupList; // Expand groups int max = children.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { if (children.at(i)->type() == GROUPWIDGET) { children += children.at(i)->childItems(); //AbstractGroupItem *grp = static_cast(children.at(i)); @@ -4899,7 +4899,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } } - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { // re-add items in correct place if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (children.at(i)); @@ -4917,7 +4917,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta int trackProducer = info.track; info.track = m_document->tracksCount() - info.track; m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer)); - for (int i = 0; i < clip->effectsCount(); i++) { + for (int i = 0; i < clip->effectsCount(); ++i) { m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false); } } else if (item->type() == TRANSITIONWIDGET) { @@ -4935,7 +4935,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } m_selectionMutex.unlock(); resetSelectionGroup(false); - for (int i = 0; i < groupList.count(); i++) { + for (int i = 0; i < groupList.count(); ++i) { rebuildGroup(groupList.at(i)); } @@ -5372,7 +5372,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList snaps; if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration()); QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i) == selected) continue; if (skipSelectedItems && itemList.at(i)->isSelected()) continue; if (itemList.at(i)->type() == AVWIDGET) { @@ -5423,7 +5423,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList position()); if (!offsetList.isEmpty()) { for (int j = 0; j < offsetList.size(); j++) { @@ -5496,7 +5496,7 @@ void CustomTrackView::slotAddClipMarker(const QString &id, QList subCommand = new QUndoCommand; subCommand->setText("Add markers"); } - for (int i = 0; i < newMarkers.count(); i++) { + for (int i = 0; i < newMarkers.count(); ++i) { CommentedTime oldMarker = base->markerAt(newMarkers.at(i).time()); if (oldMarker == CommentedTime()) { oldMarker = newMarkers.at(i); @@ -5538,7 +5538,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) QUndoCommand *deleteMarkers = new QUndoCommand(); deleteMarkers->setText("Delete clip markers"); - for (int i = 0; i < markers.size(); i++) { + for (int i = 0; i < markers.size(); ++i) { CommentedTime oldMarker = markers.at(i); CommentedTime marker = oldMarker; marker.setMarkerType(-1); @@ -5571,7 +5571,7 @@ void CustomTrackView::slotSaveClipMarkers(const QString &id) QString data; int category = cbox->currentIndex() - 1; - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.count(); ++i) { if (category >= 0) { // Save only the markers in selected category if (markers.at(i).markerType() != category) continue; @@ -5692,7 +5692,7 @@ void CustomTrackView::addData(const QString &id, const QString &key, const QStri int CustomTrackView::hasGuide(int pos, int offset) { - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { int guidePos = m_guides.at(i)->position().frames(m_document->fps()); if (qAbs(guidePos - pos) <= offset) return guidePos; else if (guidePos > pos) return -1; @@ -5705,7 +5705,7 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const QAction *act; goMenu->clear(); double fps = m_document->fps(); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { act = goMenu->addAction(m_guides.at(i)->label() + '/' + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps)); act->setData(m_guides.at(i)->position().frames(m_document->fps())); } @@ -5717,7 +5717,7 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const if (comment.isEmpty() && pos < GenTime()) { // Delete guide bool found = false; - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == oldPos) { delete m_guides.takeAt(i); found = true; @@ -5729,7 +5729,7 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const else if (oldPos >= GenTime()) { // move guide - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == oldPos) { Guide *item = m_guides.at(i); item->updateGuide(pos, comment); @@ -5743,7 +5743,7 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const bool CustomTrackView::addGuide(const GenTime &pos, const QString &comment) { - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == pos) { emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage); return false; @@ -5784,7 +5784,7 @@ void CustomTrackView::slotEditGuide(int guidePos) if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps()); else pos = GenTime(guidePos, m_document->fps()); bool found = false; - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == pos) { slotEditGuide(m_guides.at(i)->info()); found = true; @@ -5824,7 +5824,7 @@ void CustomTrackView::slotDeleteGuide(int guidePos) if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps()); else pos = GenTime(guidePos, m_document->fps()); bool found = false; - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { if (m_guides.at(i)->position() == pos) { EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true); m_commandStack->push(command); @@ -5848,7 +5848,7 @@ void CustomTrackView::slotDeleteAllGuides() { QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true, deleteAll); } m_commandStack->push(deleteAll); @@ -5881,7 +5881,7 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) if (adjust) { double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); m_cursorLine->setLine(0, 0, 0, newHeight - 1); - for (int i = 0; i < m_guides.count(); i++) { + for (int i = 0; i < m_guides.count(); ++i) { m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); @@ -5901,7 +5901,7 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) void CustomTrackView::slotRefreshGuides() { if (KdenliveSettings::showmarkers()) { - for (int i = 0; i < m_guides.count(); i++) + for (int i = 0; i < m_guides.count(); ++i) m_guides.at(i)->update(); } } @@ -5920,7 +5920,7 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) int maxTrack = m_document->tracksCount(); QColor lockedColor = palette().button().color(); QColor audioColor = palette().alternateBase().color(); - for (int i = 0; i < maxTrack; i++) { + for (int i = 0; i < maxTrack; ++i) { TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); @@ -5982,7 +5982,7 @@ void CustomTrackView::initSearchStrings() { m_searchPoints.clear(); QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { // parse all clip names if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); @@ -5996,7 +5996,7 @@ void CustomTrackView::initSearchStrings() } // add guides - for (int i = 0; i < m_guides.count(); i++) + for (int i = 0; i < m_guides.count(); ++i) m_searchPoints.append(m_guides.at(i)->info()); qSort(m_searchPoints); @@ -6012,7 +6012,7 @@ QList CustomTrackView::findId(const QString &clipId) { QList matchingInfo; QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) @@ -6031,7 +6031,7 @@ void CustomTrackView::copyClip() emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); return; } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (itemList.at(i)); ClipItem *clone = clip->clone(clip->info()); @@ -6061,7 +6061,7 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const } QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1 + offset), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double) height); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if (collisions.at(i)->type() == type) { return false; } @@ -6072,12 +6072,12 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const bool CustomTrackView::canBePastedTo(QList infoList, int type) const { QPainterPath path; - for (int i = 0; i < infoList.count(); i++) { + for (int i = 0; i < infoList.count(); ++i) { const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); path.addRect(rect); } QList collisions = scene()->items(path); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if (collisions.at(i)->type() == type) return false; } return true; @@ -6085,7 +6085,7 @@ bool CustomTrackView::canBePastedTo(QList infoList, int type) const bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { ItemInfo info = items.at(i)->info(); info.startPos += offset; info.endPos += offset; @@ -6100,7 +6100,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset QPainterPath movePath; movePath.moveTo(0, 0); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { ItemInfo info = items.at(i)->info(); info.startPos = info.startPos + offset; info.endPos = info.endPos + offset; @@ -6113,7 +6113,7 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset movePath.addRect(rect); } QList collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast (collisions.at(i)))) { kDebug() << " //////////// CLIP COLLISION, MOVE NOT ALLOWED"; return false; @@ -6152,7 +6152,7 @@ void CustomTrackView::pasteClip() GenTime leftPos = m_copiedItems.at(0)->startPos(); int lowerTrack = m_copiedItems.at(0)->track(); int upperTrack = m_copiedItems.at(0)->track(); - for (int i = 1; i < m_copiedItems.count(); i++) { + for (int i = 1; i < m_copiedItems.count(); ++i) { if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos(); if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track(); if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track(); @@ -6171,7 +6171,7 @@ void CustomTrackView::pasteClip() pasteClips->setText("Paste clips"); new RefreshMonitorCommand(this, false, true, pasteClips); - for (int i = 0; i < m_copiedItems.count(); i++) { + for (int i = 0; i < m_copiedItems.count(); ++i) { // parse all clip names if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (m_copiedItems.at(i)); @@ -6260,7 +6260,7 @@ void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime int max = (newstart + duration).frames(m_document->fps()); QLocale locale; QDomNodeList params = xml.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString def = e.attribute("default"); @@ -6286,7 +6286,7 @@ ClipItem *CustomTrackView::getClipUnderCursor() const { QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount())); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { if (collisions.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast < ClipItem *>(collisions.at(i)); if (!clip->isItemLocked()) return clip; @@ -6323,7 +6323,7 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con // remove all items in the list that are not clips for (int i = 0; i < clips.count();) { if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i); - else i++; + else ++i; } if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0)); for (int i = 0; i < clips.count(); ++i) { @@ -6409,7 +6409,7 @@ void CustomTrackView::slotUpdateAllThumbs() //if (itemList.isEmpty()) return; ClipItem *item; const QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) { @@ -6449,7 +6449,7 @@ void CustomTrackView::saveThumbnails() QList itemList = items(); ClipItem *item; QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == AVWIDGET) { item = static_cast (itemList.at(i)); if (item->clipType() != COLOR) { @@ -6563,7 +6563,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) new RefreshMonitorCommand(this, false, true, deleteTrack); // Delete all clips in selected track - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (selection.at(i)); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack); @@ -6621,7 +6621,7 @@ void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &min QList selection; selection = m_scene->items(0, item->track() * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2); selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { AbstractClipItem *clip = static_cast (selection.at(i)); if (clip && clip->type() == AVWIDGET) { if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); @@ -6637,7 +6637,7 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim QList selection; selection = m_scene->items(0, (item->track() + 1) * m_tracksHeight, sceneRect().width(), 2); selection.removeAll(item); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { AbstractClipItem *clip = static_cast (selection.at(i)); if (clip && clip->type() == TRANSITIONWIDGET) { if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos(); @@ -6648,7 +6648,7 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim void CustomTrackView::loadGroups(const QDomNodeList &groups) { - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { QDomNodeList children = groups.at(i).childNodes(); scene()->clearSelection(); QList list; @@ -6678,7 +6678,7 @@ void CustomTrackView::splitAudio() } QUndoCommand *splitCommand = new QUndoCommand(); splitCommand->setText(i18n("Split audio")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -6908,7 +6908,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef kDebug() << "//SOMETHING IS WRONG WITH CLP GRP"; return; } - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i) != clip) { ClipItem *clp = static_cast (children.at(i)); ItemInfo info = clip->info(); @@ -6954,7 +6954,7 @@ void CustomTrackView::setVideoOnly() } QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Video only")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -6979,7 +6979,7 @@ void CustomTrackView::setAudioOnly() } QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Audio only")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -7004,7 +7004,7 @@ void CustomTrackView::setAudioAndVideo() } QUndoCommand *videoCommand = new QUndoCommand(); videoCommand->setText(i18n("Audio and Video")); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { @@ -7088,7 +7088,7 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) if (clip->isAudioOnly()) lookup = "clip_audio_only"; else if (clip->isVideoOnly()) lookup = "clip_video_only"; else lookup = "clip_audio_and_video"; - for (int i = 0; i < actions.count(); i++) { + for (int i = 0; i < actions.count(); ++i) { if (actions.at(i)->data().toString() == lookup) { actions.at(i)->setChecked(true); break; @@ -7096,10 +7096,10 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) } } - for (int i = 0; i < m_audioActions.count(); i++) { + for (int i = 0; i < m_audioActions.count(); ++i) { m_audioActions.at(i)->setEnabled(hasAudio); } - for (int i = 0; i < m_avActions.count(); i++) { + for (int i = 0; i < m_avActions.count(); ++i) { m_avActions.at(i)->setEnabled(hasAV); } } @@ -7116,7 +7116,7 @@ void CustomTrackView::reloadTransitionLumas() QString lumaFiles; QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma"); QDomNodeList params = lumaTransition.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "resource") { lumaNames = e.attribute("paramlistdisplay"); @@ -7128,13 +7128,13 @@ void CustomTrackView::reloadTransitionLumas() QList itemList = items(); Transition *transitionitem; QDomElement transitionXml; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); if (transitionXml.attribute("id") == "luma" && transitionXml.attribute("tag") == "luma") { QDomNodeList params = transitionXml.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "resource") { e.setAttribute("paramlistdisplay", lumaNames); @@ -7145,7 +7145,7 @@ void CustomTrackView::reloadTransitionLumas() } if (transitionXml.attribute("id") == "composite" && transitionXml.attribute("tag") == "composite") { QDomNodeList params = transitionXml.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "luma") { e.setAttribute("paramlistdisplay", lumaNames); @@ -7171,11 +7171,11 @@ void CustomTrackView::updateProjectFps() scene()->clearSelection(); m_dragItem = NULL; QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { // remove all items and re-add them one by one if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i)); } - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) { AbstractClipItem *clip = static_cast (itemList.at(i)); clip->updateFps(m_document->fps()); @@ -7240,7 +7240,7 @@ QStringList CustomTrackView::selectedClips() const { QStringList clipIds; QList selection = m_scene->selectedItems(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)selection.at(i); clipIds << item->clipProducer(); @@ -7253,7 +7253,7 @@ QList CustomTrackView::selectedClipItems() const { QList clips; QList selection = m_scene->selectedItems(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { clips.append((ClipItem *)selection.at(i)); } @@ -7278,7 +7278,7 @@ void CustomTrackView::slotSelectClipsInTrack() QList selection = m_scene->items(rect); m_scene->clearSelection(); QList list; - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { list.append(selection.at(i)); } @@ -7303,7 +7303,7 @@ void CustomTrackView::selectClip(bool add, bool group, int track, int pos) QList selection = m_scene->items(rect); resetSelectionGroup(group); if (!group) m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { selection.at(i)->setSelected(add); break; @@ -7318,7 +7318,7 @@ void CustomTrackView::selectTransition(bool add, bool group) QList selection = m_scene->items(rect); resetSelectionGroup(group); if (!group) m_scene->clearSelection(); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == TRANSITIONWIDGET) { selection.at(i)->setSelected(add); break; @@ -7333,7 +7333,7 @@ QStringList CustomTrackView::extractTransitionsLumas() QList itemList = items(); Transition *transitionitem; QDomElement transitionXml; - for (int i = 0; i < itemList.count(); i++) { + for (int i = 0; i < itemList.count(); ++i) { if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionitem = static_cast (itemList.at(i)); transitionXml = transitionitem->toXML(); @@ -7360,7 +7360,7 @@ void CustomTrackView::checkTrackSequence(int track) QList selection = m_scene->items(rect); QList timelineList; timelineList.append(0); - for (int i = 0; i < selection.count(); i++) { + for (int i = 0; i < selection.count(); ++i) { if (selection.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast (selection.at(i)); int start = clip->startPos().frames(m_document->fps()); @@ -7508,7 +7508,7 @@ bool CustomTrackView::hasAudio(int track) const QRectF rect(0, (double)(track * m_tracksHeight + 1), (double) sceneRect().width(), (double)(m_tracksHeight - 1)); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); QGraphicsItem *item; - for (int i = 0; i < collisions.count(); i++) { + for (int i = 0; i < collisions.count(); ++i) { item = collisions.at(i); if (!item->isEnabled()) continue; if (item->type() == AVWIDGET) { @@ -7575,7 +7575,7 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect) if (effect.hasAttribute("out")) parameters.addParam("out", effect.attribute("out")); if (effect.attribute("id") == "region") { QDomNodeList subeffects = effect.elementsByTagName("effect"); - for (int i = 0; i < subeffects.count(); i++) { + for (int i = 0; i < subeffects.count(); ++i) { QDomElement subeffect = subeffects.at(i).toElement(); int subeffectix = subeffect.attribute("region_ix").toInt(); parameters.addParam(QString("filter%1").arg(subeffectix), subeffect.attribute("id")); @@ -7596,7 +7596,7 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect) void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, MltVideoProfile profile, const QString &prefix) { QLocale locale; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); QString paramname = prefix + e.attribute("name"); if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { @@ -7635,7 +7635,7 @@ void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, Q QTextStream txtNeu(&neu); if (values.size() > 0) txtNeu << (int)values[0].toDouble(); - for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) { + for (int i = 0; i < separators.size() && i + 1 < values.size(); ++i) { txtNeu << separators[i]; txtNeu << (int)(values[i+1].toDouble()); } @@ -7789,7 +7789,7 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) } // Make sure there is no collision QList children = m_selectionGroup->childItems(); - for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); ++i) { if (children.at(i)->type() == AVWIDGET) { item = (ClipItem*) children.at(i); break; diff --git a/src/databackup/backupwidget.cpp b/src/databackup/backupwidget.cpp index 8ff35b07..d707ccca 100644 --- a/src/databackup/backupwidget.cpp +++ b/src/databackup/backupwidget.cpp @@ -81,7 +81,7 @@ void BackupWidget::slotParseBackupFiles() backup_list->clear(); QListWidgetItem *item; QString label; - for (int i = 0; i < resultList.count(); i++) { + for (int i = 0; i < resultList.count(); ++i) { label = resultList.at(i).lastModified().toString(Qt::SystemLocaleLongDate); if (m_projectWildcard.startsWith('*')) { // Displaying all backup files, so add project name in the entries diff --git a/src/definitions.h b/src/definitions.h index cb61e83c..20e87240 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -227,7 +227,7 @@ class EffectsParameterList: public QList < EffectParameter > public: EffectsParameterList(): QList < EffectParameter >() {} bool hasParam(const QString &name) const { - for (int i = 0; i < size(); i++) + for (int i = 0; i < size(); ++i) if (at(i).name() == name) return true; return false; } diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 61632374..6af1f50e 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -61,14 +61,14 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin m_clipType = (CLIPTYPE) type; if (m_placeHolder) xml.removeAttribute("placeholder"); QDomNamedNodeMap attributes = xml.attributes(); - for (int i = 0; i < attributes.count(); i++) { + for (int i = 0; i < attributes.count(); ++i) { QString name = attributes.item(i).nodeName(); if (name.startsWith("meta.attr.")) { m_metadata.insert(name.section('.', 2), QStringList() << attributes.item(i).nodeValue()); } else m_properties.insert(name, attributes.item(i).nodeValue()); } QDomNodeList metas = xml.elementsByTagName("metaproperty"); - for (int i = 0; i < metas.count(); i++) { + for (int i = 0; i < metas.count(); ++i) { QDomElement e = metas.item(i).toElement(); if (!e.isNull()) { m_metadata.insert(e.attribute("name").section('.', 2), QStringList() << e.firstChild().nodeValue() << e.attribute("tool")); @@ -76,7 +76,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin } if (xml.hasAttribute("cutzones")) { QStringList cuts = xml.attribute("cutzones").split(';', QString::SkipEmptyParts); - for (int i = 0; i < cuts.count(); i++) { + for (int i = 0; i < cuts.count(); ++i) { QString z = cuts.at(i); addCutZone(z.section('-', 0, 0).toInt(), z.section('-', 1, 1).toInt(), z.section('-', 2, 2)); } @@ -84,7 +84,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin if (xml.hasAttribute("analysisdata")) { QStringList adata = xml.attribute("analysisdata").split('#', QString::SkipEmptyParts); - for (int i = 0; i < adata.count(); i++) + for (int i = 0; i < adata.count(); ++i) m_analysisdata.insert(adata.at(i).section('?', 0, 0), adata.at(i).section('?', 1, 1)); } @@ -279,7 +279,7 @@ QDomElement DocClipBase::toXML(bool hideTemporaryProperties) const doc.appendChild(clip); if (!m_cutZones.isEmpty()) { QStringList cuts; - for (int i = 0; i < m_cutZones.size(); i++) { + for (int i = 0; i < m_cutZones.size(); ++i) { CutZoneInfo info = m_cutZones.at(i); cuts << QString::number(info.zone.x()) + "-" + QString::number(info.zone.y()) + "-" + info.description; } @@ -506,13 +506,13 @@ void DocClipBase::deleteProducers() if (numReferences() > 0 && (!m_baseTrackProducers.isEmpty() || !m_videoTrackProducers.isEmpty() || !m_audioTrackProducers.isEmpty())) { // Clip is used in timeline, delay producers deletion - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { m_toDeleteProducers.append(m_baseTrackProducers.at(i)); } - for (int i = 0; i < m_videoTrackProducers.count(); i++) { + for (int i = 0; i < m_videoTrackProducers.count(); ++i) { m_toDeleteProducers.append(m_videoTrackProducers.at(i)); } - for (int i = 0; i < m_audioTrackProducers.count(); i++) { + for (int i = 0; i < m_audioTrackProducers.count(); ++i) { m_toDeleteProducers.append(m_audioTrackProducers.at(i)); } } @@ -532,7 +532,7 @@ void DocClipBase::cleanupProducers() /* int ct = 0; kDebug()<<"----------------------------------------------------------------------------------"; - for (int i = 0; i < m_toDeleteProducers.count(); i++) { + for (int i = 0; i < m_toDeleteProducers.count(); ++i) { if (m_toDeleteProducers.at(i) != NULL) { Mlt::Properties props(m_toDeleteProducers.at(i)->get_properties()); if (props.ref_count() > 2) { @@ -664,7 +664,7 @@ Mlt::Producer *DocClipBase::audioProducer(int track) } if (m_audioTrackProducers.at(track) == NULL) { int i; - for (i = 0; i < m_audioTrackProducers.count(); i++) + for (i = 0; i < m_audioTrackProducers.count(); ++i) if (m_audioTrackProducers.at(i) != NULL) break; Mlt::Producer *base; if (i >= m_audioTrackProducers.count()) { @@ -717,7 +717,7 @@ Mlt::Producer *DocClipBase::videoProducer(int track) } if (m_videoTrackProducers.at(track) == NULL) { int i; - for (i = 0; i < m_videoTrackProducers.count(); i++) + for (i = 0; i < m_videoTrackProducers.count(); ++i) if (m_videoTrackProducers.at(i) != NULL) break; Mlt::Producer *base; if (i >= m_videoTrackProducers.count()) { @@ -754,7 +754,7 @@ Mlt::Producer *DocClipBase::getCloneProducer() if (!prod) { if (!source) { QMutexLocker locker(&m_producerMutex); - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) { source = m_baseTrackProducers.at(i); break; @@ -786,7 +786,7 @@ Mlt::Producer *DocClipBase::getProducer(int track) if (m_baseTrackProducers.count() == 0) { return NULL; } - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) { return m_baseTrackProducers.at(i); } @@ -800,7 +800,7 @@ Mlt::Producer *DocClipBase::getProducer(int track) } if (m_baseTrackProducers.at(track) == NULL) { int i; - for (i = 0; i < m_baseTrackProducers.count(); i++) + for (i = 0; i < m_baseTrackProducers.count(); ++i) if (m_baseTrackProducers.at(i) != NULL) break; if (i >= m_baseTrackProducers.count()) { @@ -849,7 +849,7 @@ Mlt::Producer *DocClipBase::cloneProducer(Mlt::Producer *source) void DocClipBase::setProducerProperty(const char *name, int data) { QMutexLocker locker(&m_producerMutex); - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) m_baseTrackProducers[i]->set(name, data); } @@ -858,7 +858,7 @@ void DocClipBase::setProducerProperty(const char *name, int data) void DocClipBase::setProducerProperty(const char *name, double data) { QMutexLocker locker(&m_producerMutex); - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) m_baseTrackProducers[i]->set(name, data); } @@ -867,7 +867,7 @@ void DocClipBase::setProducerProperty(const char *name, double data) void DocClipBase::setProducerProperty(const char *name, const char *data) { QMutexLocker locker(&m_producerMutex); - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) m_baseTrackProducers[i]->set(name, data); } @@ -876,7 +876,7 @@ void DocClipBase::setProducerProperty(const char *name, const char *data) void DocClipBase::resetProducerProperty(const char *name) { QMutexLocker locker(&m_producerMutex); - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) m_baseTrackProducers[i]->set(name, (const char*) NULL); } @@ -884,7 +884,7 @@ void DocClipBase::resetProducerProperty(const char *name) const char *DocClipBase::producerProperty(const char *name) const { - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) { return m_baseTrackProducers.at(i)->get(name); } @@ -1257,7 +1257,7 @@ void DocClipBase::addCutZone(int in, int out, QString desc) CutZoneInfo info; info.zone = QPoint(in, out); info.description = desc; - for (int i = 0; i < m_cutZones.count(); i++) + for (int i = 0; i < m_cutZones.count(); ++i) if (m_cutZones.at(i).zone == info.zone) { return; } @@ -1266,7 +1266,7 @@ void DocClipBase::addCutZone(int in, int out, QString desc) bool DocClipBase::hasCutZone(QPoint p) const { - for (int i = 0; i < m_cutZones.count(); i++) + for (int i = 0; i < m_cutZones.count(); ++i) if (m_cutZones.at(i).zone == p) return true; return false; } @@ -1275,7 +1275,7 @@ bool DocClipBase::hasCutZone(QPoint p) const void DocClipBase::removeCutZone(int in, int out) { QPoint p(in, out); - for (int i = 0; i < m_cutZones.count(); i++) { + for (int i = 0; i < m_cutZones.count(); ++i) { if (m_cutZones.at(i).zone == p) { m_cutZones.removeAt(i); i--; @@ -1306,7 +1306,7 @@ bool DocClipBase::hasVideoCodec(const QString &codec) const { Mlt::Producer *prod = NULL; if (m_baseTrackProducers.count() == 0) return false; - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) { prod = m_baseTrackProducers.at(i); break; @@ -1324,7 +1324,7 @@ bool DocClipBase::hasAudioCodec(const QString &codec) const { Mlt::Producer *prod = NULL; if (m_baseTrackProducers.count() == 0) return false; - for (int i = 0; i < m_baseTrackProducers.count(); i++) { + for (int i = 0; i < m_baseTrackProducers.count(); ++i) { if (m_baseTrackProducers.at(i) != NULL) { prod = m_baseTrackProducers.at(i); break; @@ -1376,7 +1376,7 @@ void DocClipBase::setAnalysisData(const QString &name, const QString &data, int int i = 1; QString newname = name + " " + QString::number(i); while (m_analysisdata.contains(newname)) { - i++; + ++i; newname = name + " " + QString::number(i); } m_analysisdata.insert(newname, geometryWithOffset(data, offset)); diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp index 3f82996e..d527a42b 100644 --- a/src/documentchecker.cpp +++ b/src/documentchecker.cpp @@ -86,7 +86,7 @@ bool DocumentChecker::hasErrorInClips() m_safeImages.clear(); m_safeFonts.clear(); max = m_info.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { e = m_info.item(i).toElement(); clipType = e.attribute("type").toInt(); if (clipType == COLOR) continue; @@ -170,7 +170,7 @@ bool DocumentChecker::hasErrorInClips() if (!root.isEmpty()) root = KUrl(root).path(KUrl::AddTrailingSlash); QDomNodeList trans = m_doc.elementsByTagName("transition"); max = trans.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QString luma = getProperty(trans.at(i).toElement(), "luma"); if (!luma.isEmpty() && !filesToCheck.contains(luma)) filesToCheck.append(luma); @@ -202,7 +202,7 @@ bool DocumentChecker::hasErrorInClips() m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); max = m_missingClips.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { e = m_missingClips.at(i).toElement(); QString clipType; int t = e.attribute("type").toInt(); @@ -286,7 +286,7 @@ bool DocumentChecker::hasErrorInClips() m_ui.fixDuration->setEnabled(!wrongDurationClips.isEmpty()); max = wrongDurationClips.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { e = wrongDurationClips.at(i).toElement(); QString clipType; int t = e.attribute("type").toInt(); @@ -337,7 +337,7 @@ bool DocumentChecker::hasErrorInClips() item->setToolTip(0, i18n("Missing proxy")); } - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { e = missingProxies.at(i).toElement(); QString realPath = e.attribute("resource"); QString id = e.attribute("id"); @@ -389,7 +389,7 @@ bool DocumentChecker::hasErrorInClips() item->setData(0, hashRole, e.attribute("file_hash")); item->setData(0, statusRole, SOURCEMISSING); item->setToolTip(0, i18n("Missing source clip")); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { e = missingSources.at(i).toElement(); QString clipType; QString realPath = e.attribute("resource"); @@ -438,7 +438,7 @@ DocumentChecker::~DocumentChecker() QString DocumentChecker::getProperty(QDomElement effect, const QString &name) { QDomNodeList params = effect.elementsByTagName("property"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { return e.firstChild().nodeValue(); @@ -450,7 +450,7 @@ QString DocumentChecker::getProperty(QDomElement effect, const QString &name) void DocumentChecker::setProperty(QDomElement effect, const QString &name, const QString &value) { QDomNodeList params = effect.elementsByTagName("property"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { e.firstChild().setNodeValue(value); @@ -561,7 +561,7 @@ QString DocumentChecker::searchPathRecursively(const QDir &dir, const QString &f if (!filesAndDirs.isEmpty()) return searchDir.absoluteFilePath(filesAndDirs.at(0)); searchDir.setNameFilters(QStringList()); filesAndDirs = searchDir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { foundFileName = searchPathRecursively(searchDir.absoluteFilePath(filesAndDirs.at(i)), fileName); if (!foundFileName.isEmpty()) break; @@ -575,7 +575,7 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m QByteArray fileData; QByteArray fileHash; QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { QFile file(dir.absoluteFilePath(filesAndDirs.at(i))); if (QString::number(file.size()) == matchSize) { if (file.open(QIODevice::ReadOnly)) { @@ -598,7 +598,7 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m //kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex(); } filesAndDirs = dir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { foundFileName = searchFileRecursively(dir.absoluteFilePath(filesAndDirs.at(i)), matchSize, matchHash); if (!foundFileName.isEmpty()) break; @@ -666,7 +666,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers QString id = child->data(0, idRole).toString(); if (t == TITLE_IMAGE_ELEMENT) { // edit images embedded in titles - for (int i = 0; i < infoproducers.count(); i++) { + for (int i = 0; i < infoproducers.count(); ++i) { e = infoproducers.item(i).toElement(); if (e.attribute("id") == id) { // Fix clip @@ -676,7 +676,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers break; } } - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { e = producers.item(i).toElement(); if (e.attribute("id").section('_', 0, 0) == id) { // Fix clip @@ -694,7 +694,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers } } else { // edit clip url - for (int i = 0; i < infoproducers.count(); i++) { + for (int i = 0; i < infoproducers.count(); ++i) { e = infoproducers.item(i).toElement(); if (e.attribute("id") == id) { // Fix clip @@ -704,7 +704,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers break; } } - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { e = producers.item(i).toElement(); if (e.attribute("id").section('_', 0, 0) == id || e.attribute("id").section(':', 1, 1) == id) { // Fix clip @@ -725,7 +725,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers } } else if (child->data(0, statusRole).toInt() == CLIPPLACEHOLDER && t != TITLE_FONT_ELEMENT && t != TITLE_IMAGE_ELEMENT) { QString id = child->data(0, idRole).toString(); - for (int i = 0; i < infoproducers.count(); i++) { + for (int i = 0; i < infoproducers.count(); ++i) { e = infoproducers.item(i).toElement(); if (e.attribute("id") == id) { // Fix clip @@ -734,7 +734,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers } } } else if (child->data(0, statusRole).toInt() == LUMAOK) { - for (int i = 0; i < trans.count(); i++) { + for (int i = 0; i < trans.count(); ++i) { QString luma = getProperty(trans.at(i).toElement(), "luma"); if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) { setProperty(trans.at(i).toElement(), "luma", child->text(1)); @@ -742,7 +742,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers } } } else if (child->data(0, statusRole).toInt() == LUMAMISSING) { - for (int i = 0; i < trans.count(); i++) { + for (int i = 0; i < trans.count(); ++i) { QString luma = getProperty(trans.at(i).toElement(), "luma"); if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) { setProperty(trans.at(i).toElement(), "luma", QString()); @@ -779,7 +779,7 @@ void DocumentChecker::slotFixDuration() QString id = child->data(0, idRole).toString(); bool resetDuration = child->data(0, resetDurationRole).toInt(); - for (int i = 0; i < m_info.count(); i++) { + for (int i = 0; i < m_info.count(); ++i) { QDomElement e = m_info.at(i).toElement(); if (e.attribute("id") == id) { if (m_missingClips.contains(e)) { @@ -858,7 +858,7 @@ void DocumentChecker::slotDeleteSelected() QDomElement e; QDomNodeList transitions = m_doc.elementsByTagName("transition"); foreach (const QString &lumaPath, deletedLumas) { - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { e = transitions.item(i).toElement(); QString resource = EffectsList::property(e, "luma"); if (resource == lumaPath) EffectsList::removeProperty(e, "luma"); @@ -874,7 +874,7 @@ void DocumentChecker::slotDeleteSelected() QDomNode mlt = m_doc.elementsByTagName("mlt").at(0); QDomNode kdenlivedoc = m_doc.elementsByTagName("kdenlivedoc").at(0); - for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); i++) { + for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); ++i) { e = infoproducers.item(i).toElement(); if (deletedIds.contains(e.attribute("id"))) { // Remove clip @@ -884,7 +884,7 @@ void DocumentChecker::slotDeleteSelected() } } - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { e = producers.item(i).toElement(); if (deletedIds.contains(e.attribute("id").section('_', 0, 0)) || deletedIds.contains(e.attribute("id").section(':', 1, 1).section('_', 0, 0))) { // Remove clip @@ -893,7 +893,7 @@ void DocumentChecker::slotDeleteSelected() } } - for (int i = 0; i < playlists.count(); i++) { + for (int i = 0; i < playlists.count(); ++i) { QDomNodeList entries = playlists.at(i).toElement().elementsByTagName("entry"); for (int j = 0; j < entries.count(); j++) { e = entries.item(j).toElement(); diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp index 989d5ffa..899bad46 100644 --- a/src/documentvalidator.cpp +++ b/src/documentvalidator.cpp @@ -171,7 +171,7 @@ bool DocumentValidator::validate(const double currentVersion) tnode = tinfo.firstChild(); } - for (int i = 1; i < tracks.count(); i++) { + for (int i = 1; i < tracks.count(); ++i) { QString hide = tracks.at(i).toElement().attribute("hide"); QDomElement newTrack = m_doc.createElement("trackinfo"); if (hide == "video") { @@ -289,7 +289,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) blank_tractor.appendChild(blank_track); QDomNodeList kdenlivetracks = m_doc.elementsByTagName("kdenlivetrack"); - for (int i = 0; i < kdenlivetracks.count(); i++) { + for (int i = 0; i < kdenlivetracks.count(); ++i) { blank_playlist = m_doc.createElement("playlist"); blank_playlist.setAttribute("id", "playlist" + QString::number(i)); westley.insertBefore(blank_playlist, QDomNode()); @@ -301,7 +301,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) blank_track.setAttribute("hide", "video"); } } - } else for (int i = 0; i < max; i++) { + } else for (int i = 0; i < max; ++i) { QDomNode n = playlists.at(i); westley.insertBefore(n, QDomNode()); QDomElement pl = n.toElement(); @@ -362,7 +362,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) // audio track mixing transitions should not be added to track view, so add required attribute QDomNodeList transitions = m_doc.elementsByTagName("transition"); max = transitions.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement tr = transitions.at(i).toElement(); if (tr.attribute("combine") == "1" && tr.attribute("mlt_service") == "mix") { QDomElement property = m_doc.createElement("property"); @@ -392,14 +392,14 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) } // move transitions after tracks - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { tractor.insertAfter(transitions.at(0), QDomNode()); } // Fix filters format QDomNodeList entries = m_doc.elementsByTagName("entry"); max = entries.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QString last_id; int effectix = 0; QDomNode m = entries.at(i).firstChild(); @@ -439,7 +439,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) max = filters.count(); QString last_id; int effectix = 0; - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement filt = filters.at(i).toElement(); QDomNamedNodeMap attrs = filt.attributes(); QString current_id = filt.attribute("kdenlive_id"); @@ -468,7 +468,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) // fix slowmotion QDomNodeList producers = westley.toElement().elementsByTagName("producer"); max = producers.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement prod = producers.at(i).toElement(); if (prod.attribute("mlt_service") == "framebuffer") { QString slowmotionprod = prod.attribute("resource"); @@ -482,7 +482,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) // This will get the xml producers: producers = m_doc.elementsByTagName("producer"); max = producers.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement prod = producers.at(0).toElement(); // add resource also as a property (to allow path correction in setNewResource()) // TODO: will it work with slowmotion? needs testing @@ -608,7 +608,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) } else { QDomNodeList wproducers = westley_element.elementsByTagName("producer"); int kmax = wproducers.count(); - for (int i = 0; i < kmax; i++) { + for (int i = 0; i < kmax; ++i) { QDomElement wproducer = wproducers.at(i).toElement(); if (wproducer.isNull()) { kWarning() << "Found producer in westley0, that was not a QDomElement"; @@ -697,7 +697,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) #endif QDomNodeList elements = westley.childNodes(); max = elements.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement prod = elements.at(0).toElement(); westley0.insertAfter(prod, QDomNode()); } @@ -746,7 +746,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) QString tracksOrder = infoXml.attribute("tracks"); if (tracksOrder.isEmpty()) { QDomNodeList tracks = m_doc.elementsByTagName("track"); - for (int i = 0; i < tracks.count(); i++) { + for (int i = 0; i < tracks.count(); ++i) { QDomElement track = tracks.at(i).toElement(); if (track.attribute("producer") != "black_track") { if (track.attribute("hide") == "video") @@ -757,7 +757,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) } } QDomElement tracksinfo = m_doc.createElement("tracksinfo"); - for (int i = 0; i < tracksOrder.size(); i++) { + for (int i = 0; i < tracksOrder.size(); ++i) { QDomElement trackinfo = m_doc.createElement("trackinfo"); if (tracksOrder.data()[i] == 'a') { trackinfo.setAttribute("type", "audio"); @@ -774,7 +774,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) if (version <= 0.82) { // Convert s in s (MLT extreme makeover) QDomNodeList westleyNodes = m_doc.elementsByTagName("westley"); - for (int i = 0; i < westleyNodes.count(); i++) { + for (int i = 0; i < westleyNodes.count(); ++i) { QDomElement westley = westleyNodes.at(i).toElement(); westley.setTagName("mlt"); } @@ -919,7 +919,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) // Make sure we don't have avformat-novalidate producers, since it caused crashes QDomNodeList producers = m_doc.elementsByTagName("producer"); int max = producers.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement prod = producers.at(i).toElement(); if (EffectsList::property(prod, "mlt_service") == "avformat-novalidate") EffectsList::setProperty(prod, "mlt_service", "avformat"); @@ -944,7 +944,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion) QDomNodeList transitions = m_doc.elementsByTagName("transition"); max = transitions.count(); int out; - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QDomElement trans = transitions.at(i).toElement(); out = trans.attribute("out").toInt() - trans.attribute("in").toInt(); QString geom = EffectsList::property(trans, "geometry"); diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 888b57d5..531a249e 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -335,7 +335,7 @@ void DvdWizard::processSpumux() but.setAttribute("x1", QString::number(r.right())); but.setAttribute("y1", QString::number(y1)); spu.appendChild(but); - i++; + ++i; } QFile data(m_menuFile.fileName()); @@ -435,7 +435,7 @@ void DvdWizard::processSpumux() but.setAttribute("x1", QString::number(r.right())); but.setAttribute("y1", QString::number(y1)); spuLetter.appendChild(but); - i++; + ++i; } //kDebug() << " SPUMUX DATA: " << doc.toString(); @@ -573,7 +573,7 @@ void DvdWizard::processDvdauthor(QString menuMovieUrl, QMap but QDomElement menuvob = dvddoc.createElement("vob"); menuvob.setAttribute("file", menuMovieUrl); pgc.appendChild(menuvob); - for (int i = 0; i < buttons.count(); i++) { + for (int i = 0; i < buttons.count(); ++i) { QDomElement button = dvddoc.createElement("button"); button.setAttribute("name", 'b' + QString::number(i)); nametext = dvddoc.createTextNode('{' + buttonsTarget.at(i) + ";}"); @@ -617,7 +617,7 @@ void DvdWizard::processDvdauthor(QString menuMovieUrl, QMap but // Get list of clips QStringList voburls = m_pageVob->selectedUrls(); - for (int i = 0; i < voburls.count(); i++) { + for (int i = 0; i < voburls.count(); ++i) { if (!voburls.at(i).isEmpty()) { // Add vob entry pgc2 = dvddoc.createElement("pgc"); @@ -902,7 +902,7 @@ void DvdWizard::slotGenerate() { // clear job icons if ((m_dvdauthor && m_dvdauthor->state() != QProcess::NotRunning) || (m_mkiso && m_mkiso->state() != QProcess::NotRunning)) return; - for (int i = 0; i < m_status.job_progress->count(); i++) + for (int i = 0; i < m_status.job_progress->count(); ++i) m_status.job_progress->item(i)->setIcon(KIcon()); QString warnMessage; if (KIO::NetAccess::exists(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), KIO::NetAccess::SourceSide, this)) @@ -988,7 +988,7 @@ void DvdWizard::slotLoad() } QDomNodeList vobs = doc.elementsByTagName("vob"); - for (int i = 0; i < vobs.count(); i++) { + for (int i = 0; i < vobs.count(); ++i) { QDomElement e = vobs.at(i).toElement(); m_pageVob->slotAddVobFile(KUrl(e.attribute("file")), e.attribute("chapters")); } diff --git a/src/dvdwizardchapters.cpp b/src/dvdwizardchapters.cpp index b289445f..3414a7c9 100644 --- a/src/dvdwizardchapters.cpp +++ b/src/dvdwizardchapters.cpp @@ -77,7 +77,7 @@ void DvdWizardChapters::slotUpdateChaptersList() // insert chapters QStringList chaptersString; - for (int i = 0; i < currentChaps.count(); i++) { + for (int i = 0; i < currentChaps.count(); ++i) { chaptersString.append(Timecode::getStringTimecode(currentChaps.at(i).toInt(), m_tc.fps(), true)); } m_view.chapters_list->clear(); @@ -94,14 +94,14 @@ void DvdWizardChapters::slotAddChapter() if (currentChaps.contains(QString::number(pos))) return; else currentChaps.append(QString::number(pos)); QList chapterTimes; - for (int i = 0; i < currentChaps.count(); i++) + for (int i = 0; i < currentChaps.count(); ++i) chapterTimes.append(currentChaps.at(i).toInt()); qSort(chapterTimes); // rebuild chapters QStringList chaptersString; currentChaps.clear(); - for (int i = 0; i < chapterTimes.count(); i++) { + for (int i = 0; i < chapterTimes.count(); ++i) { chaptersString.append(Timecode::getStringTimecode(chapterTimes.at(i), m_tc.fps(), true)); currentChaps.append(QString::number(chapterTimes.at(i))); } @@ -137,7 +137,7 @@ void DvdWizardChapters::slotRemoveChapter() // rebuild chapters QStringList chaptersString; - for (int i = 0; i < currentChaps.count(); i++) { + for (int i = 0; i < currentChaps.count(); ++i) { chaptersString.append(Timecode::getStringTimecode(currentChaps.at(i).toInt(), m_tc.fps(), true)); } m_view.chapters_list->clear(); @@ -180,7 +180,7 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies, m_view.vob_list->blockSignals(true); m_view.vob_list->clear(); - for (int i = 0; i < movies.count(); i++) { + for (int i = 0; i < movies.count(); ++i) { m_view.vob_list->addItem(movies.at(i), durations.at(i)); m_view.vob_list->setItemData(i, chapters.at(i).split(';'), Qt::UserRole + 1); } @@ -197,7 +197,7 @@ QMap DvdWizardChapters::chaptersData() const { QMap result; int max = m_view.vob_list->count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QString chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList().join(";"); result.insert(m_view.vob_list->itemText(i), chapters); } @@ -208,7 +208,7 @@ QStringList DvdWizardChapters::selectedTitles() const { QStringList result; int max = m_view.vob_list->count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { result.append(m_view.vob_list->itemText(i)); QStringList chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList(); for (int j = 0; j < chapters.count(); j++) { @@ -232,7 +232,7 @@ QStringList DvdWizardChapters::selectedTargets() const { QStringList result; int max = m_view.vob_list->count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { // rightJustified: fill with 0s to make menus with more than 9 buttons work (now up to 99 buttons possible) result.append("jump title " + QString::number(i + 1).rightJustified(2, '0')); QStringList chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList(); @@ -249,7 +249,7 @@ QDomElement DvdWizardChapters::toXml() const QDomDocument doc; QDomElement xml = doc.createElement("xml"); doc.appendChild(xml); - for (int i = 0; i < m_view.vob_list->count(); i++) { + for (int i = 0; i < m_view.vob_list->count(); ++i) { QDomElement vob = doc.createElement("vob"); vob.setAttribute("file", m_view.vob_list->itemText(i)); vob.setAttribute("chapters", m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList().join(";")); diff --git a/src/dvdwizardmenu.cpp b/src/dvdwizardmenu.cpp index 39f9909c..2952efae 100644 --- a/src/dvdwizardmenu.cpp +++ b/src/dvdwizardmenu.cpp @@ -158,7 +158,7 @@ void DvdWizardMenu::slotEnableShadows(int enable) { #if KDE_IS_VERSION(4,6,0) QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { if (enable) { QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(this); @@ -181,7 +181,7 @@ bool DvdWizardMenu::isComplete() const QList list = m_scene->items(); int buttonCount = 0; // check that the menu buttons don't collide - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { buttonCount++; DvdButton *button = static_cast < DvdButton* >(list.at(i)); @@ -259,7 +259,7 @@ bool DvdWizardMenu::isComplete() const void DvdWizardMenu::setButtonTarget(int ix) { QList list = m_scene->selectedItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { DvdButton *button = static_cast < DvdButton* >(list.at(i)); button->setTarget(ix, m_view.target_list->itemData(ix).toString()); @@ -272,7 +272,7 @@ void DvdWizardMenu::setButtonTarget(int ix) void DvdWizardMenu::setBackToMenu(bool backToMenu) { QList list = m_scene->selectedItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { DvdButton *button = static_cast < DvdButton* >(list.at(i)); button->setBackMenu(backToMenu); @@ -286,7 +286,7 @@ void DvdWizardMenu::buttonChanged() { QList list = m_scene->selectedItems(); bool foundButton = false; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { m_view.play_text->blockSignals(true); m_view.font_size->blockSignals(true); @@ -340,7 +340,7 @@ void DvdWizardMenu::addButton() void DvdWizardMenu::deleteButton() { QList list = m_scene->selectedItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { delete list.at(i); break; @@ -395,7 +395,7 @@ void DvdWizardMenu::setTargets(QStringList list, QStringList targetlist) m_view.target_list->clear(); m_view.target_list->addItem(i18n("Play All"), "jump title 1"); int movieCount = 0; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (targetlist.at(i).contains("chapter")) m_view.target_list->addItem(list.at(i), targetlist.at(i)); else { @@ -482,7 +482,7 @@ void DvdWizardMenu::buildButton() { DvdButton *button = NULL; QList list = m_scene->selectedItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { button = static_cast < DvdButton* >(list.at(i)); break; @@ -508,7 +508,7 @@ void DvdWizardMenu::updateColor() void DvdWizardMenu::prepareUnderLines() { QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { QRectF r = list.at(i)->sceneBoundingRect(); int bottom = r.bottom() - 1; @@ -531,7 +531,7 @@ void DvdWizardMenu::resetUnderLines() { QList list = m_scene->items(); QList toDelete; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonUnderlineItem) { toDelete.append(list.at(i)); } @@ -548,7 +548,7 @@ void DvdWizardMenu::resetUnderLines() void DvdWizardMenu::updateUnderlineColor(QColor c) { QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonUnderlineItem) { DvdButtonUnderline *underline = static_cast < DvdButtonUnderline* >(list.at(i)); underline->setPen(Qt::NoPen); @@ -563,7 +563,7 @@ void DvdWizardMenu::updateColor(QColor c) { DvdButton *button = NULL; QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { button = static_cast < DvdButton* >(list.at(i)); button->setDefaultTextColor(c); @@ -718,7 +718,7 @@ QMap DvdWizardMenu::buttonsInfo(bool letterbox) ratioy = (double) letterboxHeight / m_finalSize.height(); offset = (m_finalSize.height() - letterboxHeight) / 2; } - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { DvdButton *button = static_cast < DvdButton* >(list.at(i)); QRectF r = button->sceneBoundingRect(); @@ -758,7 +758,7 @@ QDomElement DvdWizardMenu::toXml() const QList list = m_scene->items(); int buttonCount = 0; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { buttonCount++; DvdButton *button = static_cast < DvdButton* >(list.at(i)); @@ -810,7 +810,7 @@ void DvdWizardMenu::loadXml(DVDFORMAT format, QDomElement xml) // Clear existing buttons QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == DvdButtonItem) { delete list.at(i); i--; @@ -818,7 +818,7 @@ void DvdWizardMenu::loadXml(DVDFORMAT format, QDomElement xml) } } - for (int i = 0; i < buttons.count(); i++) { + for (int i = 0; i < buttons.count(); ++i) { QDomElement e = buttons.at(i).toElement(); // create menu button DvdButton *button = new DvdButton(e.attribute("text")); diff --git a/src/dvdwizardmenu.h b/src/dvdwizardmenu.h index 8c4dd999..a67a1eed 100644 --- a/src/dvdwizardmenu.h +++ b/src/dvdwizardmenu.h @@ -133,7 +133,7 @@ protected: QList list = scene()->items(sceneShape, Qt::IntersectsItemShape); list.removeAll(this); if (!list.isEmpty()) { - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == Type) return pos(); } } diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp index f29c3f53..55ef71b3 100644 --- a/src/dvdwizardvob.cpp +++ b/src/dvdwizardvob.cpp @@ -153,7 +153,7 @@ void DvdWizardVob::slotCheckProfiles() { bool conflict = false; int comboProfile = m_view.dvd_profile->currentIndex(); - for (int i = 0; i < m_vobList->topLevelItemCount(); i++) { + for (int i = 0; i < m_vobList->topLevelItemCount(); ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (item->data(0, Qt::UserRole + 1).toInt() != comboProfile) { conflict = true; @@ -320,7 +320,7 @@ QStringList DvdWizardVob::selectedUrls() const // First movie is only for intro i = 1; } - for (; i < max; i++) { + for (; i < max; ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (item) result.append(item->text(0)); } @@ -338,7 +338,7 @@ QStringList DvdWizardVob::durations() const // First movie is only for intro i = 1; } - for (; i < max; i++) { + for (; i < max; ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (item) result.append(QString::number(item->data(1, Qt::UserRole).toInt())); } @@ -355,7 +355,7 @@ QStringList DvdWizardVob::chapters() const // First movie is only for intro i = 1; } - for (; i < max; i++) { + for (; i < max; ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (item) { result.append(item->data(1, Qt::UserRole + 1).toString()); @@ -372,7 +372,7 @@ void DvdWizardVob::updateChapters(QMap chaptersdata) // First movie is only for intro i = 1; } - for (; i < max; i++) { + for (; i < max; ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (chaptersdata.contains(item->text(0))) item->setData(1, Qt::UserRole + 1, chaptersdata.value(item->text(0))); } @@ -414,7 +414,7 @@ void DvdWizardVob::slotCheckVobList() else m_view.button_down->setEnabled(hasItem); qint64 totalSize = 0; - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { item = m_vobList->topLevelItem(i); if (item) totalSize += (qint64) item->data(2, Qt::UserRole).toInt(); } @@ -535,7 +535,7 @@ void DvdWizardVob::slotTranscodeFiles() // Transcode files that do not match selected profile int max = m_vobList->topLevelItemCount(); int format = m_view.dvd_profile->currentIndex(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (item->data(0, Qt::UserRole + 1).toInt() != format) { // File needs to be transcoded @@ -573,7 +573,7 @@ void DvdWizardVob::slotTranscodedClip(KUrl src, KUrl transcoded) return; } int max = m_vobList->topLevelItemCount(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QTreeWidgetItem *item = m_vobList->topLevelItem(i); if (KUrl(item->text(0)).path() == src.path()) { // Replace movie with transcoded version diff --git a/src/effectslist.cpp b/src/effectslist.cpp index 874790ee..fe7078fb 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -36,13 +36,13 @@ QDomElement EffectsList::getEffectByName(const QString & name) const { QString effectName; QDomNodeList effects = m_baseElement.childNodes(); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement effect = effects.at(i).toElement(); QDomElement namenode = effect.firstChildElement("name"); if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); if (name == effectName) { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.hasAttribute("value")) e.setAttribute("value", e.attribute("default")); @@ -58,7 +58,7 @@ QDomElement EffectsList::getEffectByName(const QString & name) const void EffectsList::initEffect(const QDomElement &effect) const { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.hasAttribute("value")) e.setAttribute("value", e.attribute("default")); @@ -68,7 +68,7 @@ void EffectsList::initEffect(const QDomElement &effect) const QDomElement EffectsList::getEffectByTag(const QString & tag, const QString & id) const { QDomNodeList effects = m_baseElement.childNodes(); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement effect = effects.at(i).toElement(); if (!id.isEmpty()) { if (effect.attribute("id") == id) { @@ -96,7 +96,7 @@ QDomElement EffectsList::getEffectByTag(const QString & tag, const QString & id) int EffectsList::hasEffect(const QString & tag, const QString & id) const { QDomNodeList effects = m_baseElement.childNodes(); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement effect = effects.at(i).toElement(); if (!id.isEmpty()) { if (effect.attribute("id") == id) return effect.attribute("kdenlive_ix").toInt(); @@ -124,7 +124,7 @@ QStringList EffectsList::effectNames() { QStringList list; QDomNodeList effects = m_baseElement.childNodes(); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement effect = effects.at(i).toElement(); QDomElement namenode = effect.firstChildElement("name"); if (!namenode.isNull()) list.append(i18n(namenode.text().toUtf8().data())); @@ -166,7 +166,7 @@ QString EffectsList::getEffectInfo(const QDomElement effect) const bool EffectsList::hasKeyFrames(const QDomElement &effect) { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("type") == "keyframe") return true; } @@ -177,7 +177,7 @@ bool EffectsList::hasKeyFrames(const QDomElement &effect) bool EffectsList::hasSimpleKeyFrames(const QDomElement &effect) { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("type") == "simplekeyframe") return true; } @@ -213,7 +213,7 @@ void EffectsList::setParameter(QDomElement effect, const QString &name, const QS { QDomNodeList params = effect.elementsByTagName("parameter"); bool found = false; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { e.setAttribute("value", value); @@ -236,7 +236,7 @@ void EffectsList::setParameter(QDomElement effect, const QString &name, const QS QString EffectsList::parameter(const QDomElement &effect, const QString &name) { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { return e.attribute("value"); @@ -251,7 +251,7 @@ void EffectsList::setProperty(QDomElement effect, const QString &name, const QSt QDomNodeList params = effect.elementsByTagName("property"); // Update property if it already exists bool found = false; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { e.firstChild().setNodeValue(value); @@ -275,7 +275,7 @@ void EffectsList::renameProperty(QDomElement effect, const QString &oldName, con { QDomNodeList params = effect.elementsByTagName("property"); // Update property if it already exists - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == oldName) { e.setAttribute("name", newName); @@ -288,7 +288,7 @@ void EffectsList::renameProperty(QDomElement effect, const QString &oldName, con QString EffectsList::property(QDomElement effect, const QString &name) { QDomNodeList params = effect.elementsByTagName("property"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { return e.firstChild().nodeValue(); @@ -301,7 +301,7 @@ QString EffectsList::property(QDomElement effect, const QString &name) void EffectsList::removeProperty(QDomElement effect, const QString &name) { QDomNodeList params = effect.elementsByTagName("property"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name") == name) { effect.removeChild(params.item(i)); @@ -314,7 +314,7 @@ void EffectsList::removeProperty(QDomElement effect, const QString &name) void EffectsList::removeMetaProperties(QDomElement producer) { QDomNodeList params = producer.elementsByTagName("property"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("name").startsWith("meta")) { producer.removeChild(params.item(i)); @@ -387,7 +387,7 @@ QDomElement EffectsList::insert(QDomElement effect) void EffectsList::updateIndexes(QDomNodeList effects, int startIndex) { - for (int i = startIndex; i < effects.count(); i++) { + for (int i = startIndex; i < effects.count(); ++i) { QDomElement listeffect = effects.at(i).toElement(); listeffect.setAttribute("kdenlive_ix", i + 1); } @@ -397,7 +397,7 @@ void EffectsList::enableEffects(const QList & indexes, bool disable) { QDomNodeList effects = m_baseElement.childNodes(); QDomElement effect; - for (int i = 0; i < indexes.count(); i++) { + for (int i = 0; i < indexes.count(); ++i) { effect = effectFromIndex(effects, indexes.at(i)); effect.setAttribute("disable", (int) disable); } diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index 01768474..a9e9328b 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -80,7 +80,7 @@ EffectsListView::EffectsListView(QWidget *parent) : void EffectsListView::filterList(int pos) { - for (int i = 0; i < m_effectsList->topLevelItemCount(); i++) { + for (int i = 0; i < m_effectsList->topLevelItemCount(); ++i) { QTreeWidgetItem *folder = m_effectsList->topLevelItem(i); bool hideFolder = true; for (int j = 0; j < folder->childCount(); j++) { @@ -105,7 +105,7 @@ void EffectsListView::filterList(int pos) if (item) { if (item->isHidden()) { int i; - for (i = 0; i < m_effectsList->count() && m_effectsList->item(i)->isHidden(); i++); //do nothing + for (i = 0; i < m_effectsList->count() && m_effectsList->item(i)->isHidden(); ++i); //do nothing m_effectsList->setCurrentRow(i); } else m_effectsList->scrollToItem(item); }*/ diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 2e1229a8..f2762673 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -93,10 +93,10 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QList folders; QStringList folderNames; QDomNodeList groups = doc.documentElement().elementsByTagName("group"); - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { folderNames << i18n(groups.at(i).firstChild().firstChild().nodeValue().toUtf8().constData()); } - for (int i = 0; i < topLevelItemCount(); i++) { + for (int i = 0; i < topLevelItemCount(); ++i) { topLevelItem(i)->takeChildren(); QString currentName = topLevelItem(i)->text(0); if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) { @@ -105,7 +105,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi } } - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { item = findFolder(folderNames.at(i)); if (item) { item->setData(0, IdRole, groups.at(i).toElement().attribute("list")); @@ -152,7 +152,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi if (!found && !currentFolder.isEmpty()) { // previously selected effect was removed, focus on its parent folder - for (int i = 0; i < topLevelItemCount(); i++) { + for (int i = 0; i < topLevelItemCount(); ++i) { if (topLevelItem(i)->text(0) == currentFolder) { setCurrentItem(topLevelItem(i)); break; @@ -168,7 +168,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QMenu *sub2 = NULL; QMenu *sub3 = NULL; QMenu *sub4 = NULL; - for (int i = 0; i < topLevelItemCount(); i++) { + for (int i = 0; i < topLevelItemCount(); ++i) { if (!topLevelItem(i)->childCount()) continue; QMenu *sub = new QMenu(topLevelItem(i)->text(0), effectsMenu); @@ -234,7 +234,7 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q parentItem = NULL; if (folders) { - for (int i = 0; i < folders->count(); i++) { + for (int i = 0; i < folders->count(); ++i) { l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts); if (l.contains(effectInfo.at(2))) { parentItem = folders->at(i); diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp index 21317971..352cd820 100644 --- a/src/effectstack/collapsibleeffect.cpp +++ b/src/effectstack/collapsibleeffect.cpp @@ -432,7 +432,7 @@ void CollapsibleEffect::setupWidget(ItemInfo info, EffectMetaInfo *metaInfo) QVBoxLayout *vbox = static_cast (widgetFrame->layout()); vbox->addWidget(container); // m_paramWidget = new ParameterContainer(m_effect.toElement(), info, metaInfo, container); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { CollapsibleEffect *coll = new CollapsibleEffect(effects.at(i).toElement(), origin_effects.at(i).toElement(), info, metaInfo, container); m_subParamWidgets.append(coll); connect(coll, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateRegionEffectParams(QDomElement,QDomElement,int))); @@ -490,7 +490,7 @@ void CollapsibleEffect::updateTimecodeFormat() m_paramWidget->updateTimecodeFormat(); if (!m_subParamWidgets.isEmpty()) { // we have a group - for (int i = 0; i < m_subParamWidgets.count(); i++) + for (int i = 0; i < m_subParamWidgets.count(); ++i) m_subParamWidgets.at(i)->updateTimecodeFormat(); } } @@ -553,7 +553,7 @@ void CollapsibleEffect::dropEvent(QDropEvent *event) // Moving group QList effectsIds; // Collect moved effects ids - for (int i = 0; i < subeffects.count(); i++) { + for (int i = 0; i < subeffects.count(); ++i) { QDomElement effect = subeffects.at(i).toElement(); effectsIds << effect.attribute("kdenlive_ix").toInt(); } diff --git a/src/effectstack/collapsiblegroup.cpp b/src/effectstack/collapsiblegroup.cpp index d0d5d3de..0e0c873e 100644 --- a/src/effectstack/collapsiblegroup.cpp +++ b/src/effectstack/collapsiblegroup.cpp @@ -135,7 +135,7 @@ void CollapsibleGroup::slotEnable(bool disable, bool emitInfo) enabledButton->setChecked(disable); enabledButton->setIcon(disable ? KIcon("novisible") : KIcon("visible")); enabledButton->blockSignals(false); - for (int i = 0; i < m_subWidgets.count(); i++) + for (int i = 0; i < m_subWidgets.count(); ++i) m_subWidgets.at(i)->slotDisable(disable, emitInfo); } @@ -152,7 +152,7 @@ void CollapsibleGroup::slotDeleteGroup() void CollapsibleGroup::slotEffectUp() { QList indexes; - for (int i = 0; i < m_subWidgets.count(); i++) + for (int i = 0; i < m_subWidgets.count(); ++i) indexes << m_subWidgets.at(i)->effectIndex(); emit changeEffectPosition(indexes, true); } @@ -160,7 +160,7 @@ void CollapsibleGroup::slotEffectUp() void CollapsibleGroup::slotEffectDown() { QList indexes; - for (int i = 0; i < m_subWidgets.count(); i++) + for (int i = 0; i < m_subWidgets.count(); ++i) indexes << m_subWidgets.at(i)->effectIndex(); emit changeEffectPosition(indexes, false); } @@ -176,7 +176,7 @@ void CollapsibleGroup::slotSaveGroup() QDomDocument doc = effectsData(); QDomElement base = doc.documentElement(); QDomNodeList effects = base.elementsByTagName("effect"); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement eff = effects.at(i).toElement(); eff.removeAttribute("kdenlive_ix"); EffectInfo info; @@ -205,7 +205,7 @@ void CollapsibleGroup::slotSaveGroup() void CollapsibleGroup::slotResetGroup() { QMutexLocker lock(&m_mutex); - for (int i = 0; i < m_subWidgets.count(); i++) + for (int i = 0; i < m_subWidgets.count(); ++i) m_subWidgets.at(i)->slotResetEffect(); } @@ -337,10 +337,10 @@ void CollapsibleGroup::dropEvent(QDropEvent *event) return; } // Moving group - for (int i = 0; i < pastedEffects.count(); i++) { + for (int i = 0; i < pastedEffects.count(); ++i) { pastedEffectIndexes << pastedEffects.at(i).toElement().attribute("kdenlive_ix").toInt(); } - for (int i = 0; i < m_subWidgets.count(); i++) { + for (int i = 0; i < m_subWidgets.count(); ++i) { currentEffectIndexes << m_subWidgets.at(i)->effectIndex(); } kDebug()<<"PASTING: "<adjustButtons(i, m_subWidgets.count()); } } diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index 2b55bbd7..1cabfeba 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -89,7 +89,7 @@ void EffectStackView2::slotRenderPos(int pos) if (m_monitorSceneWanted) slotCheckMonitorPosition(pos); if (!m_effectMetaInfo.trackMode && m_clipref) pos = pos - m_clipref->startPos().frames(KdenliveSettings::project_fps()); - for (int i = 0; i< m_effects.count(); i++) + for (int i = 0; i< m_effects.count(); ++i) m_effects.at(i)->slotSyncEffectsPos(pos); } @@ -97,7 +97,7 @@ void EffectStackView2::slotClipItemUpdate() { int inPoint = m_clipref->cropStart().frames(KdenliveSettings::project_fps()); int outPoint = m_clipref->cropDuration().frames(KdenliveSettings::project_fps()) + inPoint; - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { m_effects.at(i)->setRange(inPoint, outPoint); } } @@ -187,7 +187,7 @@ void EffectStackView2::setupListView() else if (selectedEffect > effectsCount) m_clipref->setSelectedEffect(effectsCount); } - for (int i = 0; i < effectsCount; i++) { + for (int i = 0; i < effectsCount; ++i) { QDomElement d = m_currentEffectList.at(i).cloneNode().toElement(); if (d.isNull()) { kDebug() << " . . . . WARNING, NULL EFFECT IN STACK!!!!!!!!!"; @@ -259,7 +259,7 @@ void EffectStackView2::setupListView() else { // Adjust group effects (up / down buttons) QList allGroups = m_ui.container->widget()->findChildren(); - for (int i = 0; i < allGroups.count(); i++) { + for (int i = 0; i < allGroups.count(); ++i) { allGroups.at(i)->adjustEffects(); } connect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); @@ -306,7 +306,7 @@ void EffectStackView2::slotCheckWheelEventFilter() // widget has scroll bar, filterWheelEvent = true; } - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { m_effects.at(i)->filterWheelEvent = filterWheelEvent; } } @@ -511,13 +511,13 @@ void EffectStackView2::slotCheckAll(int state) bool disabled = state == Qt::Unchecked; // Disable all effects QList indexes; - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { m_effects.at(i)->slotDisable(disabled, false); indexes << m_effects.at(i)->effectIndex(); } // Take care of groups QList allGroups = m_ui.container->widget()->findChildren(); - for (int i = 0; i < allGroups.count(); i++) { + for (int i = 0; i < allGroups.count(); ++i) { allGroups.at(i)->slotEnable(disabled, false); } @@ -532,7 +532,7 @@ void EffectStackView2::slotUpdateCheckAllButton() bool hasEnabled = false; bool hasDisabled = false; - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (!m_effects.at(i)->enabledButton->isChecked()) hasEnabled = true; else hasDisabled = true; } @@ -549,7 +549,7 @@ void EffectStackView2::slotUpdateCheckAllButton() void EffectStackView2::deleteCurrentEffect() { - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->isActive()) { slotDeleteEffect(m_effects.at(i)->effect()); break; @@ -565,13 +565,13 @@ void EffectStackView2::updateProjectFormat(MltVideoProfile profile, Timecode t) void EffectStackView2::updateTimecodeFormat() { - for (int i = 0; i< m_effects.count(); i++) + for (int i = 0; i< m_effects.count(); ++i) m_effects.at(i)->updateTimecodeFormat(); } CollapsibleEffect *EffectStackView2::getEffectByIndex(int ix) { - for (int i = 0; i< m_effects.count(); i++) { + for (int i = 0; i< m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { return m_effects.at(i); } @@ -595,7 +595,7 @@ void EffectStackView2::slotSetCurrentEffect(int ix) { if (m_clipref && ix != m_clipref->selectedEffectIndex()) { m_clipref->setSelectedEffect(ix); - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { if (m_effects.at(i)->isActive()) return; m_effects.at(i)->setActive(true); @@ -622,7 +622,7 @@ void EffectStackView2::slotDeleteGroup(QDomDocument doc) ix = -1; } - for (int i = 0; i < effects.count(); i++) + for (int i = 0; i < effects.count(); ++i) emit removeEffect(clip, ix, effects.at(i).toElement()); } @@ -685,7 +685,7 @@ void EffectStackView2::slotResetEffect(int ix) info.cropStart = GenTime(0); info.startPos = GenTime(-1); info.track = 0; - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { m_effects.at(i)->updateWidget(info, dom, &m_effectMetaInfo); break; @@ -694,7 +694,7 @@ void EffectStackView2::slotResetEffect(int ix) emit updateEffect(NULL, m_trackindex, old, dom, ix,false); } else { m_clipref->initEffect(dom); - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { m_effects.at(i)->updateWidget(m_clipref->info(), dom, &m_effectMetaInfo); break; @@ -799,7 +799,7 @@ void EffectStackView2::slotCreateGroup(int ix) QVBoxLayout *l = static_cast(m_ui.container->widget()->layout()); int groupPos = 0; CollapsibleEffect *effectToMove = NULL; - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->effectIndex() == ix) { effectToMove = m_effects.at(i); groupPos = l->indexOf(effectToMove); @@ -879,7 +879,7 @@ void EffectStackView2::slotUnGroup(CollapsibleGroup* group) void EffectStackView2::slotRenameGroup(CollapsibleGroup *group) { QList effects = group->effects(); - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement origin = effects.at(i)->effect(); QDomElement changed = origin.cloneNode().toElement(); changed.setAttribute("kdenlive_info", effects.at(i)->infoString()); @@ -920,7 +920,7 @@ void EffectStackView2::processDroppedEffect(QDomElement e, QDropEvent *event) } // Moving group: delete all effects and re-add them QList indexes; - for (int i = 0; i < effects.count(); i++) { + for (int i = 0; i < effects.count(); ++i) { QDomElement effect = effects.at(i).cloneNode().toElement(); indexes << effect.attribute("kdenlive_ix").toInt(); } @@ -954,7 +954,7 @@ void EffectStackView2::dropEvent(QDropEvent *event) void EffectStackView2::setKeyframes(const QString &data, int maximum) { - for (int i = 0; i < m_effects.count(); i++) { + for (int i = 0; i < m_effects.count(); ++i) { if (m_effects.at(i)->isActive()) { m_effects.at(i)->setKeyframes(data, maximum); break; diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp index 67ab5201..39f3c394 100644 --- a/src/effectstack/parametercontainer.cpp +++ b/src/effectstack/parametercontainer.cpp @@ -121,7 +121,7 @@ ParameterContainer::ParameterContainer(const QDomElement &effect, const ItemInfo m_vbox->setContentsMargins(4, 0, 4, 0); m_vbox->setSpacing(2); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { QDomElement pa = namenode.item(i).toElement(); if (pa.tagName() != "parameter") continue; QDomElement na = pa.firstChildElement("name"); @@ -176,7 +176,7 @@ ParameterContainer::ParameterContainer(const QDomElement &effect, const ItemInfo if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems; lsval->list->setIconSize(QSize(30, 30)); - for (int i = 0; i < listitems.count(); i++) { + for (int i = 0; i < listitems.count(); ++i) { lsval->list->addItem(listitemsdisplay.at(i), listitems.at(i)); QString entry = listitems.at(i); if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) { @@ -440,7 +440,7 @@ ParameterContainer::ParameterContainer(const QDomElement &effect, const ItemInfo if (keyworddisplaylist.count() != keywordlist.count()) { keyworddisplaylist = keywordlist; } - for (int i = 0; i < keywordlist.count(); i++) { + for (int i = 0; i < keywordlist.count(); ++i) { kval->comboboxwidget->addItem(keyworddisplaylist.at(i), keywordlist.at(i)); } // Add disabled user prompt at index 0 @@ -483,10 +483,10 @@ ParameterContainer::ParameterContainer(const QDomElement &effect, const ItemInfo // Make sure all doubleparam spinboxes have the same width, looks much better QList allWidgets = findChildren(); int minSize = 0; - for (int i = 0; i < allWidgets.count(); i++) { + for (int i = 0; i < allWidgets.count(); ++i) { if (minSize < allWidgets.at(i)->spinSize()) minSize = allWidgets.at(i)->spinSize(); } - for (int i = 0; i < allWidgets.count(); i++) { + for (int i = 0; i < allWidgets.count(); ++i) { allWidgets.at(i)->setSpinSize(minSize); } } @@ -561,7 +561,7 @@ void ParameterContainer::updateTimecodeFormat() m_keyframeEditor->updateTimecodeFormat(); QDomNodeList namenode = m_effect.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { QDomNode pa = namenode.item(i); QDomElement na = pa.firstChildElement("name"); QString type = pa.attributes().namedItem("type").nodeValue(); @@ -597,7 +597,7 @@ void ParameterContainer::slotCollectAllParameters() //QDomElement newparam = oldparam.cloneNode().toElement(); QDomNodeList namenode = m_effect.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { QDomElement pa = namenode.item(i).toElement(); QDomElement na = pa.firstChildElement("name"); QString type = pa.attribute("type"); @@ -818,7 +818,7 @@ void ParameterContainer::updateParameter(const QString &key, const QString &valu void ParameterContainer::slotStartFilterJobAction() { QDomNodeList namenode = m_effect.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { QDomElement pa = namenode.item(i).toElement(); QString type = pa.attribute("type"); if (type == "filterjob") { diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp index b1e0c509..e49327dc 100644 --- a/src/geometrywidget.cpp +++ b/src/geometrywidget.cpp @@ -470,7 +470,7 @@ void GeometryWidget::slotPositionChanged(int pos, bool seek) m_opacity->setValue(item.mix()); m_opacity->blockSignals(false); - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); QString name = m_extraGeometryNames.at(i); if (!geom->fetch(&item, pos)) { @@ -511,7 +511,7 @@ void GeometryWidget::slotAddKeyframe(int pos) item.mix(m_opacity->value()); m_geometry->insert(item); - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); QString name = m_extraGeometryNames.at(i); DragValue *widget = findChild(name); @@ -540,7 +540,7 @@ void GeometryWidget::slotDeleteKeyframe(int pos) } m_geometry->remove(pos); - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); geom->remove(pos); } @@ -625,7 +625,7 @@ void GeometryWidget::slotUpdateGeometry() item.h(rectSize.height()); m_geometry->insert(item); - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); QString name = m_extraGeometryNames.at(i); Mlt::GeometryItem item2; @@ -827,7 +827,7 @@ void GeometryWidget::slotResetKeyframes() } // Delete extra geometry keyframes too - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); while (!geom->next_key(&item, 1)) { geom->remove(item.frame()); @@ -862,7 +862,7 @@ void GeometryWidget::slotResetNextKeyframes() } // Delete extra geometry keyframes too - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); while (!geom->next_key(&item, pos)) { geom->remove(item.frame()); @@ -900,7 +900,7 @@ void GeometryWidget::slotResetPreviousKeyframes() } // Delete extra geometry keyframes too - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { Mlt::Geometry *geom = m_extraGeometries.at(i); pos = 0; while (!geom->next_key(&item, pos) && pos < m_timePos->getValue()) { diff --git a/src/headertrack.cpp b/src/headertrack.cpp index cbf8a6ad..cef0b2e0 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -139,7 +139,7 @@ void HeaderTrack::dropEvent(QDropEvent * event) if (e.tagName() == "effectgroup") { // dropped an effect group QDomNodeList effectlist = e.elementsByTagName("effect"); - for (int i = 0; i < effectlist.count(); i++) { + for (int i = 0; i < effectlist.count(); ++i) { effectlist.at(i).toElement().removeAttribute("kdenlive_ix"); } } else { diff --git a/src/initeffects.cpp b/src/initeffects.cpp index e2f7734e..52e40bc0 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -94,7 +94,7 @@ void initEffects::refreshLumas() } QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma"); QDomNodeList params = lumaTransition.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "resource") { e.setAttribute("paramlistdisplay", imagenamelist.join(",")); @@ -105,7 +105,7 @@ void initEffects::refreshLumas() QDomElement compositeTransition = MainWindow::transitions.getEffectByTag("composite", "composite"); params = compositeTransition.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("tag") == "luma") { e.setAttribute("paramlistdisplay", imagenamelist.join(",")); @@ -477,7 +477,7 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository, Mlt::Properties tags((mlt_properties) metadata->get_data("tags")); if (QString(tags.get(0)) == "Audio") eff.setAttribute("type", "audio"); - /*for (int i = 0; i < tags.count(); i++) + /*for (int i = 0; i < tags.count(); ++i) kDebug()<get_data("parameters")); diff --git a/src/jogaction.cpp b/src/jogaction.cpp index f559e1b7..395d100c 100644 --- a/src/jogaction.cpp +++ b/src/jogaction.cpp @@ -39,7 +39,7 @@ JogShuttleAction::JogShuttleAction (const JogShuttle* jogShuttle, const QStringL connect(m_jogShuttle, SIGNAL(jogForward()), this, SLOT(slotJogForward())); connect(m_jogShuttle, SIGNAL(shuttlePos(int)), this, SLOT(slotShuttlePos(int))); connect(m_jogShuttle, SIGNAL(button(int)), this, SLOT(slotButton(int))); - //for (int i = 0; i < actionMap.size(); i++) fprintf(stderr, "button #%d -> action '%s'\n", i, actionMap[i].toAscii().constData()); //DBG + //for (int i = 0; i < actionMap.size(); ++i) fprintf(stderr, "button #%d -> action '%s'\n", i, actionMap[i].toAscii().constData()); //DBG } JogShuttleAction::~JogShuttleAction() diff --git a/src/jogshuttleconfig.cpp b/src/jogshuttleconfig.cpp index fada730c..b82b6fbb 100644 --- a/src/jogshuttleconfig.cpp +++ b/src/jogshuttleconfig.cpp @@ -56,7 +56,7 @@ QStringList JogShuttleConfig::actionMap(const QString& actionsConfig) actionMap[button_id] = parts[1]; } - //for (int i = 0; i < actionMap.size(); i++) fprintf(stderr, "button #%d -> action '%s'\n", i, actionMap[i].data().toAscii()); //DBG + //for (int i = 0; i < actionMap.size(); ++i) fprintf(stderr, "button #%d -> action '%s'\n", i, actionMap[i].data().toAscii()); //DBG return actionMap; } diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 4ecf1c4a..e3fe2161 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -258,7 +258,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } QStringList expandedFolders; QDomNodeList folders = m_document.elementsByTagName("folder"); - for (int i = 0; i < folders.count(); i++) { + for (int i = 0; i < folders.count(); ++i) { e = folders.item(i).cloneNode().toElement(); if (e.hasAttribute("opened")) expandedFolders.append(e.attribute("id")); m_clipManager->addFolder(e.attribute("id"), e.attribute("name")); @@ -279,7 +279,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup progressDialog->show(); qApp->processEvents(); - for (int i = 0; i < infomax; i++) { + for (int i = 0; i < infomax; ++i) { e = infoproducers.item(i).cloneNode().toElement(); QString prodId = e.attribute("id"); if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) { @@ -328,11 +328,11 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_projectFolder = KUrl(infoXml.attribute("projectfolder")); QDomElement docproperties = infoXml.firstChildElement("documentproperties"); QDomNamedNodeMap props = docproperties.attributes(); - for (int i = 0; i < props.count(); i++) + for (int i = 0; i < props.count(); ++i) m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue()); docproperties = infoXml.firstChildElement("documentmetadata"); props = docproperties.attributes(); - for (int i = 0; i < props.count(); i++) + for (int i = 0; i < props.count(); ++i) m_documentMetadata.insert(props.item(i).nodeName(), props.item(i).nodeValue()); if (validator.isModified()) setModified(true); @@ -417,7 +417,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) // 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 - for (int i = 0; i < audiotracks; i++) { + for (int i = 0; i < audiotracks; ++i) { TrackInfo audioTrack; audioTrack.type = AUDIOTRACK; audioTrack.isMute = false; @@ -429,7 +429,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks) m_tracksList.append(audioTrack); } - for (int i = 0; i < videotracks; i++) { + for (int i = 0; i < videotracks; ++i) { TrackInfo videoTrack; videoTrack.type = VIDEOTRACK; videoTrack.isMute = false; @@ -514,7 +514,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) // create playlists int total = tracks.count() + 1; - for (int i = 1; i < total; i++) { + for (int i = 1; i < total; ++i) { QDomElement playlist = doc.createElement("playlist"); playlist.setAttribute("id", "playlist" + QString::number(i)); mlt.appendChild(playlist); @@ -525,7 +525,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) tractor.appendChild(track0); // create audio and video tracks - for (int i = 1; i < total; i++) { + for (int i = 1; i < total; ++i) { QDomElement track = doc.createElement("track"); track.setAttribute("producer", "playlist" + QString::number(i)); if (tracks.at(i - 1).type == AUDIOTRACK) { @@ -537,7 +537,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) tractor.appendChild(track); } - for (int i = 2; i < total ; i++) { + for (int i = 2; i < total ; ++i) { QDomElement transition = doc.createElement("transition"); transition.setAttribute("always_active", "1"); @@ -584,7 +584,7 @@ void KdenliveDoc::syncGuides(QList guides) m_guidesXml.appendChild(guideNode); QDomElement e; - for (int i = 0; i < guides.count(); i++) { + for (int i = 0; i < guides.count(); ++i) { e = m_guidesXml.createElement("guide"); e.setAttribute("time", guides.at(i)->position().ms() / 1000); e.setAttribute("comment", guides.at(i)->label()); @@ -647,7 +647,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & QDomElement tractor = mlt.firstChildElement("tractor"); if (!tractor.isNull()) { QDomNodeList props = tractor.elementsByTagName("property"); - for (int i = 0; i < props.count(); i++) { + for (int i = 0; i < props.count(); ++i) { if (props.at(i).toElement().attribute("name") == "meta.volume") { props.at(i).firstChild().setNodeValue("1"); break; @@ -663,7 +663,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & int maxEffects = effects.count(); kDebug() << "// FOUD " << maxEffects << " EFFECTS+++++++++++++++++++++"; QMap effectIds; - for (int i = 0; i < maxEffects; i++) { + for (int i = 0; i < maxEffects; ++i) { QDomNode m = effects.at(i); QDomNodeList params = m.childNodes(); QString id; @@ -753,7 +753,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList & // Save project clips QDomElement e; QList list = m_clipManager->documentClipList(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { e = list.at(i)->toXML(true); e.setTagName("kdenlive_producer"); addedXml.appendChild(sceneList.importNode(e, true)); @@ -848,7 +848,7 @@ void KdenliveDoc::moveProjectData(KUrl url) { QList list = m_clipManager->documentClipList(); KUrl::List cacheUrls; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip->clipType() == TEXT) { // the image for title clip must be moved @@ -1000,7 +1000,7 @@ QString KdenliveDoc::producerName(const QString &id) QString result = "unnamed"; QDomNodeList prods = producersList(); int ct = prods.count(); - for (int i = 0; i < ct ; i++) { + for (int i = 0; i < ct ; ++i) { QDomElement e = prods.item(i).toElement(); if (e.attribute("id") != "black" && e.attribute("id") == id) { result = e.attribute("name"); @@ -1162,7 +1162,7 @@ void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) { QDomNodeList prods = m_document.elementsByTagName("producer"); int maxprod = prods.count(); - for (int i = 0; i < maxprod; i++) { + for (int i = 0; i < maxprod; ++i) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); if (prodId == id || prodId.startsWith(id + '_')) { @@ -1184,7 +1184,7 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match QByteArray fileData; QByteArray fileHash; QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { QFile file(dir.absoluteFilePath(filesAndDirs.at(i))); if (file.open(QIODevice::ReadOnly)) { if (QString::number(file.size()) == matchSize) { @@ -1207,7 +1207,7 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex(); } filesAndDirs = dir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot); - for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) { foundFileName = searchFileRecursively(dir.absoluteFilePath(filesAndDirs.at(i)), matchSize, matchHash); if (!foundFileName.isEmpty()) break; @@ -1224,7 +1224,7 @@ bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId } else { QMap properties; QDomNamedNodeMap attributes = elem.attributes(); - for (int i = 0; i < attributes.count(); i++) { + for (int i = 0; i < attributes.count(); ++i) { QString attrname = attributes.item(i).nodeName(); if (attrname != "resource") properties.insert(attrname, attributes.item(i).nodeValue()); @@ -1451,7 +1451,7 @@ bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers) QString id; QString resource; QList missingClips; - for (int i = 0; i < infoproducers.count(); i++) { + for (int i = 0; i < infoproducers.count(); ++i) { e = infoproducers.item(i).toElement(); clipType = e.attribute("type").toInt(); if (clipType == COLOR) continue; @@ -1509,7 +1509,7 @@ void KdenliveDoc::addTrackEffect(int ix, QDomElement effect) // Init parameter value & keyframes if required QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); // Check if this effect has a variable parameter @@ -1582,7 +1582,7 @@ void KdenliveDoc::enableTrackEffects(int trackIndex, QList effectIndexes, } EffectsList list = m_tracksList.at(trackIndex).effectsList; QDomElement effect; - for (int i = 0; i < effectIndexes.count(); i++) { + for (int i = 0; i < effectIndexes.count(); ++i) { effect = list.itemFromIndex(effectIndexes.at(i)); if (!effect.isNull()) effect.setAttribute("disable", (int) disable); } @@ -1623,7 +1623,7 @@ bool KdenliveDoc::saveCustomEffects(QDomNodeList customeffects) QDomElement e; QStringList importedEffects; int maxchild = customeffects.count(); - for (int i = 0; i < maxchild; i++) { + for (int i = 0; i < maxchild; ++i) { e = customeffects.at(i).toElement(); QString id = e.attribute("id"); QString tag = e.attribute("tag"); @@ -1774,7 +1774,7 @@ void KdenliveDoc::cleanupBackupFiles() QStringList dayList; QStringList weekList; QStringList oldList; - for (int i = 0; i < resultList.count(); i++) { + for (int i = 0; i < resultList.count(); ++i) { if (d.secsTo(resultList.at(i).lastModified()) < 3600) { // files created in the last hour hourList.append(resultList.at(i).absoluteFilePath()); diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index 154bb030..925d82e6 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -167,7 +167,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap& map QMap action_pos; foreach (const QString& action_id, actions_map) { // This loop find out at what index is the string that would map to the action_id. - for (int i = 0; i < action_names.size(); i++) { + for (int i = 0; i < action_names.size(); ++i) { if (mappable_actions[action_names[i]] == action_id) { action_pos[action_id] = i; break; @@ -340,7 +340,7 @@ void KdenliveSettingsDialog::checkProfile() } if (!KdenliveSettings::default_profile().isEmpty()) { - for (int i = 0; i < m_configProject.kcfg_profiles_list->count(); i++) { + for (int i = 0; i < m_configProject.kcfg_profiles_list->count(); ++i) { if (m_configProject.kcfg_profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) { m_configProject.kcfg_profiles_list->setCurrentIndex(i); KdenliveSettings::setProfiles_list(i); @@ -364,7 +364,7 @@ void KdenliveSettingsDialog::initDevices() #endif if (!KdenliveSettings::audiodrivername().isEmpty()) - for (int i = 1; i < m_configSdl.kcfg_audio_driver->count(); i++) { + for (int i = 1; i < m_configSdl.kcfg_audio_driver->count(); ++i) { if (m_configSdl.kcfg_audio_driver->itemData(i).toString() == KdenliveSettings::audiodrivername()) { m_configSdl.kcfg_audio_driver->setCurrentIndex(i); KdenliveSettings::setAudio_driver((uint) i); @@ -535,7 +535,7 @@ void KdenliveSettingsDialog::slotCheckShuttle(int state) // parse devices QString baseName = "/dev/input/event"; int fd; - for (int i = 0; i < 30; i++) { + for (int i = 0; i < 30; ++i) { QString filename = baseName + QString::number(i); kDebug() << "/// CHECKING device: " << filename; @@ -567,7 +567,7 @@ void KdenliveSettingsDialog::updateWidgets() #ifdef USE_JOGSHUTTLE // revert jog shuttle device if (m_configShuttle.shuttledevicelist->count() > 0) { - for (int i = 0; i < m_configShuttle.shuttledevicelist->count(); i++) { + for (int i = 0; i < m_configShuttle.shuttledevicelist->count(); ++i) { if (m_configShuttle.shuttledevicelist->itemData(i) == KdenliveSettings::shuttledevice()) { m_configShuttle.shuttledevicelist->setCurrentIndex(i); break; @@ -582,7 +582,7 @@ void KdenliveSettingsDialog::updateWidgets() QMap action_pos; foreach (const QString& action_id, actions_map) { // This loop find out at what index is the string that would map to the action_id. - for (int i = 0; i < action_names.size(); i++) { + for (int i = 0; i < action_names.size(); ++i) { if (m_mappable_actions[action_names[i]] == action_id) { action_pos[action_id] = i; break; @@ -789,7 +789,7 @@ void KdenliveSettingsDialog::saveTranscodeProfiles() // read the entries transConfig.deleteGroup(); int max = m_configTranscode.profiles_list->count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { QListWidgetItem *item = m_configTranscode.profiles_list->item(i); transConfig.writeEntry(item->text(), item->data(Qt::UserRole).toString()); } @@ -917,7 +917,7 @@ void KdenliveSettingsDialog::slotUpdatev4lDevice() QString itemSize; QString pixelFormat; QStringList itemRates; - for (int i = 0; i < pixelformats.count(); i++) { + for (int i = 0; i < pixelformats.count(); ++i) { QString format = pixelformats.at(i).section(':', 0, 0); QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts); pixelFormat = sizes.takeFirst(); diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp index a326d953..1f157237 100644 --- a/src/keyframeedit.cpp +++ b/src/keyframeedit.cpp @@ -127,7 +127,7 @@ void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe) } QStringList frames = e.attribute("keyframes").split(';', QString::SkipEmptyParts); - for (int i = 0; i < frames.count(); i++) { + for (int i = 0; i < frames.count(); ++i) { int frame = frames.at(i).section(':', 0, 0).toInt(); bool found = false; int j; @@ -210,7 +210,7 @@ void KeyframeEdit::slotAddKeyframe() keyframe_list->insertRow(newrow); keyframe_list->setVerticalHeaderItem(newrow, new QTableWidgetItem(getPosString(result))); - for (int i = 0; i < keyframe_list->columnCount(); i++) + for (int i = 0; i < keyframe_list->columnCount(); ++i) keyframe_list->setItem(newrow, i, new QTableWidgetItem(keyframe_list->item(item->row(), i)->text())); keyframe_list->resizeRowsToContents(); @@ -249,7 +249,7 @@ void KeyframeEdit::slotGenerateParams(int row, int column) if (v <= m_params.at(col).attribute("min").toInt()) item->setText(m_params.at(col).attribute("min")); QString keyframes; - for (int i = 0; i < keyframe_list->rowCount(); i++) { + for (int i = 0; i < keyframe_list->rowCount(); ++i) { if (keyframe_list->item(i, col)) keyframes.append(QString::number(getPos(i)) + ':' + keyframe_list->item(i, col)->text() + ';'); } @@ -287,7 +287,7 @@ void KeyframeEdit::slotGenerateParams(int row, int column) slotAdjustKeyframeInfo(false); QString keyframes; - for (int i = 0; i < keyframe_list->rowCount(); i++) { + for (int i = 0; i < keyframe_list->rowCount(); ++i) { if (keyframe_list->item(i, column)) keyframes.append(QString::number(getPos(i)) + ':' + keyframe_list->item(i, column)->text() + ';'); } @@ -299,7 +299,7 @@ void KeyframeEdit::generateAllParams() { for (int col = 0; col < keyframe_list->columnCount(); col++) { QString keyframes; - for (int i = 0; i < keyframe_list->rowCount(); i++) { + for (int i = 0; i < keyframe_list->rowCount(); ++i) { if (keyframe_list->item(i, col)) keyframes.append(QString::number(getPos(i)) + ':' + keyframe_list->item(i, col)->text() + ';'); } diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp index d1d84362..168a863c 100644 --- a/src/keyframehelper.cpp +++ b/src/keyframehelper.cpp @@ -84,7 +84,7 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event) Mlt::GeometryItem *gitem = m_extraMovingItems.takeFirst(); if (gitem) delete gitem; } - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { if (m_extraGeometries.at(i)->next_key(item, mousePos) == 0) { Mlt::GeometryItem *item2 = new Mlt::GeometryItem(); item2->x(item.x()); @@ -163,13 +163,13 @@ void KeyframeHelper::mouseMoveEvent(QMouseEvent * event) if ((QPoint(xPos, event->y()) - m_dragStart).manhattanLength() < QApplication::startDragDistance()) return; m_dragStart = QPoint(); m_geom->remove(m_movingItem.frame()); - for (int i = 0; i < m_extraGeometries.count(); i++) + for (int i = 0; i < m_extraGeometries.count(); ++i) m_extraGeometries[i]->remove(m_movingItem.frame()); } int pos = qBound(0, (int)(xPos / m_scale), frameLength); if (KdenliveSettings::snaptopoints() && qAbs(pos - m_position) < 5) pos = m_position; m_movingItem.frame(pos); - for (int i = 0; i < m_extraMovingItems.count(); i++) { + for (int i = 0; i < m_extraMovingItems.count(); ++i) { if (m_extraMovingItems.at(i)) m_extraMovingItems[i]->frame(pos); } update(); @@ -210,7 +210,7 @@ void KeyframeHelper::mouseReleaseEvent(QMouseEvent * event) m_geom->insert(m_movingItem); m_movingKeyframe = false; - for (int i = 0; i < m_extraGeometries.count(); i++) { + for (int i = 0; i < m_extraGeometries.count(); ++i) { if (m_extraMovingItems.at(i)) m_extraGeometries[i]->insert(m_extraMovingItems.at(i)); } diff --git a/src/kis_cubic_curve.cpp b/src/kis_cubic_curve.cpp index a0bc58c1..52488a62 100644 --- a/src/kis_cubic_curve.cpp +++ b/src/kis_cubic_curve.cpp @@ -81,7 +81,7 @@ public: alpha[1] = -c[0] / b[0]; beta[1] = f[0] / b[0]; - for (i = 1; i < size - 1; i++) { + for (i = 1; i < size - 1; ++i) { alpha[i+1] = -c[i] / (a[i-1] * alpha[i] + b[i]); @@ -150,7 +150,7 @@ public: m_d.resize(intervals); m_h.resize(intervals); - for (i = 0; i < intervals; i++) { + for (i = 0; i < intervals; ++i) { m_h[i] = a[i+1].x() - a[i].x(); m_a.append(a[i].y()); } @@ -161,12 +161,12 @@ public: QList tri_f; QList tri_a; /* equals to @tri_c */ - for (i = 0; i < intervals - 1; i++) { + for (i = 0; i < intervals - 1; ++i) { tri_b.append(2.*(m_h[i] + m_h[i+1])); tri_f.append(6.*((m_a[i+2] - m_a[i+1]) / m_h[i+1] - (m_a[i+1] - m_a[i]) / m_h[i])); } - for (i = 1; i < intervals - 1; i++) + for (i = 1; i < intervals - 1; ++i) tri_a.append(m_h[i]); if (intervals > 1) { @@ -176,10 +176,10 @@ public: m_c.prepend(0); m_c.append(0); - for (i = 0; i < intervals; i++) + for (i = 0; i < intervals; ++i) m_d[i] = (m_c[i+1] - m_c[i]) / m_h[i]; - for (i = 0; i < intervals; i++) + for (i = 0; i < intervals; ++i) m_b[i] = -0.5 * (m_c[i] * m_h[i]) - (1 / 6.0) * (m_d[i] * m_h[i] * m_h[i]) + (m_a[i+1] - m_a[i]) / m_h[i]; } @@ -214,7 +214,7 @@ protected: int findRegion(T x, T &x0) const { int i; x0 = m_begin; - for (i = 0; i < m_intervals; i++) { + for (i = 0; i < m_intervals; ++i) { if (x >= x0 && x < x0 + m_h[i]) return i; x0 += m_h[i]; diff --git a/src/kthumb.cpp b/src/kthumb.cpp index ed979d39..f2efa405 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -255,7 +255,7 @@ uint KThumb::imageVariance(QImage image ) QVarLengthArray pivot(STEPS); const uchar *bits=image.bits(); // First pass: get pivots and taking average - for( uint i=0; i= 0x040700 avg+=pivot.at(i); @@ -266,7 +266,7 @@ uint KThumb::imageVariance(QImage image ) if (STEPS) avg=avg/STEPS; // Second Step: calculate delta (average?) - for (uint i=0; i= 0x040700 int curdelta=abs(int(avg - pivot.at(i))); diff --git a/src/lib/audio/audioCorrelation.cpp b/src/lib/audio/audioCorrelation.cpp index 6c6ddffb..2e3219b7 100644 --- a/src/lib/audio/audioCorrelation.cpp +++ b/src/lib/audio/audioCorrelation.cpp @@ -134,7 +134,7 @@ void AudioCorrelation::correlate(const int64_t *envMain, int sizeMain, } sum = 0; - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; ++i) { sum += (*left) * (*right); left++; right++; diff --git a/src/lib/audio/audioCorrelationInfo.cpp b/src/lib/audio/audioCorrelationInfo.cpp index db438bdd..2313fe2b 100644 --- a/src/lib/audio/audioCorrelationInfo.cpp +++ b/src/lib/audio/audioCorrelationInfo.cpp @@ -40,7 +40,7 @@ int64_t AudioCorrelationInfo::max() const if (m_max <= 0) { int width = size(); int64_t max = 0; - for (int i = 0; i < width; i++) { + for (int i = 0; i < width; ++i) { if (m_correlationVector[i] > max) { max = m_correlationVector[i]; } @@ -57,7 +57,7 @@ int AudioCorrelationInfo::maxIndex() const int index = 0; int width = size(); - for (int i = 0; i < width; i++) { + for (int i = 0; i < width; ++i) { if (m_correlationVector[i] > max) { max = m_correlationVector[i]; index = i; diff --git a/src/lib/audio/audioEnvelope.cpp b/src/lib/audio/audioEnvelope.cpp index 7755970b..e57335a3 100644 --- a/src/lib/audio/audioEnvelope.cpp +++ b/src/lib/audio/audioEnvelope.cpp @@ -98,7 +98,7 @@ void AudioEnvelope::loadEnvelope() int count = 0; m_producer->seek(m_offset); m_producer->set_speed(1.0); // This is necessary, otherwise we don't get any new frames in the 2nd run. - for (int i = 0; i < m_envelopeSize; i++) { + for (int i = 0; i < m_envelopeSize; ++i) { frame = m_producer->get_frame(i); position = mlt_frame_get_position(frame->get_frame()); @@ -143,7 +143,7 @@ int64_t AudioEnvelope::loadStdDev() } m_envelopeStdDev = 0; - for (int i = 0; i < m_envelopeSize; i++) { + for (int i = 0; i < m_envelopeSize; ++i) { m_envelopeStdDev += sqrt((m_envelope[i]-m_envelopeMean)*(m_envelope[i]-m_envelopeMean)/m_envelopeSize); } m_envelopeStdDevCalculated = true; @@ -162,7 +162,7 @@ void AudioEnvelope::normalizeEnvelope(bool clampTo0) m_envelopeMax = 0; int64_t newMean = 0; - for (int i = 0; i < m_envelopeSize; i++) { + for (int i = 0; i < m_envelopeSize; ++i) { m_envelope[i] -= m_envelopeMean; diff --git a/src/lib/audio/audioInfo.cpp b/src/lib/audio/audioInfo.cpp index cb946cac..e7a563b4 100644 --- a/src/lib/audio/audioInfo.cpp +++ b/src/lib/audio/audioInfo.cpp @@ -23,7 +23,7 @@ m_producer(NULL) // Get the number of streams and add the information of each of them if it is an audio stream. int streams = producer->get_int("meta.media.nb_streams"); - for (int i = 0; i < streams; i++) { + for (int i = 0; i < streams; ++i) { QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit(); const char* streamtype = producer->get(propertyName.data()); if (streamtype && strcmp("audio", streamtype) == 0) { diff --git a/src/lib/audio/fftCorrelation.cpp b/src/lib/audio/fftCorrelation.cpp index 5c88a09a..9c1a893a 100644 --- a/src/lib/audio/fftCorrelation.cpp +++ b/src/lib/audio/fftCorrelation.cpp @@ -29,7 +29,7 @@ void FFTCorrelation::correlate(const int64_t *left, const int leftSize, // The correlation vector will have entries up to N (number of entries // of the vector), so converting to integers will not lose that much // of precision. - for (int i = 0; i < leftSize+rightSize+1; i++) { + for (int i = 0; i < leftSize+rightSize+1; ++i) { out_correlated[i] = correlatedFloat[i]; } } @@ -50,12 +50,12 @@ void FFTCorrelation::correlate(const int64_t *left, const int leftSize, // vector since each value should be at most 1 int64_t maxLeft = 0; int64_t maxRight = 0; - for (int i = 0; i < leftSize; i++) { + for (int i = 0; i < leftSize; ++i) { if (labs(left[i]) > maxLeft) { maxLeft = labs(left[i]); } } - for (int i = 0; i < rightSize; i++) { + for (int i = 0; i < rightSize; ++i) { if (labs(right[i]) > maxRight) { maxRight = labs(right[i]); } @@ -64,10 +64,10 @@ void FFTCorrelation::correlate(const int64_t *left, const int leftSize, // One side needs to be reverted, since multiplication in frequency domain (fourier space) // calculates the convolution: \sum l[x]r[N-x] and not the correlation: \sum l[x]r[x] - for (int i = 0; i < leftSize; i++) { + for (int i = 0; i < leftSize; ++i) { leftF[i] = double(left[i])/maxLeft; } - for (int i = 0; i < rightSize; i++) { + for (int i = 0; i < rightSize; ++i) { rightF[rightSize-1 - i] = double(right[i])/maxRight; } @@ -123,7 +123,7 @@ void FFTCorrelation::convolve(const float *left, const int leftSize, kiss_fftr(fftConfig, rightData, rightFFT); // Convolution in spacial domain is a multiplication in fourier domain. O(n). - for (int i = 0; i < size/2; i++) { + for (int i = 0; i < size/2; ++i) { correlatedFFT[i].r = leftFFT[i].r*rightFFT[i].r - leftFFT[i].i*rightFFT[i].i; correlatedFFT[i].i = leftFFT[i].r*rightFFT[i].i + leftFFT[i].i*rightFFT[i].r; } diff --git a/src/lib/audio/fftTools.cpp b/src/lib/audio/fftTools.cpp index 5babb0af..a72df6bd 100644 --- a/src/lib/audio/fftTools.cpp +++ b/src/lib/audio/fftTools.cpp @@ -32,7 +32,7 @@ FFTTools::FFTTools() : FFTTools::~FFTTools() { QHash::iterator i; - for (i = m_fftCfgs.begin(); i != m_fftCfgs.end(); i++) { + for (i = m_fftCfgs.begin(); i != m_fftCfgs.end(); ++i) { free(*i); } } @@ -74,7 +74,7 @@ const QVector FFTTools::window(const WindowType windowType, const int siz #ifdef DEBUG_FFTTOOLS qDebug() << "Triangle window (factor " << window[size] << "):"; - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; ++i) { qDebug() << window[i]; } qDebug() << "Triangle window end."; @@ -98,7 +98,7 @@ const QVector FFTTools::window(const WindowType windowType, const int siz #ifdef DEBUG_FFTTOOLS qDebug() << "Hanning window (factor " << window[size] << "):"; - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; ++i) { qDebug() << window[i]; } qDebug() << "Hanning window end."; @@ -175,7 +175,7 @@ void FFTTools::fftNormalized(const QVector audioFrame, const uint chann std::fill(&data[numSamples], &data[windowSize-1], 0); } // Normalize signals to [0,1] to get correct dB values later on - for (uint i = 0; i < numSamples && i < windowSize; i++) { + for (uint i = 0; i < numSamples && i < windowSize; ++i) { // Performance note: Benchmarking has shown that using the if/else inside the loop // does not do noticeable worse than keeping it outside (perhaps the branch predictor // is good enough), so it remains in there for better readability. @@ -192,7 +192,7 @@ void FFTTools::fftNormalized(const QVector audioFrame, const uint chann // Logarithmic scale: 20 * log ( 2 * magnitude / N ) with magnitude = sqrt(r² + i²) // with N = FFT size (after FFT, 1/2 window size) - for (uint i = 0; i < windowSize/2; i++) { + for (uint i = 0; i < windowSize/2; ++i) { // Logarithmic scale: 20 * log ( 2 * magnitude / N ) with magnitude = sqrt(r² + i²) // with N = FFT size (after FFT, 1/2 window size) freqSpectrum[i] = 20*log(pow(pow(fabs(freqData[i].r * windowScaleFactor),2) + pow(fabs(freqData[i].i * windowScaleFactor),2), .5)/((float)windowSize/2.0f))/log(10);; @@ -248,7 +248,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector in uint xi; uint i; if (((float) (right-left))/targetSize < 2) { - for (i = 0; i < targetSize; i++) { + for (i = 0; i < targetSize; ++i) { // i: Target index // x: Interpolated source index (float!) @@ -299,7 +299,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector in qDebug() << "Interpolation: Ratio over 2; using maximum interpolation"; #endif - for (i = 0; i < targetSize; i++) { + for (i = 0; i < targetSize; ++i) { // x: right bound // xi: floor(x) @@ -320,7 +320,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector in } } // Fill the rest of the vector if the right border exceeds the input vector. - for (; i < targetSize; i++) { + for (; i < targetSize; ++i) { out[i] = fill; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8161e3a7..1ba1e89d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -403,7 +403,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & // Prepare layout actions KActionCategory *layoutActions = new KActionCategory(i18n("Layouts"), actionCollection()); m_loadLayout = new KSelectAction(i18n("Load Layout"), actionCollection()); - for (int i = 1; i < 5; i++) { + for (int i = 1; i < 5; ++i) { KAction *load = new KAction(KIcon(), i18n("Layout %1", i), this); load->setData('_' + QString::number(i)); layoutActions->addAction("load_layout" + QString::number(i), load); @@ -443,7 +443,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & // Find QDockWidget tab bars and show / hide widget title bars on right click QList tabs = findChildren(); - for (int i = 0; i < tabs.count(); i++) { + for (int i = 0; i < tabs.count(); ++i) { tabs.at(i)->setContextMenuPolicy(Qt::CustomContextMenu); connect(tabs.at(i), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotSwitchTitles())); } @@ -599,7 +599,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & viewActions.append(pair); QList docks = findChildren(); - for (int i = 0; i < docks.count(); i++) { + for (int i = 0; i < docks.count(); ++i) { QDockWidget* dock = docks.at(i); QAction * a = dock->toggleViewAction(); if (!a) continue; @@ -618,7 +618,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & // Sort dock view action by name qSort(viewActions.begin(), viewActions.end(), sortByNames); // Populate view menu - for (int i = 0; i < viewActions.count(); i++) + for (int i = 0; i < viewActions.count(); ++i) viewMenu->addAction(guiActions->addAction(viewActions.at(i).first, viewActions.at(i).second)); // Populate encoding profiles @@ -1771,7 +1771,7 @@ void MainWindow::setupActions() //KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), m_effectsActionCollection); KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), collection); m_transitions = new KAction*[transitions.count()]; - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { QStringList effectInfo = transitions.effectIdInfo(i); m_transitions[i] = new KAction(effectInfo.at(0), this); m_transitions[i]->setData(effectInfo); @@ -1809,7 +1809,7 @@ void MainWindow::loadLayouts() QStringList entries = layoutGroup.keyList(); QList loadActions = m_loadLayout->actions(); QList saveActions = saveLayout->actions(); - for (int i = 1; i < 5; i++) { + for (int i = 1; i < 5; ++i) { // Rename the layouts actions foreach(const QString & key, entries) { if (key.endsWith(QString("_%1").arg(i))) { @@ -2159,7 +2159,7 @@ void MainWindow::openFile(const KUrl &url) const int ct = m_timelineArea->count(); bool isOpened = false; int i; - for (i = 0; i < ct; i++) { + for (i = 0; i < ct; ++i) { TrackView *tab = (TrackView *) m_timelineArea->widget(i); KdenliveDoc *doc = tab->document(); if (doc->url() == url) { @@ -3467,7 +3467,7 @@ void MainWindow::slotShowClipProperties(QList cliplist, QMap newProps = newImageProps; newProps.remove("transparency"); - for (int i = 0; i < cliplist.count(); i++) { + for (int i = 0; i < cliplist.count(); ++i) { DocClipBase *clip = cliplist.at(i); if (clip->clipType() == IMAGE) new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newImageProps), newImageProps, true, command); @@ -3475,7 +3475,7 @@ void MainWindow::slotShowClipProperties(QList cliplist, QMapgetId(), clip->currentProperties(newProps), newProps, true, command); } m_activeDocument->commandStack()->push(command); - for (int i = 0; i < cliplist.count(); i++) + for (int i = 0; i < cliplist.count(); ++i) m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia->needsTimelineReload()); } delete dia; @@ -3722,7 +3722,7 @@ void MainWindow::slotClipInProjectTree() if (m_activeTimeline) { const QList clips = m_activeTimeline->projectView()->selectedClipItems(); if (clips.isEmpty()) return; - for (int i = 0; i < clips.count(); i++) { + for (int i = 0; i < clips.count(); ++i) { m_projectList->slotAddXmlClip(clips.at(i)->itemXml()); } //m_projectList->selectItemById(clipIds.at(i)); @@ -4191,7 +4191,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS QDomElement guidesxml = m_activeDocument->guidesXml(); QDomNodeList nodes = guidesxml.elementsByTagName("guide"); - for (int i = 0; i < nodes.count(); i++) { + for (int i = 0; i < nodes.count(); ++i) { QDomElement e = nodes.item(i).toElement(); if (!e.isNull()) { QString comment = e.attribute("comment"); @@ -4237,7 +4237,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS QDomElement tractor = doc.documentElement().firstChildElement("tractor"); if (!tractor.isNull()) { QDomNodeList props = tractor.elementsByTagName("property"); - for (int i = 0; i < props.count(); i++) { + for (int i = 0; i < props.count(); ++i) { if (props.at(i).toElement().attribute("name") == "meta.volume") { props.at(i).firstChild().setNodeValue("1"); break; @@ -4381,7 +4381,7 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) // TT thinks tooltips shouldn't use active, so we use our active colors for all states KColorScheme schemeTooltip(QPalette::Active, KColorScheme::Tooltip, config); - for ( int i = 0; i < 3 ; i++ ) { + for ( int i = 0; i < 3 ; ++i ) { QPalette::ColorGroup state = states[i]; KColorScheme schemeView(state, KColorScheme::View, config); KColorScheme schemeWindow(state, KColorScheme::Window, config); @@ -4507,7 +4507,7 @@ void MainWindow::slotDeleteProjectClips(QStringList ids, QMap void MainWindow::slotShowTitleBars(bool show) { QList docks = findChildren(); - for (int i = 0; i < docks.count(); i++) { + for (int i = 0; i < docks.count(); ++i) { QDockWidget* dock = docks.at(i); if (show) { dock->setTitleBarWidget(0); @@ -4543,7 +4543,7 @@ void MainWindow::slotMonitorRequestRenderFrame(bool request) m_projectMonitor->render->sendFrameForAnalysis = true; return; } else { - for (int i = 0; i < m_gfxScopesList.count(); i++) { + for (int i = 0; i < m_gfxScopesList.count(); ++i) { if (m_gfxScopesList.at(i)->isVisible() && tabifiedDockWidgets(m_gfxScopesList.at(i)).isEmpty() && static_cast(m_gfxScopesList.at(i)->widget())->autoRefreshEnabled()) { request = true; break; @@ -4564,7 +4564,7 @@ void MainWindow::slotOpenStopmotion() if (m_stopmotion == NULL) { m_stopmotion = new StopmotionWidget(m_monitorManager, m_activeDocument->projectFolder(), m_stopmotion_actions->actions(), this); connect(m_stopmotion, SIGNAL(addOrUpdateSequence(QString)), m_projectList, SLOT(slotAddOrUpdateSequence(QString))); - //for (int i = 0; i < m_gfxScopesList.count(); i++) { + //for (int i = 0; i < m_gfxScopesList.count(); ++i) { // Check if we need the renderer to send a new frame for update /*if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled())) request = true;*/ //connect(m_stopmotion, SIGNAL(gotFrame(QImage)), static_cast(m_gfxScopesList.at(i)->widget()), SLOT(slotRenderZoneUpdated(QImage))); diff --git a/src/managecapturesdialog.cpp b/src/managecapturesdialog.cpp index 7eed6c92..8a724ce4 100644 --- a/src/managecapturesdialog.cpp +++ b/src/managecapturesdialog.cpp @@ -90,7 +90,7 @@ void ManageCapturesDialog::slotRefreshButtons() { int count = m_view.treeWidget->topLevelItemCount(); bool enabled = false; - for (int i = 0; i < count; i++) { + for (int i = 0; i < count; ++i) { QTreeWidgetItem *item = m_view.treeWidget->topLevelItem(i); if (item && item->checkState(0) == Qt::Checked) { enabled = true; @@ -117,7 +117,7 @@ void ManageCapturesDialog::slotDeleteCurrent() void ManageCapturesDialog::slotToggle() { int count = m_view.treeWidget->topLevelItemCount(); - for (int i = 0; i < count; i++) { + for (int i = 0; i < count; ++i) { QTreeWidgetItem *item = m_view.treeWidget->topLevelItem(i); if (item) { if (item->checkState(0) == Qt::Checked) item->setCheckState(0, Qt::Unchecked); @@ -131,7 +131,7 @@ KUrl::List ManageCapturesDialog::importFiles() KUrl::List result; int count = m_view.treeWidget->topLevelItemCount(); - for (int i = 0; i < count; i++) { + for (int i = 0; i < count; ++i) { QTreeWidgetItem *item = m_view.treeWidget->topLevelItem(i); if (item && item->checkState(0) == Qt::Checked) result.append(KUrl(item->data(0, Qt::UserRole).toString())); diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp index b55556dc..a2194ef0 100644 --- a/src/mltdevicecapture.cpp +++ b/src/mltdevicecapture.cpp @@ -458,7 +458,7 @@ bool MltDeviceCapture::slotStartCapture(const QString ¶ms, const QString &pa QStringList paramList = params.split(' ', QString::SkipEmptyParts); char *tmp2; - for (int i = 0; i < paramList.count(); i++) { + for (int i = 0; i < paramList.count(); ++i) { tmp = qstrdup(paramList.at(i).section('=', 0, 0).toUtf8().constData()); QString value = paramList.at(i).section('=', 1, 1); if (value == "%threads") value = QString::number(QThread::idealThreadCount()); diff --git a/src/monitor.cpp b/src/monitor.cpp index 1e9a4f22..c6b14fb6 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -252,7 +252,7 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe if (markerMenu) { m_contextMenu->addMenu(markerMenu); QList list = markerMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->data().toString() == "edit_marker") { m_editMarker = list.at(i); break; @@ -373,7 +373,7 @@ void Monitor::updateMarkers(DocClipBase *source) QList markers = m_currentClip->commentedSnapMarkers(); if (!markers.isEmpty()) { QList marks; - for (int i = 0; i < markers.count(); i++) { + for (int i = 0; i < markers.count(); ++i) { int pos = (int) markers.at(i).time().frames(m_monitorManager->timecode().fps()); marks.append(pos); QString position = m_monitorManager->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment(); diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp index 5809648c..9cba158e 100644 --- a/src/monitormanager.cpp +++ b/src/monitormanager.cpp @@ -99,7 +99,7 @@ bool MonitorManager::activateMonitor(Kdenlive::MONITORID name, bool forceRefresh return false; } m_activeMonitor = NULL; - for (int i = 0; i < m_monitorsList.count(); i++) { + for (int i = 0; i < m_monitorsList.count(); ++i) { if (m_monitorsList.at(i)->id() == name) { m_activeMonitor = m_monitorsList.at(i); } @@ -244,7 +244,7 @@ void MonitorManager::slotUpdateAudioMonitoring() if (m_projectMonitor) { m_projectMonitor->render->analyseAudio = KdenliveSettings::monitor_audio(); }*/ - for (int i = 0; i < m_monitorsList.count(); i++) { + for (int i = 0; i < m_monitorsList.count(); ++i) { if (m_monitorsList.at(i)->abstractRender()) m_monitorsList.at(i)->abstractRender()->analyseAudio = KdenliveSettings::monitor_audio(); } } diff --git a/src/onmonitoritems/onmonitorpathitem.cpp b/src/onmonitoritems/onmonitorpathitem.cpp index 4296cd7c..3db6d436 100644 --- a/src/onmonitoritems/onmonitorpathitem.cpp +++ b/src/onmonitoritems/onmonitorpathitem.cpp @@ -70,7 +70,7 @@ void OnMonitorPathItem::rebuildShape() { shape.addRect(r); p.moveTo(m_points.at(0)); - for (int i = 1; i < m_points.count(); i++) { + for (int i = 1; i < m_points.count(); ++i) { p.lineTo(m_points.at(i)); r.moveCenter(m_points.at(i)); shape.addRect(r); @@ -88,7 +88,7 @@ void OnMonitorPathItem::getMode(QPointF pos) dist /= m_view->matrix().m11(); } // Item mapped coordinates - for (int i = 0; i < m_points.count(); i++) { + for (int i = 0; i < m_points.count(); ++i) { if ((pos - m_points.at(i)).manhattanLength() <= dist) { m_activePoint = i; return; @@ -182,7 +182,7 @@ void OnMonitorPathItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* } QRectF handle(0, 0, w, h); - for (int i = 0; i < m_points.count(); i++) { + for (int i = 0; i < m_points.count(); ++i) { handle.moveCenter(m_points.at(i)); painter->fillRect(handle, m_activePoint == i ? Qt::blue : pen().color()); } diff --git a/src/onmonitoritems/rotoscoping/nearestpoint.cpp b/src/onmonitoritems/rotoscoping/nearestpoint.cpp index 9b49abdd..0f422b10 100644 --- a/src/onmonitoritems/rotoscoping/nearestpoint.cpp +++ b/src/onmonitoritems/rotoscoping/nearestpoint.cpp @@ -114,7 +114,7 @@ Point2 NearestPointOnCurve(Point2 P, Point2 *V, double *tOut) t = 0.0; /* Find distances for candidate points */ - for (i = 0; i < n_solutions; i++) { + for (i = 0; i < n_solutions; ++i) { p = Bezier(V, DEGREE, t_candidate[i], (Point2 *)NULL, (Point2 *)NULL); new_dist = V2SquaredLength(V2Sub(&P, &p, &v)); @@ -164,12 +164,12 @@ static Point2 *ConvertToBezierForm(Point2 P, Point2 *V) /*Determine the c's -- these are vectors created by subtracting*/ /* point P from each of the control points */ - for (i = 0; i <= DEGREE; i++) { + for (i = 0; i <= DEGREE; ++i) { V2Sub(&V[i], &P, &c[i]); } /* Determine the d's -- these are vectors created by subtracting*/ /* each control point from the next */ - for (i = 0; i <= DEGREE - 1; i++) { + for (i = 0; i <= DEGREE - 1; ++i) { d[i] = V2ScaleII(V2Sub(&V[i+1], &V[i], &d[i]), 3.0); } @@ -184,7 +184,7 @@ static Point2 *ConvertToBezierForm(Point2 P, Point2 *V) /* Now, apply the z's to the dot products, on the skew diagonal*/ /* Also, set up the x-values, making these "points" */ w = (Point2 *)malloc((unsigned)(W_DEGREE+1) * sizeof(Point2)); - for (i = 0; i <= W_DEGREE; i++) { + for (i = 0; i <= W_DEGREE; ++i) { w[i].y = 0.0; w[i].x = (double)(i) / W_DEGREE; } @@ -194,7 +194,7 @@ static Point2 *ConvertToBezierForm(Point2 P, Point2 *V) for (k = 0; k <= n + m; k++) { lb = MAX(0, k - m); ub = MIN(k, n); - for (i = lb; i <= ub; i++) { + for (i = lb; i <= ub; ++i) { j = k - i; w[i+j].y += cdTable[j][i] * z[j][i]; } @@ -251,10 +251,10 @@ static int FindRoots(Point2 *w, int degree, double *t, int depth) /* Gather solutions together */ - for (i = 0; i < left_count; i++) { + for (i = 0; i < left_count; ++i) { t[i] = left_t[i]; } - for (i = 0; i < right_count; i++) { + for (i = 0; i < right_count; ++i) { t[i+left_count] = right_t[i]; } @@ -278,7 +278,7 @@ static int CrossingCount(Point2 *V, int degree) int sign, old_sign; /* Sign of coefficients */ sign = old_sign = SGN(V[0].y); - for (i = 1; i <= degree; i++) { + for (i = 1; i <= degree; ++i) { sign = SGN(V[i].y); if (sign != old_sign) n_crossings++; old_sign = sign; @@ -360,7 +360,7 @@ static int ControlPolygonFlatEnough(Point2 *V, int degree) max_distance_above = max_distance_below = 0.0; - for (i = 1; i < degree; i++) + for (i = 1; i < degree; ++i) { value = a * V[i].x + b * V[i].y + c; @@ -471,7 +471,7 @@ static Point2 Bezier(Point2 *V, int degree, double t, Point2 *Left, Point2 *Righ } /* Triangle computation */ - for (i = 1; i <= degree; i++) { + for (i = 1; i <= degree; ++i) { for (j =0 ; j <= degree - i; j++) { Vtemp[i][j].x = (1.0 - t) * Vtemp[i-1][j].x + t * Vtemp[i-1][j+1].x; diff --git a/src/parameterplotter.cpp b/src/parameterplotter.cpp index 45eff438..c60ed1d5 100644 --- a/src/parameterplotter.cpp +++ b/src/parameterplotter.cpp @@ -76,7 +76,7 @@ void ParameterPlotter::setPointLists(const QDomElement& d, const QString& paramN kDebug() << dat; int i = 0; while (!namenode.item(i).isNull() && namenode.item(i).toElement().attribute("name") != m_paramName) - i++; + ++i; if (namenode.count()) { @@ -97,11 +97,11 @@ void ParameterPlotter::setPointLists(const QDomElement& d, const QString& paramN defaults = pa.attribute("default").split(';'); QStringList maxv = pa.attribute("max").split(';'); QStringList minv = pa.attribute("min").split(';'); - for (int i = 0; i < maxv.size() && i < minv.size(); i++) { + for (int i = 0; i < maxv.size() && i < minv.size(); ++i) { if (m_max_y < maxv[i].toInt()) m_max_y = maxv[i].toInt(); if (m_min_y > minv[i].toInt()) m_min_y = minv[i].toInt(); } - for (int i = 0; i < m_parameterNameList.count(); i++) { + for (int i = 0; i < m_parameterNameList.count(); ++i) { KPlotObject *plot = new KPlotObject(m_colors[m_plotobjects.size()%m_colors.size()]); plot->setShowLines(true); if (!m_stretchFactors.contains(i) && i < maxv.size()) { @@ -151,7 +151,7 @@ void ParameterPlotter::createParametersNew() QTextStream txtstr(¶mlist); QDomNode pa = namenode.item(0); if (namenode.count() > 0) { - for (int i = 0; i < plotobjs.count(); i++) { + for (int i = 0; i < plotobjs.count(); ++i) { QList points = plotobjs[i]->points(); foreach(const KPlotPoint *o, points) { txtstr << (int)o->y() ; @@ -193,7 +193,7 @@ void ParameterPlotter::mouseMoveEvent(QMouseEvent * event) m_oldmousepoint = event->pos(); } } - i++; + ++i; } createParametersNew(); } @@ -219,7 +219,7 @@ void ParameterPlotter::replot(const QString & name) p->setLabelPen(pen); if (selectedName == name) m_activeIndexPlot = i; - replacePlotObject(i++, p); + replacePlotObject(++i, p); } } diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp index 6072f181..77b8ff84 100644 --- a/src/profilesdialog.cpp +++ b/src/profilesdialog.cpp @@ -131,7 +131,7 @@ void ProfilesDialog::fillList(const QString &selectedProfile) } if (!KdenliveSettings::default_profile().isEmpty()) { - for (int i = 0; i < m_view.profiles_list->count(); i++) { + for (int i = 0; i < m_view.profiles_list->count(); ++i) { if (m_view.profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) { m_view.profiles_list->setCurrentIndex(i); break; @@ -201,7 +201,7 @@ bool ProfilesDialog::slotSaveProfile() QString profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); kDebug() << " TYING PROFILE FILE: " << profilePath; while (KIO::NetAccess::exists(KUrl(profilePath), KIO::NetAccess::SourceSide, this)) { - i++; + ++i; profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); } saveProfile(profilePath); @@ -542,7 +542,7 @@ void ProfilesDialog::saveProfile(MltVideoProfile &profile, QString profilePath) profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); kDebug() << " TYING PROFILE FILE: " << profilePath; while (KIO::NetAccess::exists(KUrl(profilePath), KIO::NetAccess::SourceSide, 0)) { - i++; + ++i; profilePath = KStandardDirs::locateLocal("appdata", customName + QString::number(i)); } } diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 46ec6989..7b4591e0 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -309,7 +309,7 @@ bool ProjectItem::playlistHasProxies(const QString& path) file.close(); QString root = doc.documentElement().attribute("root"); QDomNodeList kdenliveProducers = doc.elementsByTagName("kdenlive_producer"); - for (int i = 0; i < kdenliveProducers.count(); i++) { + for (int i = 0; i < kdenliveProducers.count(); ++i) { QString proxy = kdenliveProducers.at(i).toElement().attribute("proxy"); if (!proxy.isEmpty() && proxy != "-") return true; } diff --git a/src/projectlist.cpp b/src/projectlist.cpp index f42b1863..86b6fa67 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -211,7 +211,7 @@ void InvalidDialog::addClip(const QString &id, const QString &path) QStringList InvalidDialog::getIds() const { QStringList ids; - for (int i = 0; i < m_clipList->count(); i++) { + for (int i = 0; i < m_clipList->count(); ++i) { ids << m_clipList->item(i)->data(Qt::UserRole).toString(); } return ids; @@ -346,7 +346,7 @@ ProjectList::ProjectList(QWidget *parent) : ProjectList::~ProjectList() { m_abortAllJobs = true; - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { m_jobList.at(i)->setStatus(JOBABORTED); } m_closing = true; @@ -372,7 +372,7 @@ void ProjectList::focusTree() const void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) { QList actions = addMenu->actions(); - for (int i = 0; i < actions.count(); i++) { + for (int i = 0; i < actions.count(); ++i) { if (actions.at(i)->data().toString() == "clip_properties") { m_editButton->setDefaultAction(actions.at(i)); actions.removeAt(i); @@ -515,7 +515,7 @@ void ProjectList::editClipSelection(QList list) int commonDuration = -1; bool hasImages = false;; ProjectItem *item; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { item = NULL; if (list.at(i)->type() == PROJECTFOLDERTYPE) { // Add folder items to the list @@ -678,7 +678,7 @@ void ProjectList::trashUnusedClips() } emit deleteProjectClips(ids, QMap ()); - for (int i = 0; i < urls.count(); i++) + for (int i = 0; i < urls.count(); ++i) KIO::NetAccess::del(KUrl(urls.at(i)), this); } @@ -692,7 +692,7 @@ void ProjectList::slotReloadClip(const QString &id) if (itemToReLoad) selected.append(itemToReLoad); } ProjectItem *item; - for (int i = 0; i < selected.count(); i++) { + for (int i = 0; i < selected.count(); ++i) { if (selected.at(i)->type() != PROJECTCLIPTYPE) { if (selected.at(i)->type() == PROJECTFOLDERTYPE) { for (int j = 0; j < selected.at(i)->childCount(); j++) @@ -937,7 +937,7 @@ void ProjectList::adjustTranscodeActions(ProjectItem *clip) const QList transcodeActions = m_transcodeAction->actions(); QStringList data; QString condition; - for (int i = 0; i < transcodeActions.count(); i++) { + for (int i = 0; i < transcodeActions.count(); ++i) { data = transcodeActions.at(i)->data().toStringList(); if (data.count() > 2) { condition = data.at(2); @@ -1030,7 +1030,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) folder->setGroupName(item->text(0)); m_doc->clipManager()->addFolder(folder->clipId(), item->text(0)); const int children = item->childCount(); - for (int i = 0; i < children; i++) { + for (int i = 0; i < children; ++i) { ProjectItem *child = static_cast (item->child(i)); child->setProperty("groupname", item->text(0)); } @@ -1139,7 +1139,7 @@ void ProjectList::slotRemoveClip() QUndoCommand *delCommand = new QUndoCommand(); delCommand->setText(i18n("Delete Clip Zone")); - for (int i = 0; i < selected.count(); i++) { + for (int i = 0; i < selected.count(); ++i) { if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) { // subitem SubProjectItem *sub = static_cast (selected.at(i)); @@ -1275,7 +1275,7 @@ void ProjectList::slotAddFolder(const QString foldername, const QString &clipId, m_listView->blockSignals(false); m_doc->clipManager()->addFolder(clipId, foldername); const int children = item->childCount(); - for (int i = 0; i < children; i++) { + for (int i = 0; i < children; ++i) { ProjectItem *child = static_cast (item->child(i)); child->setProperty("groupname", foldername); } @@ -1375,7 +1375,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) // Add cut zones QList cuts = clip->cutZones(); if (!cuts.isEmpty()) { - for (int i = 0; i < cuts.count(); i++) { + for (int i = 0; i < cuts.count(); ++i) { SubProjectItem *sub = new SubProjectItem(m_render->dar(), item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description); if (!clip->getClipHash().isEmpty()) { QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).zone.x()) + ".png"; @@ -1444,7 +1444,7 @@ void ProjectList::slotResetProjectList() { m_listView->blockSignals(true); m_abortAllJobs = true; - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { m_jobList.at(i)->setStatus(JOBABORTED); } m_closing = true; @@ -1765,7 +1765,7 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group } delete d; } else { - for (int i = 0; i < givenList.count(); i++) + for (int i = 0; i < givenList.count(); ++i) list << givenList.at(i); } QList foldersList; @@ -1804,7 +1804,7 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group if (!foldersList.isEmpty()) { // create folders - for (int i = 0; i < foldersList.count(); i++) { + for (int i = 0; i < foldersList.count(); ++i) { KUrl::List urls = foldersList.at(i); KUrl folderUrl = urls.takeFirst(); QString folderName = folderUrl.fileName(); @@ -2009,7 +2009,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) { m_listView->blockSignals(true); m_abortAllJobs = true; - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { m_jobList.at(i)->setStatus(JOBABORTED); } m_closing = true; @@ -2044,7 +2044,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) m_refreshed = true; m_allClipsProcessed = true; } - for (int i = 0; i < list.count(); i++) + for (int i = 0; i < list.count(); ++i) slotAddClip(list.at(i), false); m_listView->blockSignals(false); @@ -2516,7 +2516,7 @@ QTreeWidgetItem *ProjectList::getAnyItemById(const QString &id) if (result == NULL || !id.contains('#')) { return result; } else { - for (int i = 0; i < result->childCount(); i++) { + for (int i = 0; i < result->childCount(); ++i) { SubProjectItem *sub = static_cast (result->child(i)); if (sub && sub->zone().x() == id.section('#', 1, 1).toInt()) return sub; @@ -2549,7 +2549,7 @@ FolderProjectItem *ProjectList::getFolderItemByName(const QString &name) { FolderProjectItem *item = NULL; QList hits = m_listView->findItems(name, Qt::MatchExactly, 0); - for (int i = 0; i < hits.count(); i++) { + for (int i = 0; i < hits.count(); ++i) { if (hits.at(i)->type() == PROJECTFOLDERTYPE) { item = static_cast(hits.at(i)); break; @@ -2617,7 +2617,7 @@ KUrl::List ProjectList::getConditionalUrls(const QString &condition) const KUrl::List result; ProjectItem *item; QList list = m_listView->selectedItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == PROJECTFOLDERTYPE) continue; if (list.at(i)->type() == PROJECTSUBCLIPTYPE) { @@ -2645,7 +2645,7 @@ QMap ProjectList::getConditionalIds(const QString &condition) QMap result; ProjectItem *item; QList list = m_listView->selectedItems(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->type() == PROJECTFOLDERTYPE) continue; if (list.at(i)->type() == PROJECTSUBCLIPTYPE) { @@ -2696,7 +2696,7 @@ QDomDocument ProjectList::generateTemplateXml(QString path, const QString &repla } file.close(); QDomNodeList texts = doc.elementsByTagName("content"); - for (int i = 0; i < texts.count(); i++) { + for (int i = 0; i < texts.count(); ++i) { QString data = texts.item(i).firstChild().nodeValue(); data.replace("%s", replaceString); texts.item(i).firstChild().setNodeValue(data); @@ -2754,7 +2754,7 @@ SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, const QPoint &zone) { SubProjectItem *sub = NULL; if (clip) { - for (int i = 0; i < clip->childCount(); i++) { + for (int i = 0; i < clip->childCount(); ++i) { QTreeWidgetItem *it = clip->child(i); if (it->type() == PROJECTSUBCLIPTYPE) { sub = static_cast (it); @@ -3049,7 +3049,7 @@ void ProjectList::slotCheckJobProcess() // Remove inactive threads QList > futures = m_jobThreads.futures(); m_jobThreads.clearFutures(); - for (int i = 0; i < futures.count(); i++) + for (int i = 0; i < futures.count(); ++i) if (!futures.at(i).isFinished()) { m_jobThreads.addFuture(futures.at(i)); } @@ -3058,7 +3058,7 @@ void ProjectList::slotCheckJobProcess() m_jobMutex.lock(); int count = 0; - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->status() == JOBWORKING || m_jobList.at(i)->status() == JOBWAITING) count ++; else { @@ -3091,7 +3091,7 @@ void ProjectList::slotProcessJobs() AbstractClipJob *job = NULL; int count = 0; m_jobMutex.lock(); - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->status() == JOBWAITING) { if (job == NULL) { m_jobList.at(i)->setStatus(JOBWORKING); @@ -3243,7 +3243,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) // expand list (folders, subclips) to get real clips QTreeWidgetItem *listItem; QList clipList; - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { listItem = list.at(i); if (listItem->type() == PROJECTFOLDERTYPE) { for (int j = 0; j < listItem->childCount(); j++) { @@ -3276,7 +3276,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) QMap newProps; QMap oldProps; if (!doProxy) newProps.insert("proxy", "-"); - for (int i = 0; i < clipList.count(); i++) { + for (int i = 0; i < clipList.count(); ++i) { ProjectItem *item = clipList.at(i); CLIPTYPE t = item->clipType(); if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { @@ -3408,7 +3408,7 @@ void ProjectList::processThumbOverlays(ProjectItem *item, QPixmap &pix) void ProjectList::slotCancelJobs() { m_abortAllJobs = true; - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { m_jobList.at(i)->setStatus(JOBABORTED); } m_jobThreads.waitForFinished(); @@ -3416,7 +3416,7 @@ void ProjectList::slotCancelJobs() QUndoCommand *command = new QUndoCommand(); command->setText(i18np("Cancel job", "Cancel jobs", m_jobList.count())); m_jobMutex.lock(); - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { DocClipBase *currentClip = m_doc->clipManager()->getClipById(m_jobList.at(i)->clipId()); if (!currentClip) continue; QMap newProps = m_jobList.at(i)->cancelProperties(); @@ -3452,7 +3452,7 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) if (!item || !item->referencedClip() || m_abortAllJobs) return false; AbstractClipJob *job; QMutexLocker lock(&m_jobMutex); - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { if (m_abortAllJobs) break; job = m_jobList.at(i); if (job->clipId() == item->clipId() && job->jobType == type && (job->status() == JOBWAITING || job->status() == JOBWORKING)) return true; @@ -3464,7 +3464,7 @@ bool ProjectList::hasPendingJob(ProjectItem *item, JOBTYPE type) void ProjectList::deleteJobsForClip(const QString &clipId) { QMutexLocker lock(&m_jobMutex); - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->clipId() == clipId) { m_jobList.at(i)->setStatus(JOBABORTED); } @@ -3494,7 +3494,7 @@ void ProjectList::slotUpdateJobStatus(ProjectItem *item, int type, int status, c if (!actionName.isEmpty()) { QAction *action = NULL; QList< KActionCollection * > collections = KActionCollection::allCollections(); - for (int i = 0; i < collections.count(); i++) { + for (int i = 0; i < collections.count(); ++i) { KActionCollection *coll = collections.at(i); action = coll->action(actionName); if (action) break; @@ -3533,7 +3533,7 @@ void ProjectList::slotShowJobLog() KDialog d(this); d.setButtons(KDialog::Close); QTextEdit t(&d); - for (int i = 0; i < m_errorLog.count(); i++) { + for (int i = 0; i < m_errorLog.count(); ++i) { if (i > 0) t.insertHtml("

"); t.insertPlainText(m_errorLog.at(i)); } @@ -3546,7 +3546,7 @@ QStringList ProjectList::getPendingJobs(const QString &id) { QStringList result; QMutexLocker lock(&m_jobMutex); - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->status() == JOBWAITING || m_jobList.at(i)->status() == JOBWORKING)) { // discard this job result << m_jobList.at(i)->description; @@ -3557,7 +3557,7 @@ QStringList ProjectList::getPendingJobs(const QString &id) void ProjectList::discardJobs(const QString &id, JOBTYPE type) { QMutexLocker lock(&m_jobMutex); - for (int i = 0; i < m_jobList.count(); i++) { + for (int i = 0; i < m_jobList.count(); ++i) { if (m_jobList.at(i)->clipId() == id && (m_jobList.at(i)->jobType == type || type == NOJOBTYPE)) { // discard this job m_jobList.at(i)->setStatus(JOBABORTED); @@ -3793,7 +3793,7 @@ void ProjectList::slotResetInfoMessage() #if KDE_IS_VERSION(4,7,0) m_errorLog.clear(); QList actions = m_infoMessage->actions(); - for (int i = 0; i < actions.count(); i++) { + for (int i = 0; i < actions.count(); ++i) { m_infoMessage->removeAction(actions.at(i)); } #endif diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index dc8f8506..0b3c67df 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -356,7 +356,7 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) foreach(const QTreeWidgetItem *item, list) { if (item->type() == PROJECTFOLDERTYPE) { const int children = item->childCount(); - for (int i = 0; i < children; i++) { + for (int i = 0; i < children; ++i) { ids.append(static_cast (item->child(i))->clipId()); } } else if (item->type() == PROJECTSUBCLIPTYPE) { diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index 1778e6b0..f19ffc95 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -52,7 +52,7 @@ ProjectSettings::ProjectSettings(ProjectList *projectlist, QMap setUrl(KUrl(projectPath)); QString currentProf = KdenliveSettings::current_profile(); - for (int i = 0; i < profiles_list->count(); i++) { + for (int i = 0; i < profiles_list->count(); ++i) { if (profiles_list->itemData(i).toString() == currentProf) { profiles_list->setCurrentIndex(i); break; @@ -204,7 +204,7 @@ void ProjectSettings::slotDeleteUnused() { QStringList toDelete; QList list = m_projectList->documentClipList(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip->numReferences() == 0 && clip->clipType() != SLIDESHOW) { KUrl url = clip->fileURL(); @@ -213,7 +213,7 @@ void ProjectSettings::slotDeleteUnused() } // make sure our urls are not used in another clip - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip->numReferences() > 0) { KUrl url = clip->fileURL(); @@ -306,7 +306,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) new QTreeWidgetItem(images, QStringList() << file); } - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { DocClipBase *clip = list.at(i); if (clip->clipType() == SLIDESHOW) { QStringList subfiles = extractSlideshowUrls(clip->fileURL()); @@ -364,7 +364,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) } allFonts.removeDuplicates(); // Hide unused categories - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { if (files_list->topLevelItem(i)->childCount() == 0) { files_list->topLevelItem(i)->setHidden(true); } @@ -497,7 +497,7 @@ QStringList ProjectSettings::extractPlaylistUrls(const QString &path) QString root = doc.documentElement().attribute("root"); if (!root.isEmpty() && !root.endsWith('/')) root.append('/'); QDomNodeList files = doc.elementsByTagName("producer"); - for (int i = 0; i < files.count(); i++) { + for (int i = 0; i < files.count(); ++i) { QDomElement e = files.at(i).toElement(); QString type = EffectsList::property(e, "mlt_service"); if (type != "colour") { @@ -521,7 +521,7 @@ QStringList ProjectSettings::extractPlaylistUrls(const QString &path) // luma files for transitions files = doc.elementsByTagName("transition"); - for (int i = 0; i < files.count(); i++) { + for (int i = 0; i < files.count(); ++i) { QDomElement e = files.at(i).toElement(); QString url = EffectsList::property(e, "luma"); if (!url.isEmpty()) { @@ -573,7 +573,7 @@ void ProjectSettings::slotExportToText() data.append(i18n("Project folder: %1", project_folder->url().path()) + '\n'); data.append(i18n("Project profile: %1", profiles_list->currentText()) + '\n'); data.append(i18n("Total clips: %1 (%2 used in timeline).", files_count->text(), used_count->text()) + "\n\n"); - for (int i = 0; i < files_list->topLevelItemCount(); i++) { + for (int i = 0; i < files_list->topLevelItemCount(); ++i) { if (files_list->topLevelItem(i)->childCount() > 0) { data.append('\n' + files_list->topLevelItem(i)->text(0) + ":\n\n"); for (int j = 0; j < files_list->topLevelItem(i)->childCount(); j++) { @@ -607,7 +607,7 @@ void ProjectSettings::slotUpdateProxyParams() const QMap ProjectSettings::metadata() const { QMap metadata; - for (int i = 0; i < metadata_list->topLevelItemCount(); i++) + for (int i = 0; i < metadata_list->topLevelItemCount(); ++i) { QTreeWidgetItem *item = metadata_list->topLevelItem(i); if (!item->text(1).simplified().isEmpty()) { diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 58b24e65..299c98a7 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -612,7 +612,7 @@ void RecMonitor::slotRecord() while (QFile::exists(path)) { QString num = QString::number(i).rightJustified(4, '0', false); path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture" + num + '.' + extension; - i++; + ++i; } m_captureFile = KUrl(path); diff --git a/src/renderer.cpp b/src/renderer.cpp index 1087d8bc..8becf375 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -566,7 +566,7 @@ void Render::slotSplitView(bool doit) if (service.type() != tractor_type || tractor.count() < 2) return; Mlt::Field *field = tractor.field(); if (doit) { - for (int i = 1, screen = 0; i < tractor.count() && screen < 4; i++) { + for (int i = 1, screen = 0; i < tractor.count() && screen < 4; ++i) { Mlt::Producer trackProducer(tractor.track(i)); kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide"); if (QString(trackProducer.get("hide")).toInt() != 1) { @@ -634,7 +634,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, in m_infoMutex.unlock(); return; } - for (int i = 0; i < m_requestList.count(); i++) { + for (int i = 0; i < m_requestList.count(); ++i) { if (m_requestList.at(i).clipId == clipId) { // Clip is already queued m_infoMutex.unlock(); @@ -657,7 +657,7 @@ void Render::forceProcessing(const QString &id) { if (m_processingClipId.contains(id)) return; QMutexLocker lock(&m_infoMutex); - for (int i = 0; i < m_requestList.count(); i++) { + for (int i = 0; i < m_requestList.count(); ++i) { requestClipInfo info = m_requestList.at(i); if (info.clipId == id) { if (i == 0) break; @@ -687,7 +687,7 @@ bool Render::isProcessing(const QString &id) { if (m_processingClipId.contains(id)) return true; QMutexLocker lock(&m_infoMutex); - for (int i = 0; i < m_requestList.count(); i++) { + for (int i = 0; i < m_requestList.count(); ++i) { if (m_requestList.at(i).clipId == id) { return true; } @@ -953,7 +953,7 @@ void Render::processFileProperties() int streams = producer->get_int("meta.media.nb_streams"); QList audio_list; QList video_list; - for (int i = 0; i < streams; i++) { + for (int i = 0; i < streams; ++i) { QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit(); QString type = producer->get(propertyName.data()); if (type == "audio") audio_list.append(i); @@ -2124,7 +2124,7 @@ bool Render::mltCutClip(int track, GenTime position) /* // Display playlist info kDebug()<<"//////////// BEFORE"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -2169,7 +2169,7 @@ bool Render::mltCutClip(int track, GenTime position) Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service")); if (dup && dup->is_valid()) { Mlt::Properties entries(filter->get_properties()); - for (int i = 0; i < entries.count(); i++) { + for (int i = 0; i < entries.count(); ++i) { dup->set(entries.get_name(i), entries.get(i)); } dupService.attach(*dup); @@ -2181,7 +2181,7 @@ bool Render::mltCutClip(int track, GenTime position) return true; /* // Display playlist info kDebug()<<"//////////// AFTER"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -2265,7 +2265,7 @@ bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement ele delete clip2; if (!filtersList.isEmpty()) { - for (int i = 0; i < filtersList.count(); i++) + for (int i = 0; i < filtersList.count(); ++i) destService.attach(*(filtersList.at(i))); } return true; @@ -2298,7 +2298,7 @@ bool Render::mltRemoveClip(int track, GenTime position) /* // Display playlist info kDebug()<<"//// AFTER"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -2438,7 +2438,7 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap /* kDebug()<<"-------------\nTRACK "<set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); @@ -3306,7 +3306,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) } } - for (int i = 0; i < filtersList.count(); i++) { + for (int i = 0; i < filtersList.count(); ++i) { clipService.attach(*(filtersList.at(i))); } @@ -3367,7 +3367,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos) } } - for (int i = 0; i < filtersList.count(); i++) { + for (int i = 0; i < filtersList.count(); ++i) { clipService.attach(*(filtersList.at(i))); } refresh(); @@ -3382,7 +3382,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration, bool refresh) /* // Display playlist info kDebug()<<"//////////// BEFORE RESIZE"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -3491,7 +3491,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor) { - for (int i = 1; i < tractor.count(); i++) { + for (int i = 1; i < tractor.count(); ++i) { Mlt::Producer trackProducer(tractor.track(i)); if (trackProducer.get_int("hide") < 2) return i; } @@ -3528,7 +3528,7 @@ void Render::fixAudioMixing(Mlt::Tractor tractor) } // Re-add correct audio transitions - for (int i = lowestTrack + 1; i < tractor.count(); i++) { + for (int i = lowestTrack + 1; i < tractor.count(); ++i) { Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); transition->set("always_active", 1); transition->set("combine", 1); @@ -3832,7 +3832,7 @@ QList Render::checkTrackSequence(int track) Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipNb = trackPlaylist.count(); //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; - for (int i = 0; i < clipNb; i++) { + for (int i = 0; i < clipNb; ++i) { Mlt::Producer *c = trackPlaylist.get_clip(i); int pos = trackPlaylist.clip_start(i); if (!list.contains(pos)) list.append(pos); @@ -4007,7 +4007,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G QStringList permanentProps; permanentProps << "factory" << "kdenlive_id" << "mlt_service" << "mlt_type" << "in"; permanentProps << "out" << "a_track" << "b_track"; - for (int i = 0; i < mlt_properties_count(transproperties); i++) { + for (int i = 0; i < mlt_properties_count(transproperties); ++i) { QString propName = mlt_properties_get_name(transproperties, i); if (!propName.startsWith('_') && ! permanentProps.contains(propName)) { mlt_properties_set(transproperties, propName.toUtf8().constData(), ""); @@ -4085,7 +4085,7 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { QDomNodeList attribs = xml.elementsByTagName("parameter"); QMap map; - for (int i = 0; i < attribs.count(); i++) { + for (int i = 0; i < attribs.count(); ++i) { QDomElement e = attribs.item(i).toElement(); QString name = e.attribute("name"); //kDebug()<<"-- TRANSITION PARAM: "< Render::mltGetTransitionParamsFromXml(QDomElement xml) if (values.size() > 0) txtNeu << (int)values[0].toDouble(); int i = 0; - for (i = 0; i < separators.size() && i + 1 < values.size(); i++) { + for (i = 0; i < separators.size() && i + 1 < values.size(); ++i) { txtNeu << separators[i]; txtNeu << (int)(values[i+1].toDouble()); } @@ -4320,7 +4320,7 @@ const QList Render::producersList() Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (!trackPlaylist.is_valid()) continue; int clipNb = trackPlaylist.count(); - for (int i = 0; i < clipNb; i++) { + for (int i = 0; i < clipNb; ++i) { Mlt::Producer *c = trackPlaylist.get_clip(i); if (c == NULL) continue; QString prodId = c->parent().get("id"); @@ -4353,7 +4353,7 @@ void Render::fillSlowMotionProducers() Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (!trackPlaylist.is_valid()) continue; int clipNb = trackPlaylist.count(); - for (int i = 0; i < clipNb; i++) { + for (int i = 0; i < clipNb; ++i) { Mlt::Producer *c = trackPlaylist.get_clip(i); Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); if (nprod) { @@ -4497,7 +4497,7 @@ void Render::mltDeleteTrack(int ix) QDomNode track = doc.elementsByTagName("track").at(ix); QDomNode tractor = doc.elementsByTagName("tractor").at(0); QDomNodeList transitions = doc.elementsByTagName("transition"); - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { QDomElement e = transitions.at(i).toElement(); QDomNodeList props = e.elementsByTagName("property"); QMap mappedProps; @@ -4567,7 +4567,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s double factor = new_fps / current_fps; QDomNodeList producers = doc.elementsByTagName("producer"); - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { QDomElement prod = producers.at(i).toElement(); prod.removeAttribute("in"); prod.removeAttribute("out"); @@ -4584,7 +4584,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList entries = doc.elementsByTagName("entry"); - for (int i = 0; i < entries.count(); i++) { + for (int i = 0; i < entries.count(); ++i) { QDomElement entry = entries.at(i).toElement(); int in = entry.attribute("in").toInt(); int out = entry.attribute("out").toInt(); @@ -4595,7 +4595,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList blanks = doc.elementsByTagName("blank"); - for (int i = 0; i < blanks.count(); i++) { + for (int i = 0; i < blanks.count(); ++i) { QDomElement blank = blanks.at(i).toElement(); int length = blank.attribute("length").toInt(); length = factor * length + 0.5; @@ -4603,7 +4603,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList filters = doc.elementsByTagName("filter"); - for (int i = 0; i < filters.count(); i++) { + for (int i = 0; i < filters.count(); ++i) { QDomElement filter = filters.at(i).toElement(); int in = filter.attribute("in").toInt(); int out = filter.attribute("out").toInt(); @@ -4614,7 +4614,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList transitions = doc.elementsByTagName("transition"); - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { QDomElement transition = transitions.at(i).toElement(); int in = transition.attribute("in").toInt(); int out = transition.attribute("out").toInt(); @@ -4692,7 +4692,7 @@ bool Render::getBlackMagicDeviceList(KComboBox *devicelist, bool force) return false; } KdenliveSettings::setDecklink_device_found(true); - for (int i = 0; i < found_devices; i++) { + for (int i = 0; i < found_devices; ++i) { char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); devicelist->addItem(bm.get(tmp)); delete[] tmp; @@ -4716,7 +4716,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force) return false; } KdenliveSettings::setDecklink_device_found(true); - for (int i = 0; i < found_devices; i++) { + for (int i = 0; i < found_devices; ++i) { char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); devicelist->addItem(bm.get(tmp)); delete[] tmp; @@ -4727,7 +4727,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force) void Render::slotMultiStreamProducerFound(const QString path, QList audio_list, QList video_list, stringMap data) { if (KdenliveSettings::automultistreams()) { - for (int i = 1; i < video_list.count(); i++) { + for (int i = 1; i < video_list.count(); ++i) { int vindex = video_list.at(i); int aindex = 0; if (i <= audio_list.count() -1) { @@ -4783,7 +4783,7 @@ void Render::slotMultiStreamProducerFound(const QString path, QList audio_l } if (dialog.exec() == QDialog::Accepted) { // import selected streams - for (int i = 0; i < groupList.count(); i++) { + for (int i = 0; i < groupList.count(); ++i) { if (groupList.at(i)->isChecked()) { int vindex = groupList.at(i)->property("vindex").toInt(); int aindex = comboList.at(i)->itemData(comboList.at(i)->currentIndex()).toInt(); diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 9bba7f58..6f91e522 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -391,7 +391,7 @@ void RenderWidget::setGuides(QDomElement guidesxml, double duration) m_view.create_chapter->setEnabled(false); } double fps = (double) m_profile.frame_rate_num / m_profile.frame_rate_den; - for (int i = 0; i < nodes.count(); i++) { + for (int i = 0; i < nodes.count(); ++i) { QDomElement e = nodes.item(i).toElement(); if (!e.isNull()) { GenTime pos = GenTime(e.attribute("time").toDouble()); @@ -449,7 +449,7 @@ void RenderWidget::slotSaveProfile() QDialog *d = new QDialog(this); ui.setupUi(d); - for (int i = 0; i < m_view.destination_list->count(); i++) + for (int i = 0; i < m_view.destination_list->count(); ++i) ui.destination_list->addItem(m_view.destination_list->itemIcon(i), m_view.destination_list->itemText(i), m_view.destination_list->itemData(i, Qt::UserRole)); ui.destination_list->setCurrentIndex(m_view.destination_list->currentIndex()); @@ -557,7 +557,7 @@ void RenderWidget::saveProfile(QDomElement newprofile) break; } } - i++; + ++i; } profiles.appendChild(newprofile); @@ -617,7 +617,7 @@ void RenderWidget::slotEditProfile() QDialog *d = new QDialog(this); ui.setupUi(d); - for (int i = 0; i < m_view.destination_list->count(); i++) + for (int i = 0; i < m_view.destination_list->count(); ++i) ui.destination_list->addItem(m_view.destination_list->itemIcon(i), m_view.destination_list->itemText(i), m_view.destination_list->itemData(i, Qt::UserRole)); ui.destination_list->setCurrentIndex(m_view.destination_list->currentIndex()); @@ -697,7 +697,7 @@ void RenderWidget::slotEditProfile() break; } } - i++; + ++i; } QDomElement profileElement = doc.createElement("profile"); @@ -779,7 +779,7 @@ void RenderWidget::slotDeleteProfile(bool refresh) doc.documentElement().removeChild(profiles.item(i)); break; } - i++; + ++i; } if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -1224,7 +1224,7 @@ void RenderWidget::refreshCategory(const QString &group, const QString &profile) m_view.open_browser->setVisible(false); // hide groups that are not in the correct destination - for (int i = 0; i < m_renderCategory.count(); i++) { + for (int i = 0; i < m_renderCategory.count(); ++i) { sizeItem = m_renderCategory.at(i); if (sizeItem->data(MetaGroupRole).toString() == destination) { m_view.format_list->addItem(sizeItem->clone()); @@ -1290,7 +1290,7 @@ void RenderWidget::refreshView(const QString &profile) const QColor disabledbg = scheme.background(KColorScheme::NegativeBackground).color(); double project_framerate = (double) m_profile.frame_rate_num / m_profile.frame_rate_den; - for (int i = 0; i < m_renderItems.count(); i++) { + for (int i = 0; i < m_renderItems.count(); ++i) { sizeItem = m_renderItems.at(i); QListWidgetItem *dupItem = NULL; if ((sizeItem->data(GroupRole).toString() == group || sizeItem->data(GroupRole).toString().isEmpty()) && sizeItem->data(MetaGroupRole).toString() == destination) { @@ -1575,7 +1575,7 @@ void RenderWidget::parseFile(const QString &exportFile, bool editable) newprofiles.setAttribute("version", 1); newdoc.appendChild(newprofiles); QDomNodeList profilelist = doc.elementsByTagName("profile"); - for (int i = 0; i < profilelist.count(); i++) { + for (int i = 0; i < profilelist.count(); ++i) { QString category = i18nc("Category Name", "Custom"); QString extension; QDomNode parent = profilelist.at(i).parentNode(); @@ -1765,7 +1765,7 @@ void RenderWidget::parseFile(const QString &exportFile, bool editable) n = n.nextSibling(); } - i++; + ++i; } } @@ -1872,7 +1872,7 @@ void RenderWidget::slotCheckJob() } m_view.abort_job->setEnabled(activate); /* - for (int i = 0; i < m_view.running_jobs->topLevelItemCount(); i++) { + for (int i = 0; i < m_view.running_jobs->topLevelItemCount(); ++i) { current = static_cast(m_view.running_jobs->topLevelItem(i)); if (current == static_cast (m_view.running_jobs->currentItem())) { current->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 3)); @@ -1956,7 +1956,7 @@ void RenderWidget::slotCheckScript() if (current == NULL) return; m_view.start_script->setEnabled(current->data(0, Qt::UserRole).toString().isEmpty()); m_view.delete_script->setEnabled(true); - for (int i = 0; i < m_view.scripts_list->topLevelItemCount(); i++) { + for (int i = 0; i < m_view.scripts_list->topLevelItemCount(); ++i) { current = m_view.scripts_list->topLevelItem(i); if (current == m_view.scripts_list->currentItem()) { current->setSizeHint(1, QSize(m_view.scripts_list->columnWidth(1), fontMetrics().height() * 3)); @@ -2237,7 +2237,7 @@ bool RenderWidget::proxyRendering() void RenderWidget::setRescaleEnabled(bool enable) { - for (int i = 0; i < m_view.rescale_box->layout()->count(); i++) { + for (int i = 0; i < m_view.rescale_box->layout()->count(); ++i) { if (m_view.rescale_box->itemAt(i)->widget()) m_view.rescale_box->itemAt(i)->widget()->setEnabled(enable); } } diff --git a/src/scopes/audioscopes/audiosignal.cpp b/src/scopes/audioscopes/audiosignal.cpp index bc4f68f9..6e9643a2 100644 --- a/src/scopes/audioscopes/audiosignal.cpp +++ b/src/scopes/audioscopes/audiosignal.cpp @@ -53,7 +53,7 @@ QImage AudioSignal::renderAudioScope(uint, const QVector audioFrame, int num_samples = samples > 200 ? 200 : samples; QByteArray channels; - for (int i = 0; i < num_channels; i++) { + for (int i = 0; i < num_channels; ++i) { long val = 0; for (int s = 0; s < num_samples; s ++) { val += abs(audioFrame[i+s*num_channels] / 128); @@ -87,7 +87,7 @@ QImage AudioSignal::renderAudioScope(uint, const QVector audioFrame, int dbsize=20; bool showdb=width()>(dbsize+40); //valpixel=1.0 for 127, 1.0+(1/40) for 1 short oversample, 1.0+(2/40) for longer oversample - for (int i = 0; i < numchan; i++) { + for (int i = 0; i < numchan; ++i) { //int maxx= (unsigned char)channels[i] * (horiz ? width() : height() ) / 127; double valpixel=valueToPixel((double)(unsigned char)channels[i]/127.0); int maxx= height() * valpixel; @@ -159,7 +159,7 @@ void AudioSignal::slotReceiveAudio(QVector data, int, int num_channels, QByteArray channels; int num_oversample=0; - for (int i = 0; i < num_channels; i++) { + for (int i = 0; i < num_channels; ++i) { long val = 0; double over1=0.0; double over2=0.0; diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp index 9760aa16..e6c35fba 100644 --- a/src/scopes/audioscopes/audiospectrum.cpp +++ b/src/scopes/audioscopes/audiospectrum.cpp @@ -175,7 +175,7 @@ QImage AudioSpectrum::renderAudioScope(uint, const QVector audioFrame, bool overmodulated = false; int overmodulateCount = 0; - for (int i = 0; i < audioFrame.size(); i++) { + for (int i = 0; i < audioFrame.size(); ++i) { if ( audioFrame[i] == std::numeric_limits::max() || audioFrame[i] == std::numeric_limits::min()) { @@ -271,7 +271,7 @@ QImage AudioSpectrum::renderAudioScope(uint, const QVector audioFrame, davinci.setPen(QPen(QBrush(spectrumColor.rgba()), 1, Qt::SolidLine)); #endif - for (uint i = 0; i < w; i++) { + for (uint i = 0; i < w; ++i) { yMax = (dbMap[i] - m_dBmin) / (m_dBmax-m_dBmin) * (h-1); if (yMax < 0) { yMax = 0; @@ -294,7 +294,7 @@ QImage AudioSpectrum::renderAudioScope(uint, const QVector audioFrame, if (m_peaks.size() != fftWindow/2) { m_peaks = QVector(m_lastFFT); } else { - for (int i = 0; i < fftWindow/2; i++) { + for (int i = 0; i < fftWindow/2; ++i) { if (m_lastFFT[i] > m_peaks[i]) { m_peaks[i] = m_lastFFT[i]; } else { @@ -304,7 +304,7 @@ QImage AudioSpectrum::renderAudioScope(uint, const QVector audioFrame, } int prev = 0; m_peakMap = FFTTools::interpolatePeakPreserving(m_peaks, m_innerScopeRect.width(), 0, right, -180); - for (uint i = 0; i < w; i++) { + for (uint i = 0; i < w; ++i) { yMax = (m_peakMap[i] - m_dBmin) / (m_dBmax-m_dBmin) * (h-1); if (yMax < 0) { yMax = 0; diff --git a/src/scopes/audioscopes/spectrogram.cpp b/src/scopes/audioscopes/spectrogram.cpp index 32bf4cd9..c47f2492 100644 --- a/src/scopes/audioscopes/spectrogram.cpp +++ b/src/scopes/audioscopes/spectrogram.cpp @@ -395,7 +395,7 @@ QImage Spectrogram::renderAudioScope(uint, const QVector audioFrame, co right = ((float) m_freqMax)/(m_freq/2) * (windowSize - 1); dbMap = FFTTools::interpolatePeakPreserving((*it), m_innerScopeRect.width(), 0, right, -180); - for (int i = 0; i < dbMap.size(); i++) { + for (int i = 0; i < dbMap.size(); ++i) { val = dbMap[i]; peak = val > m_dBmax; diff --git a/src/scopes/scopemanager.cpp b/src/scopes/scopemanager.cpp index e03c4e73..665c40f5 100644 --- a/src/scopes/scopemanager.cpp +++ b/src/scopes/scopemanager.cpp @@ -41,7 +41,7 @@ bool ScopeManager::addScope(AbstractAudioScopeWidget *audioScope, QDockWidget *a bool added = false; int exists = false; // Only add the scope if it does not exist yet in the list - for (int i = 0; i < m_audioScopes.size(); i++) { + for (int i = 0; i < m_audioScopes.size(); ++i) { if (m_audioScopes[i].scope == audioScope) { exists = true; break; @@ -77,7 +77,7 @@ bool ScopeManager::addScope(AbstractGfxScopeWidget *colorScope, QDockWidget *col { bool added = false; int exists = false; - for (int i = 0; i < m_colorScopes.size(); i++) { + for (int i = 0; i < m_colorScopes.size(); ++i) { if (m_colorScopes[i].scope == colorScope) { exists = true; break; @@ -115,7 +115,7 @@ void ScopeManager::slotDistributeAudio(QVector sampleData, int freq, in #ifdef DEBUG_SM qDebug() << "ScopeManager: Starting to distribute audio."; #endif - for (int i = 0; i < m_audioScopes.size(); i++) { + for (int i = 0; i < m_audioScopes.size(); ++i) { // Distribute audio to all scopes that are visible and want to be refreshed if (!m_audioScopes[i].scope->visibleRegion().isEmpty()) { if (m_audioScopes[i].scope->autoRefreshEnabled()) { @@ -134,7 +134,7 @@ void ScopeManager::slotDistributeFrame(const QImage &image) #ifdef DEBUG_SM qDebug() << "ScopeManager: Starting to distribute frame."; #endif - for (int i = 0; i < m_colorScopes.size(); i++) { + for (int i = 0; i < m_colorScopes.size(); ++i) { if (!m_colorScopes[i].scope->visibleRegion().isEmpty()) { if (m_colorScopes[i].scope->autoRefreshEnabled()) { m_colorScopes[i].scope->slotRenderZoneUpdated(image); @@ -166,13 +166,13 @@ void ScopeManager::slotRequestFrame(const QString &widgetName) // Search for the scope in the lists and tag it to trigger a forced update // in the distribution slots - for (int i = 0; i < m_colorScopes.size(); i++) { + for (int i = 0; i < m_colorScopes.size(); ++i) { if (m_colorScopes[i].scope->widgetName() == widgetName) { m_colorScopes[i].singleFrameRequested = true; break; } } - for (int i = 0; i < m_audioScopes.size(); i++) { + for (int i = 0; i < m_audioScopes.size(); ++i) { if (m_audioScopes[i].scope->widgetName() == widgetName) { m_audioScopes[i].singleFrameRequested = true; break; @@ -240,7 +240,7 @@ void ScopeManager::slotCheckActiveScopes() bool ScopeManager::audioAcceptedByScopes() const { bool accepted = false; - for (int i = 0; i < m_audioScopes.size(); i++) { + for (int i = 0; i < m_audioScopes.size(); ++i) { if (!m_audioScopes[i].scope->visibleRegion().isEmpty() && m_audioScopes[i].scope->autoRefreshEnabled()) { accepted = true; break; @@ -254,7 +254,7 @@ bool ScopeManager::audioAcceptedByScopes() const bool ScopeManager::imagesAcceptedByScopes() const { bool accepted = false; - for (int i = 0; i < m_colorScopes.size(); i++) { + for (int i = 0; i < m_colorScopes.size(); ++i) { if (!m_colorScopes[i].scope->visibleRegion().isEmpty() && m_colorScopes[i].scope->autoRefreshEnabled()) { accepted = true; break; diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 71d2c2b6..c4c88cda 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -190,7 +190,7 @@ void SlideshowClip::parseFolder() int firstFrame = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt(); QString path; int gap = 0; - for (int i = firstFrame; gap < 100; i++) { + for (int i = firstFrame; gap < 100; ++i) { path = filter + QString::number(i).rightJustified(precision, '0', false) + ext; if (dir.exists(path)) { result.append(path); @@ -219,7 +219,7 @@ void SlideshowClip::slotGenerateThumbs() delete m_thumbJob; }; KFileItemList fileList; - for (int i = 0; i < m_view.icon_list->count(); i++) { + for (int i = 0; i < m_view.icon_list->count(); ++i) { QListWidgetItem* item = m_view.icon_list->item(i); if (item) { QString path = item->data(Qt::UserRole).toString(); @@ -242,7 +242,7 @@ void SlideshowClip::slotGenerateThumbs() void SlideshowClip::slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix) { - for (int i = 0; i < m_view.icon_list->count(); i++) { + for (int i = 0; i < m_view.icon_list->count(); ++i) { QListWidgetItem* item = m_view.icon_list->item(i); if (item) { QString path = item->data(Qt::UserRole).toString(); @@ -312,7 +312,7 @@ QString SlideshowClip::selectedPath(const KUrl &url, bool isMime, QString extens QDir dir(folder); QString path; int gap = 0; - for (int i = firstFrame; gap < 100; i++) { + for (int i = firstFrame; gap < 100; ++i) { path = filter + QString::number(i).rightJustified(precision, '0', false) + ext; if (dir.exists(path)) { (*list).append(folder + path); diff --git a/src/smallruler.cpp b/src/smallruler.cpp index cc5d2680..8505e2ff 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -182,7 +182,7 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event) } else if (qAbs((pos - m_zoneEnd) * m_scale) < 4) { setToolTip(i18n("Zone end: %1", m_monitor->getTimecodeFromFrames(m_zoneEnd))); } - for (int i = 0; i < m_markers.count(); i++) { + for (int i = 0; i < m_markers.count(); ++i) { if (qAbs((pos - m_markers.at(i).time().frames(m_monitor->fps())) * m_scale) < 4) { // We are on a marker QString markerxt = m_monitor->getMarkerThumb(m_markers.at(i).time()); @@ -262,7 +262,7 @@ void SmallRuler::updatePixmap() } // draw markers if (!m_markers.isEmpty()) { - for (int i = 0; i < m_markers.count(); i++) { + for (int i = 0; i < m_markers.count(); ++i) { int pos = m_markers.at(i).time().frames(m_monitor->fps()) * m_scale; p.setPen(CommentedTime::markerColor(m_markers.at(i).markerType())); p.drawLine(pos, 0, pos, 9); diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp index 572664a9..546cf720 100644 --- a/src/stopmotion/stopmotion.cpp +++ b/src/stopmotion/stopmotion.cpp @@ -220,7 +220,7 @@ StopmotionWidget::StopmotionWidget(MonitorManager *manager, const KUrl &projectF effectsMenu->addAction(invertEffect); effectsMenu->addAction(thresEffect); QList list = effectsMenu->actions(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { list.at(i)->setCheckable(true); if (list.at(i)->data().toInt() == m_effectIndex) { list.at(i)->setChecked(true); @@ -266,7 +266,7 @@ StopmotionWidget::StopmotionWidget(MonitorManager *manager, const KUrl &projectF if (QFile::exists(KdenliveSettings::video4vdevice())) { #ifdef USE_V4L // Video 4 Linux device detection - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; ++i) { QString path = "/dev/video" + QString::number(i); if (QFile::exists(path)) { QStringList deviceInfo = V4lCaptureHandler::getDeviceName(path); diff --git a/src/titledocument.cpp b/src/titledocument.cpp index 66c8e196..5d29e1bf 100644 --- a/src/titledocument.cpp +++ b/src/titledocument.cpp @@ -275,7 +275,7 @@ QColor TitleDocument::getBackgroundColor() const QColor color(0, 0, 0, 0); if (m_scene) { QList items = m_scene->items(); - for (int i = 0; i < items.size(); i++) { + for (int i = 0; i < items.size(); ++i) { if (items.at(i)->zValue() == -1100) { color = ((QGraphicsRectItem *)items.at(i))->brush().color(); return color; @@ -349,7 +349,7 @@ int TitleDocument::loadFromXml(const QDomDocument& doc, QGraphicsRectItem* start if (titles.size()) { QDomNodeList items = titles.item(0).childNodes(); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { QGraphicsItem *gitem = NULL; kDebug() << items.item(i).attributes().namedItem("type").nodeValue(); int zValue = items.item(i).attributes().namedItem("z-index").nodeValue().toInt(); @@ -507,7 +507,7 @@ int TitleDocument::loadFromXml(const QDomDocument& doc, QGraphicsRectItem* start QColor color = QColor(stringToColor(items.item(i).attributes().namedItem("color").nodeValue())); //color.setAlpha(items.item(i).attributes().namedItem("alpha").nodeValue().toInt()); QList items = m_scene->items(); - for (int i = 0; i < items.size(); i++) { + for (int i = 0; i < items.size(); ++i) { if (items.at(i)->zValue() == -1100) { ((QGraphicsRectItem *)items.at(i))->setBrush(QBrush(color)); break; diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 2bda5356..aea52105 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -595,7 +595,7 @@ QStringList TitleWidget::extractImageList(const QString& xml) QDomDocument doc; doc.setContent(xml); QDomNodeList images = doc.elementsByTagName("content"); - for (int i = 0; i < images.count(); i++) { + for (int i = 0; i < images.count(); ++i) { if (images.at(i).toElement().hasAttribute("url")) result.append(images.at(i).toElement().attribute("url")); } @@ -610,7 +610,7 @@ QStringList TitleWidget::extractFontList(const QString& xml) QDomDocument doc; doc.setContent(xml); QDomNodeList images = doc.elementsByTagName("content"); - for (int i = 0; i < images.count(); i++) { + for (int i = 0; i < images.count(); ++i) { if (images.at(i).toElement().hasAttribute("font")) result.append(images.at(i).toElement().attribute("font")); } @@ -977,7 +977,7 @@ void TitleWidget::setCurrentItem(QGraphicsItem *item) void TitleWidget::zIndexChanged(int v) { QList l = graphicsView->scene()->selectedItems(); - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { l[i]->setZValue(v); } } @@ -1035,7 +1035,7 @@ void TitleWidget::selectionChanged() */ int firstType = l.at(0)->type(); bool allEqual = true; - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { if (l.at(i)->type() != firstType) { allEqual = false; break; @@ -1053,7 +1053,7 @@ void TitleWidget::selectionChanged() value_x->setEnabled(true); value_y->setEnabled(true); bool containsTextitem = false; - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { if (l.at(i)->type() == TEXTITEM) { containsTextitem = true; break; @@ -1068,7 +1068,7 @@ void TitleWidget::selectionChanged() // Disable z index buttons if they don't make sense for the current selection int firstZindex = l.at(0)->zValue(); allEqual = true; - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { if (l[i]->zValue() != firstZindex) { allEqual = false; break; @@ -1572,7 +1572,7 @@ void TitleWidget::slotUpdateText() double outlineWidth = textOutline->value() / 10.0; int i; - for (i = 0; i < graphicsView->scene()->selectedItems().length(); i++) { + for (i = 0; i < graphicsView->scene()->selectedItems().length(); ++i) { QGraphicsTextItem* item = NULL; QList l = graphicsView->scene()->selectedItems(); if (l.at(i)->type() == TEXTITEM) { @@ -1619,7 +1619,7 @@ void TitleWidget::rectChanged() { QList l = graphicsView->scene()->selectedItems(); int i; - for (i = 0; i < l.length(); i++) { + for (i = 0; i < l.length(); ++i) { if (l.at(i)->type() == RECTITEM && !settingUp) { QGraphicsRectItem *rec = static_cast(l.at(i)); QColor f = rectFColor->color(); @@ -1817,7 +1817,7 @@ void TitleWidget::loadTitle(KUrl url) if (url.isEmpty()) url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Load Title")); if (!url.isEmpty()) { QList items = m_scene->items(); - for (int i = 0; i < items.size(); i++) { + for (int i = 0; i < items.size(); ++i) { if (items.at(i)->zValue() > -1000) delete items.at(i); } m_scene->clearTextSelection(); @@ -1916,7 +1916,7 @@ void TitleWidget::setXml(const QDomDocument &doc) m_transformations.clear(); QList items = graphicsView->scene()->items(); const double PI = 4.0 * atan(1.0); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { QTransform t = items.at(i)->transform(); Transform x; x.scalex = t.m11(); @@ -2085,7 +2085,7 @@ void TitleWidget::slotAnimStart(bool anim) } slotSelectTool(); QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->zValue() > -1000) { list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim); list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim); @@ -2127,7 +2127,7 @@ void TitleWidget::slotAnimEnd(bool anim) } slotSelectTool(); QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { + for (int i = 0; i < list.count(); ++i) { if (list.at(i)->zValue() > -1000) { list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim); list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim); @@ -2359,7 +2359,7 @@ qreal TitleWidget::zIndexBounds(bool maxBound, bool intersectingOnly) int n = lItems.size(); qreal z; if (maxBound) { - for (int i = 0; i < n; i++) { + for (int i = 0; i < n; ++i) { z = lItems[i]->zValue(); if (z > bound && !lItems[i]->isSelected()) { bound = z; @@ -2372,7 +2372,7 @@ qreal TitleWidget::zIndexBounds(bool maxBound, bool intersectingOnly) } } else { // Get minimum z index. - for (int i = 0; i < n; i++) { + for (int i = 0; i < n; ++i) { z = lItems[i]->zValue(); if (z < bound && !lItems[i]->isSelected() && z > -999) { // There are items at the very bottom (background e.g.) with z-index < -1000. @@ -2405,7 +2405,7 @@ void TitleWidget::slotZIndexTop() QList l = graphicsView->scene()->selectedItems(); qreal max = zIndexBounds(true, false); std::cout << "Max z-index is " << max << ".\n"; - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { qreal currentZ = l[i]->zValue(); if (currentZ <= max) { std::cout << "Updating item " << i << ", is " << currentZ << ".\n"; @@ -2437,7 +2437,7 @@ void TitleWidget::slotZIndexBottom() { QList l = graphicsView->scene()->selectedItems(); qreal min = zIndexBounds(false, false); - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { qreal currentZ = l[i]->zValue(); if (currentZ >= min) { l[i]->setZValue(min - 1); @@ -2452,7 +2452,7 @@ void TitleWidget::slotZIndexBottom() void TitleWidget::slotSelectAll() { QList l = graphicsView->scene()->items(); - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { l.at(i)->setSelected(true); } } @@ -2462,14 +2462,14 @@ void TitleWidget::selectItems(int itemType) QList l; if (graphicsView->scene()->selectedItems().size() > 0) { l = graphicsView->scene()->selectedItems(); - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { if (l.at(i)->type() != itemType) { l.at(i)->setSelected(false); } } } else { l = graphicsView->scene()->items(); - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { if (l.at(i)->type() == itemType) { l.at(i)->setSelected(true); } @@ -2496,7 +2496,7 @@ void TitleWidget::slotSelectNone() { graphicsView->blockSignals(true); QList l = graphicsView->scene()->items(); - for (int i = 0; i < l.size(); i++) { + for (int i = 0; i < l.size(); ++i) { l.at(i)->setSelected(false); } graphicsView->blockSignals(false); diff --git a/src/tracksconfigdialog.cpp b/src/tracksconfigdialog.cpp index 7d40b96c..f709d00c 100644 --- a/src/tracksconfigdialog.cpp +++ b/src/tracksconfigdialog.cpp @@ -194,7 +194,7 @@ void TracksConfigDialog::slotDelete() return; if (m_deletedRows.at(i) > row) break; - i++; + ++i; } m_deletedRows.insert(i, row); for (i = 0; i < table->columnCount(); ++i) { diff --git a/src/trackview.cpp b/src/trackview.cpp index 6bc3d640..2f045001 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -159,7 +159,7 @@ bool TrackView::checkProjectAudio() const bool hasAudio = false; const QList list = m_doc->tracksList(); int max = list.count(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { TrackInfo info = list.at(max - i - 1); if (!info.isMute && m_trackview->hasAudio(i)) { hasAudio = true; @@ -211,7 +211,7 @@ void TrackView::parseDocument(const QDomDocument &doc) int pos = m_projectTracks - 1; m_invalidProducers.clear(); QDomNodeList producers = doc.elementsByTagName("producer"); - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { // Check for invalid producers QDomNode n = producers.item(i); e = n.toElement(); @@ -230,7 +230,7 @@ void TrackView::parseDocument(const QDomDocument &doc) } int trackIndex = 0; - for (int i = 0; i < m_projectTracks; i++) { + for (int i = 0; i < m_projectTracks; ++i) { e = tracks.item(i).toElement(); QString playlist_name = e.attribute("producer"); if (playlist_name != "black_track" && playlist_name != "playlistmain") { @@ -275,7 +275,7 @@ void TrackView::parseDocument(const QDomDocument &doc) QDomNodeList transitions = tractor.elementsByTagName("transition"); //kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions"; - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { e = transitions.item(i).toElement(); QDomNodeList transitionparams = e.childNodes(); bool transitionAdd = true; @@ -361,7 +361,7 @@ void TrackView::parseDocument(const QDomDocument &doc) QString paramValue = p.text(); QDomNodeList params = base.elementsByTagName("parameter"); - if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) { + if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && e.attribute("tag") == paramName) { if (e.attribute("type") == "double") { @@ -424,7 +424,7 @@ void TrackView::parseDocument(const QDomDocument &doc) // Add guides QDomNodeList guides = infoXml.elementsByTagName("guide"); - for (int i = 0; i < guides.count(); i++) { + for (int i = 0; i < guides.count(); ++i) { e = guides.item(i).toElement(); const QString comment = e.attribute("comment"); const GenTime pos = GenTime(e.attribute("time").toDouble()); @@ -503,7 +503,7 @@ int TrackView::fitZoom() const { int zoom = (int)((duration() + 20 / m_scale) * m_trackview->getFrameWidth() / m_trackview->width()); int i; - for (i = 0; i < 13; i++) + for (i = 0; i < 13; ++i) if (m_ruler->comboScale[i] > zoom) break; return i; } @@ -521,7 +521,7 @@ void TrackView::refresh() void TrackView::slotRepaintTracks() { QList widgets = findChildren(); - for (int i = 0; i < widgets.count(); i++) { + for (int i = 0; i < widgets.count(); ++i) { if (widgets.at(i)) widgets.at(i)->setSelectedIndex(m_trackview->selectedTrack()); } } @@ -548,7 +548,7 @@ void TrackView::slotRebuildTrackHeaders() updatePalette(); - for (int i = 0; i < max; i++) { + for (int i = 0; i < max; ++i) { frame = new QFrame(headers_container); frame->setFrameStyle(QFrame::HLine); frame->setFixedHeight(1); @@ -591,7 +591,7 @@ void TrackView::adjustTrackHeaders() { int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; QList widgets = findChildren(); - for (int i = 0; i < widgets.count(); i++) { + for (int i = 0; i < widgets.count(); ++i) { if (widgets.at(i)) widgets.at(i)->adjustSize(height); } } @@ -656,7 +656,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod producerReplacementIds.insert(idString, prodId); // now adjust the mlt producer bool found = false; - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { QDomElement prod = producers.at(i).toElement(); if (prod.attribute("id") == prodId) { // ok, producer already exists @@ -665,7 +665,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod } } if (!found) { - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { QDomElement prod = producers.at(i).toElement(); if (prod.attribute("id") == idString) { prod.setAttribute("id", prodId); @@ -677,7 +677,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod } if (!found) { // We didn't find the producer for this track, find producer for another track and duplicate - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { QDomElement prod = producers.at(i).toElement(); QString mltProdId = prod.attribute("id"); if (mltProdId == prodId || mltProdId.startsWith(prodId + '_')) { @@ -697,7 +697,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod QDomElement producerXml = doc.createElement("producer"); doc.appendChild(producerXml); bool foundMltProd = false; - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { QDomElement prod = producers.at(i).toElement(); if (prod.attribute("id") == id) { QString service = EffectsList::property(prod, "mlt_service"); @@ -822,7 +822,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo QString endtag; double offset = 0; QDomNodeList params = currenteffect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("type") == "keyframe") { starttag = e.attribute("starttag", "start"); @@ -886,7 +886,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } params = currenteffect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.attribute("type") == "keyframe") e.setAttribute("keyframes", keyframes); } @@ -945,7 +945,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo ++j; } currenteffect.appendChild(currenteffect.ownerDocument().importNode(subclipeffect, true)); - i++; + ++i; } } @@ -1020,7 +1020,7 @@ DocClipBase *TrackView::getMissingProducer(const QString &id) const QDomNodeList prods = doc.elementsByTagName("producer"); int maxprod = prods.count(); bool slowmotionClip = false; - for (int i = 0; i < maxprod; i++) { + for (int i = 0; i < maxprod; ++i) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); if (prodId.startsWith("slowmotion")) { @@ -1038,7 +1038,7 @@ DocClipBase *TrackView::getMissingProducer(const QString &id) const if (m_replacementProducerIds.contains(id)) { QString newId = m_replacementProducerIds.value(id); slowmotionClip = false; - for (int i = 0; i < maxprod; i++) { + for (int i = 0; i < maxprod; ++i) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); if (prodId.startsWith("slowmotion")) { diff --git a/src/transition.cpp b/src/transition.cpp index e8bfbd41..35982a1c 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -238,7 +238,7 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value bool forwardMove = newPos.x() > pos().x(); int offset = 0; if (!items.isEmpty()) { - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { if (!items.at(i)->isEnabled()) continue; if (items.at(i)->type() == type()) { // Collision! @@ -331,7 +331,7 @@ QDomElement Transition::toXML() bool Transition::hasGeometry() { QDomNodeList namenode = m_parameters.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { QDomElement pa = namenode.item(i).toElement(); if (pa.attribute("type") == "geometry") return true; } @@ -349,7 +349,7 @@ bool Transition::updateKeyframes(int oldEnd) QDomElement pa; bool modified = false; QDomNodeList namenode = m_parameters.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { + for (int i = 0; i < namenode.count() ; ++i) { pa = namenode.item(i).toElement(); if (pa.attribute("type") == "geometry") { keyframes = pa.attribute("value"); @@ -365,7 +365,7 @@ bool Transition::updateKeyframes(int oldEnd) // Transition was expanded, check if we had a keyframe at end position foreach(QString pos, values) { if (!pos.contains('=')) { - i++; + ++i; continue; } frame = pos.section('=', 0, 0).toInt(); @@ -375,7 +375,7 @@ bool Transition::updateKeyframes(int oldEnd) pa.setAttribute("value", values.join(";")); return true; } - i++; + ++i; } return false; } @@ -383,7 +383,7 @@ bool Transition::updateKeyframes(int oldEnd) // Transition was shortened, check for out of bounds keyframes foreach(const QString &pos, values) { if (!pos.contains('=')) { - i++; + ++i; continue; } frame = pos.section('=', 0, 0).toInt(); @@ -391,7 +391,7 @@ bool Transition::updateKeyframes(int oldEnd) modified = true; break; } - i++; + ++i; } } if (modified) { diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 0d45c205..211e8b49 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -93,7 +93,7 @@ void TransitionSettings::updateTrackList() //kDebug() << "/ / TRANS TRK: " << limit; KIcon videoIcon("kdenlive-show-video"); KIcon audioIcon("kdenlive-show-audio"); - for (int i = limit; i < m_tracks.count(); i++) { + for (int i = limit; i < m_tracks.count(); ++i) { int ix = m_tracks.count() - i - 1; transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon, m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ')', diff --git a/src/unicodedialog.cpp b/src/unicodedialog.cpp index 0fcbc253..4ca3e0b6 100644 --- a/src/unicodedialog.cpp +++ b/src/unicodedialog.cpp @@ -222,14 +222,14 @@ void UnicodeWidget::updateOverviewChars(uint unicode) QString right; uint i; - for (i = 1; i <= 4; i++) { + for (i = 1; i <= 4; ++i) { if (unicode > i && !controlCharacter(unicode - i)) { left = ' ' + left; left = QChar(unicode - i) + left; } } - for (i = 1; i <= 8; i++) { + for (i = 1; i <= 8; ++i) { if (unicode + i <= MAX_UNICODE_V1 && !controlCharacter(unicode + i)) { right += QChar(unicode + i); right += ' '; diff --git a/src/utils/archiveorg.cpp b/src/utils/archiveorg.cpp index 988c0245..12c93658 100644 --- a/src/utils/archiveorg.cpp +++ b/src/utils/archiveorg.cpp @@ -162,7 +162,7 @@ void ArchiveOrg::slotParseResults(KJob* job) QString link; int ct = 0; m_thumbsPath.clear(); - for (int i = 0; i < links.count(); i++) { + for (int i = 0; i < links.count(); ++i) { QString href = links.at(i).toElement().attribute("href"); if (href.endsWith(".thumbs/")) { // sub folder contains image thumbs, display one. @@ -226,7 +226,7 @@ void ArchiveOrg::slotParseThumbs(KJob* job) doc.setContent(QString::fromUtf8(storedQueryJob->data())); QDomNodeList links = doc.elementsByTagName("a"); if (links.isEmpty()) return; - for (int i = 0; i < links.count(); i++) { + for (int i = 0; i < links.count(); ++i) { QString href = links.at(i).toElement().attribute("href"); if (!href.contains('/') && i >= links.count() / 2) { QString thumbUrl = m_thumbsPath + href; diff --git a/src/utils/openclipart.cpp b/src/utils/openclipart.cpp index d8cbc647..387dcc4d 100644 --- a/src/utils/openclipart.cpp +++ b/src/utils/openclipart.cpp @@ -60,7 +60,7 @@ void OpenClipArt::slotShowResults(KJob* job) QDomDocument doc; doc.setContent(QString::fromAscii(storedQueryJob->data())); QDomNodeList items = doc.documentElement().elementsByTagName("item"); - for (int i = 0; i < items.count(); i++) { + for (int i = 0; i < items.count(); ++i) { QDomElement currentClip = items.at(i).toElement(); QDomElement title = currentClip.firstChildElement("title"); QListWidgetItem *item = new QListWidgetItem(title.firstChild().nodeValue(), m_listWidget); diff --git a/src/wizard.cpp b/src/wizard.cpp index a66a0ec1..61a232b1 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -113,7 +113,7 @@ Wizard::Wizard(bool upgrade, QWidget *parent) : // select default profile if (!KdenliveSettings::default_profile().isEmpty()) { - for (int i = 0; i < m_standard.profiles_list->count(); i++) { + for (int i = 0; i < m_standard.profiles_list->count(); ++i) { if (m_standard.profiles_list->item(i)->data(Qt::UserRole).toString() == KdenliveSettings::default_profile()) { m_standard.profiles_list->setCurrentRow(i); m_standard.profiles_list->scrollToItem(m_standard.profiles_list->currentItem()); @@ -172,7 +172,7 @@ void Wizard::slotDetectWebcam() m_capture.v4l_devices->clear(); // Video 4 Linux device detection - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; ++i) { QString path = "/dev/video" + QString::number(i); if (QFile::exists(path)) { QStringList deviceInfo = V4lCaptureHandler::getDeviceName(path.toUtf8().constData()); @@ -186,7 +186,7 @@ void Wizard::slotDetectWebcam() m_capture.v4l_status->setText(i18n("Default video4linux device:")); // select default device bool found = false; - for (int i = 0; i < m_capture.v4l_devices->count(); i++) { + for (int i = 0; i < m_capture.v4l_devices->count(); ++i) { QString device = m_capture.v4l_devices->itemData(i).toString(); if (device == KdenliveSettings::video4vdevice()) { m_capture.v4l_devices->setCurrentIndex(i); @@ -220,7 +220,7 @@ void Wizard::slotUpdateCaptureParameters() QString itemSize; QString pixelFormat; QStringList itemRates; - for (int i = 0; i < pixelformats.count(); i++) { + for (int i = 0; i < pixelformats.count(); ++i) { QString format = pixelformats.at(i).section(':', 0, 0); QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts); pixelFormat = sizes.takeFirst(); @@ -344,19 +344,19 @@ void Wizard::checkMltComponents() consumer->start(); QStringList result; Mlt::Properties vcodecs((mlt_properties) consumer->get_data("vcodec")); - for (int i = 0; i < vcodecs.count(); i++) + for (int i = 0; i < vcodecs.count(); ++i) result << QString(vcodecs.get(i)); m_mltCheck.vcodecs_list->addItems(result); KdenliveSettings::setVideocodecs(result); result.clear(); Mlt::Properties acodecs((mlt_properties) consumer->get_data("acodec")); - for (int i = 0; i < acodecs.count(); i++) + for (int i = 0; i < acodecs.count(); ++i) result << QString(acodecs.get(i)); m_mltCheck.acodecs_list->addItems(result); KdenliveSettings::setAudiocodecs(result); result.clear(); Mlt::Properties formats((mlt_properties) consumer->get_data("f")); - for (int i = 0; i < formats.count(); i++) + for (int i = 0; i < formats.count(); ++i) result << QString(formats.get(i)); m_mltCheck.formats_list->addItems(result); KdenliveSettings::setSupportedformats(result); @@ -435,7 +435,7 @@ void Wizard::checkMissingCodecs() QString std; QString format; QDomNodeList profiles = doc.elementsByTagName("profile"); - for (int i = 0; i < profiles.count(); i++) { + for (int i = 0; i < profiles.count(); ++i) { std = profiles.at(i).toElement().attribute("args"); format.clear(); if (std.startsWith("acodec=")) format = std.section("acodec=", 1, 1); @@ -452,9 +452,9 @@ void Wizard::checkMissingCodecs() if (replaceVorbisCodec) requiredACodecs.replaceInStrings("vorbis", "libvorbis"); if (replaceLibfaacCodec) requiredACodecs.replaceInStrings("aac", "libfaac"); - for (int i = 0; i < acodecsList.count(); i++) + for (int i = 0; i < acodecsList.count(); ++i) requiredACodecs.removeAll(acodecsList.at(i)); - for (int i = 0; i < vcodecsList.count(); i++) + for (int i = 0; i < vcodecsList.count(); ++i) requiredVCodecs.removeAll(vcodecsList.at(i)); if (!requiredACodecs.isEmpty() || !requiredVCodecs.isEmpty()) { QString missing = requiredACodecs.join(","); @@ -686,7 +686,7 @@ void Wizard::slotCheckStandard() //m_standard.profiles_list->sortItems(); } - for (int i = 0; i < m_standard.profiles_list->count(); i++) { + for (int i = 0; i < m_standard.profiles_list->count(); ++i) { QListWidgetItem *item = m_standard.profiles_list->item(i); QMap< QString, QString > values = ProfilesDialog::getSettingsFromFile(item->data(Qt::UserRole).toString()); -- 2.39.2