From: Jean-Baptiste Mardelle Date: Mon, 23 Jul 2012 08:49:22 +0000 (+0200) Subject: Use char for single character [krazy 1-44] by Mikko Rapeli X-Git-Url: https://git.sesse.net/?p=kdenlive;a=commitdiff_plain;h=f41770656c58ffc541441d04a3845cd1005fcdcf Use char for single character [krazy 1-44] by Mikko Rapeli --- diff --git a/renderer/kdenlive_render.cpp b/renderer/kdenlive_render.cpp index 07cb3f82..056c2519 100644 --- a/renderer/kdenlive_render.cpp +++ b/renderer/kdenlive_render.cpp @@ -81,7 +81,7 @@ int main(int argc, char **argv) if (vprepos >= 0) { vpre=args.at(vprepos); } - QStringList vprelist = vpre.replace("vpre=", "").split(","); + QStringList vprelist = vpre.replace("vpre=", "").split(','); if (vprelist.size() > 0) { args.replaceInStrings(QRegExp("^vpre=.*"), QString("vpre=").append(vprelist.at(0))); } diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index 50290cb1..1a0adfd0 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -351,7 +351,7 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset) x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; if (qAbs(pos.x() - x1) < maxOffset && qAbs(pos.y() - y1) < 10) { - setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + "]"); + setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + ']'); return i.key(); } else if (x1 > pos.x()) { break; diff --git a/src/archivewidget.cpp b/src/archivewidget.cpp index ef31b85b..4a99f759 100644 --- a/src/archivewidget.cpp +++ b/src/archivewidget.cpp @@ -197,7 +197,7 @@ ArchiveWidget::ArchiveWidget(QString projectName, QDomDocument doc, QList setText(0, files_list->topLevelItem(i)->text(0) + " " + i18np("(%1 item)", "(%1 items)", items)); + parentItem->setText(0, files_list->topLevelItem(i)->text(0) + ' ' + i18np("(%1 item)", "(%1 items)", items)); } } if (m_name.isEmpty()) m_name = i18n("Untitled"); @@ -356,7 +356,7 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, QStringList items QString filter = slideUrl.fileName(); QString ext = filter.section('.', -1); filter = filter.section('%', 0, -2); - QString regexp = "^" + filter + "\\d+\\." + ext + "$"; + QString regexp = '^' + filter + "\\d+\\." + ext + '$'; QRegExp rx(regexp); QStringList slideImages; QString directory = dir.absolutePath(); @@ -376,10 +376,10 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, QStringList items else if (filesList.contains(fileName)) { // we have 2 files with same name int ix = 0; - QString newFileName = fileName.section('.', 0, -2) + "_" + QString::number(ix) + "." + fileName.section('.', -1); + QString newFileName = fileName.section('.', 0, -2) + '_' + QString::number(ix) + '.' + fileName.section('.', -1); while (filesList.contains(newFileName)) { ix ++; - newFileName = fileName.section('.', 0, -2) + "_" + QString::number(ix) + "." + fileName.section('.', -1); + newFileName = fileName.section('.', 0, -2) + '_' + QString::number(ix) + '.' + fileName.section('.', -1); } fileName = newFileName; item->setData(0, Qt::UserRole, fileName); @@ -442,7 +442,7 @@ void ArchiveWidget::generateItems(QTreeWidgetItem *parentItem, QMap setCurrentItem(parentItem); parentItem->setExpanded(true); - destPath = parentItem->data(0, Qt::UserRole).toString() + "/"; + destPath = parentItem->data(0, Qt::UserRole).toString() + '/'; destUrl = KUrl(archive_url->url().path(KUrl::AddTrailingSlash) + destPath); QTreeWidgetItem *item; for (int j = 0; j < parentItem->childCount(); j++) { @@ -558,7 +558,7 @@ bool ArchiveWidget::slotStartArchiving(bool firstPass) // Special case: slideshows items++; if (isSlideshow) { - destPath += item->data(0, Qt::UserRole).toString() + "/"; + destPath += item->data(0, Qt::UserRole).toString() + '/'; destUrl = KUrl(archive_url->url().path(KUrl::AddTrailingSlash) + destPath); QStringList srcFiles = item->data(0, Qt::UserRole + 1).toStringList(); for (int k = 0; k < srcFiles.count(); k++) { @@ -689,7 +689,7 @@ bool ArchiveWidget::processProjectFile() KUrl src(item->text(0)); KUrl dest = destUrl; if (isSlideshow) { - dest = KUrl(destUrl.path(KUrl::AddTrailingSlash) + item->data(0, Qt::UserRole).toString() + "/" + src.fileName()); + dest = KUrl(destUrl.path(KUrl::AddTrailingSlash) + item->data(0, Qt::UserRole).toString() + '/' + src.fileName()); } else if (item->data(0, Qt::UserRole).isNull()) { dest.addPath(src.fileName()); @@ -703,7 +703,7 @@ bool ArchiveWidget::processProjectFile() } QDomElement mlt = m_doc.documentElement(); - QString root = mlt.attribute("root") + "/"; + QString root = mlt.attribute("root") + '/'; // Adjust global settings QString basePath; @@ -769,8 +769,8 @@ bool ArchiveWidget::processProjectFile() QString endString("\""); endString.append(basePath); playList.replace(startString, endString); - startString = ">" + archive_url->url().path(KUrl::RemoveTrailingSlash); - endString = ">" + basePath; + startString = '>' + archive_url->url().path(KUrl::RemoveTrailingSlash); + endString = '>' + basePath; playList.replace(startString, endString); } @@ -1005,7 +1005,7 @@ void ArchiveWidget::slotProxyOnly(int onlyProxy) itemsCount ++; } } - parentItem->setText(0, parentItem->text(0).section("(", 0, 0) + i18np("(%1 item)", "(%1 items)", itemsCount)); + parentItem->setText(0, parentItem->text(0).section('(', 0, 0) + i18np("(%1 item)", "(%1 items)", itemsCount)); } project_files->setText(i18np("%1 file to archive, requires %2", "%1 files to archive, requires %2", total, KIO::convertSize(m_requestedSize))); slotCheckSpace(); diff --git a/src/clipitem.cpp b/src/clipitem.cpp index e50ba6ea..317f7f71 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -823,7 +823,7 @@ void ClipItem::paint(QPainter *painter, else { #if KDE_IS_VERSION(4,5,0) if (m_clip && m_clip->thumbProducer()) { - QString path = m_clip->fileURL().path() + "_"; + QString path = m_clip->fileURL().path() + '_'; QImage img; QPen pen(Qt::white); pen.setStyle(Qt::DotLine); @@ -1539,14 +1539,14 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) needInOutSync = true; } if (e.attribute("type") == "simplekeyframe") { - QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + QStringList values = e.attribute("keyframes").split(';', QString::SkipEmptyParts); double factor = locale.toDouble(e.attribute("factor", "1")); double offset = e.attribute("offset", "0").toDouble(); if (factor != 1 || offset != 0) { for (int j = 0; j < values.count(); j++) { QString pos = values.at(j).section(':', 0, 0); double val = (locale.toDouble(values.at(j).section(':', 1, 1)) - offset) / factor; - values[j] = pos + "=" + locale.toString(val); + values[j] = pos + '=' + locale.toString(val); } } parameters.addParam(e.attribute("name"), values.join(";")); @@ -1797,18 +1797,18 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) newkfr.append(str); } else if (!added) { if (i == m_visibleParam) - newkfr.append(QString::number(pos) + ":" + QString::number(val)); + newkfr.append(QString::number(pos) + ':' + QString::number(val)); else - newkfr.append(QString::number(pos) + ":" + locale.toString(newval)); + newkfr.append(QString::number(pos) + ':' + locale.toString(newval)); if (kpos > pos) newkfr.append(str); added = true; } else newkfr.append(str); } if (!added) { if (i == m_visibleParam) - newkfr.append(QString::number(pos) + ":" + QString::number(val)); + newkfr.append(QString::number(pos) + ':' + QString::number(val)); else - newkfr.append(QString::number(pos) + ":" + e.attribute("default")); + newkfr.append(QString::number(pos) + ':' + e.attribute("default")); } e.setAttribute("keyframes", newkfr.join(";")); } @@ -1836,9 +1836,9 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double newpos = qMax(newpos, start); newpos = qMin(newpos, end); if (i == m_visibleParam) - newkfr.append(QString::number(newpos) + ":" + locale.toString(value)); + newkfr.append(QString::number(newpos) + ':' + locale.toString(value)); else - newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + newkfr.append(QString::number(newpos) + ':' + str.section(':', 1, 1)); } } e.setAttribute("keyframes", newkfr.join(";")); @@ -2059,9 +2059,9 @@ void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int w if (keyframe.contains('=')) { int pos = keyframe.section('=', 0, 0).toInt(); pos += offset; - data.append(QString::number(pos) + "=" + keyframe.section('=', 1) + ";"); + data.append(QString::number(pos) + '=' + keyframe.section('=', 1) + ";"); } - else data.append(keyframe + ";"); + else data.append(keyframe + ';'); } } Mlt::Geometry geometry(data.toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height); diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index edd2ddfb..13f4e5cf 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -531,7 +531,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, c KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo); const QHash metaInfoItems = metaInfo.items(); foreach(const KFileMetaInfoItem & metaInfoItem, metaInfoItems) { - prod.setAttribute("meta.attr." + metaInfoItem.name().section("#", 1), metaInfoItem.value().toString()); + prod.setAttribute("meta.attr." + metaInfoItem.name().section('#', 1), metaInfoItem.value().toString()); } } } else if (type->is("application/x-kdenlivetitle")) { diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index ed3c0371..ed52808b 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -518,7 +518,7 @@ ClipProperties::ClipProperties(QList cliplist, Timecode tc, QMap setFont(KGlobalSettings::toolBarFont()); m_view.setupUi(this); QString title = windowTitle(); - title.append(" " + i18np("(%1 clip)", "(%1 clips)", cliplist.count())); + title.append(' ' + i18np("(%1 clip)", "(%1 clips)", cliplist.count())); setWindowTitle(title); QMap props = cliplist.at(0)->properties(); m_old_props = commonproperties; @@ -1005,7 +1005,7 @@ void ClipProperties::parseFolder() QString filter = KUrl(m_view.clip_path->text()).fileName(); QString ext = filter.section('.', -1); filter = filter.section('%', 0, -2); - QString regexp = "^" + filter + "\\d+\\." + ext + "$"; + QString regexp = '^' + filter + "\\d+\\." + ext + '$'; QRegExp rx(regexp); QStringList entries; foreach(const QString & path, result) { diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp index fcae5095..6114707d 100644 --- a/src/clipstabilize.cpp +++ b/src/clipstabilize.cpp @@ -147,7 +147,7 @@ QStringList ClipStabilize::params() QHashIterator > it(m_ui_params); while (it.hasNext()){ it.next(); - filterparamsList << it.key() + "=" + it.value().value("value"); + filterparamsList << it.key() + '=' + it.value().value("value"); } params << filterparamsList.join(" "); @@ -256,7 +256,7 @@ void ClipStabilize::fillParameters(QStringList lst) m_ui_params.clear(); while (!lst.isEmpty()){ QString vallist=lst.takeFirst(); - QStringList cont=vallist.split(","); + QStringList cont=vallist.split(','); QString name=cont.takeFirst(); while (!cont.isEmpty()){ QString valname=cont.takeFirst(); diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp index fac4a040..59701aea 100644 --- a/src/cliptranscode.cpp +++ b/src/cliptranscode.cpp @@ -79,7 +79,7 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString ¶ms, const QStri QMapIterator i(profiles); while (i.hasNext()) { i.next(); - QStringList data = i.value().split(";"); + QStringList data = i.value().split(';'); profile_list->addItem(i.key(), data.at(0)); if (data.count() > 1) profile_list->setItemData(profile_list->count() - 1, data.at(1), Qt::UserRole + 1); } diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 17a7331d..82931894 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -5208,7 +5208,7 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const goMenu->clear(); double fps = m_document->fps(); 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 = 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())); } goMenu->setEnabled(!m_guides.isEmpty()); @@ -5754,7 +5754,7 @@ void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString def = e.attribute("default"); // Effect has a keyframe type parameter, we need to adjust the values - QStringList keys = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + QStringList keys = e.attribute("keyframes").split(';', QString::SkipEmptyParts); QStringList newKeyFrames; foreach(const QString &str, keys) { int pos = str.section(':', 0, 0).toInt(); @@ -7026,13 +7026,13 @@ void CustomTrackView::adjustEffectParameters(EffectsParameterList ¶meters, Q parameters.addParam("_sync_in_out", "1"); } if (e.attribute("type") == "simplekeyframe") { - QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + QStringList values = e.attribute("keyframes").split(';', QString::SkipEmptyParts); double factor = e.attribute("factor", "1").toDouble(); double offset = e.attribute("offset", "0").toDouble(); for (int j = 0; j < values.count(); j++) { QString pos = values.at(j).section(':', 0, 0); double val = (values.at(j).section(':', 1, 1).toDouble() - offset) / factor; - values[j] = pos + "=" + locale.toString(val); + values[j] = pos + '=' + locale.toString(val); } // kDebug() << "/ / / /SENDING KEYFR:" << values; parameters.addParam(paramname, values.join(";")); diff --git a/src/databackup/backupwidget.cpp b/src/databackup/backupwidget.cpp index 8b5bf96f..2b9fde7d 100644 --- a/src/databackup/backupwidget.cpp +++ b/src/databackup/backupwidget.cpp @@ -35,15 +35,15 @@ BackupWidget::BackupWidget(KUrl projectUrl, KUrl projectFolder, const QString &p if (projectUrl.isEmpty()) { // No url, means we opened the backup dialog from an empty project info_label->setText(i18n("Showing all backup files in folder")); - m_projectWildcard = "*"; + m_projectWildcard = '*'; } else { info_label->setText(i18n("Showing backup files for %1", projectUrl.fileName())); m_projectWildcard = projectUrl.fileName().section('.', 0, -2); - if (!projectId.isEmpty()) m_projectWildcard.append("-" + projectId); + if (!projectId.isEmpty()) m_projectWildcard.append('-' + projectId); else { // No project id, it was lost, add wildcard - m_projectWildcard.append("*"); + m_projectWildcard.append('*'); } } project_url->setUrl(projectFolder); @@ -85,9 +85,9 @@ void BackupWidget::slotParseBackupFiles() QString label; for (int i = 0; i < resultList.count(); i++) { label = resultList.at(i).lastModified().toString(Qt::SystemLocaleLongDate); - if (m_projectWildcard.startsWith("*")) { + if (m_projectWildcard.startsWith('*')) { // Displaying all backup files, so add project name in the entries - label.prepend(resultList.at(i).fileName().section("-", 0, -7) + ".kdenlive - "); + label.prepend(resultList.at(i).fileName().section('-', 0, -7) + ".kdenlive - "); } item = new QListWidgetItem(label, backup_list); item->setData(Qt::UserRole, resultList.at(i).absoluteFilePath()); diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index be5a321f..4694e175 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -66,7 +66,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin } if (xml.hasAttribute("cutzones")) { - QStringList cuts = xml.attribute("cutzones").split(";", QString::SkipEmptyParts); + QStringList cuts = xml.attribute("cutzones").split(';', QString::SkipEmptyParts); 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)); @@ -243,7 +243,7 @@ QDomElement DocClipBase::toXML(bool hideTemporaryProperties) const QMapIterator i(m_properties); while (i.hasNext()) { i.next(); - if (hideTemporaryProperties && i.key().startsWith("_")) continue; + if (hideTemporaryProperties && i.key().startsWith('_')) continue; if (!i.value().isEmpty()) clip.setAttribute(i.key(), i.value()); } doc.appendChild(clip); diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp index 5caafe00..8614eeab 100644 --- a/src/documentchecker.cpp +++ b/src/documentchecker.cpp @@ -103,7 +103,7 @@ bool DocumentChecker::hasErrorInClips() prodId = mltProd.attribute("id"); // Don't check slowmotion clips for now... (TODO?) if (prodId.startsWith("slowmotion")) continue; - if (prodId.contains("_")) prodId = prodId.section("_", 0, 0); + if (prodId.contains('_')) prodId = prodId.section('_', 0, 0); if (prodId != id) continue; if (mltDuration > 0 ) { // We have several MLT producers for the same clip (probably track producers) @@ -366,7 +366,7 @@ bool DocumentChecker::hasErrorInClips() if (property.attribute("name") == "resource") { QString resource = property.firstChild().nodeValue(); QString suffix; - if (slowmotion) suffix = "?" + resource.section('?', -1); + if (slowmotion) suffix = '?' + resource.section('?', -1); property.firstChild().setNodeValue(realPath + suffix); break; } @@ -799,7 +799,7 @@ void DocumentChecker::slotFixDuration() for (int j = 0; j < documentProducers.count(); j++) { QDomElement mltProd = documentProducers.at(j).toElement(); QString prodId = mltProd.attribute("id"); - if (prodId == id || prodId.startsWith(id + "_")) { + if (prodId == id || prodId.startsWith(id + '_')) { EffectsList::removeProperty(mltProd, "length"); } } diff --git a/src/dragvalue.cpp b/src/dragvalue.cpp index c76c636a..b85ad47e 100644 --- a/src/dragvalue.cpp +++ b/src/dragvalue.cpp @@ -361,7 +361,7 @@ CustomLabel::CustomLabel(const QString &label, bool showSlider, int range, QWidg //m_precision(pow(10, precision)), { setFont(KGlobalSettings::toolBarFont()); - setFormat(" " + label); + setFormat(' ' + label); setFocusPolicy(Qt::StrongFocus); setCursor(Qt::PointingHandCursor); setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum); @@ -370,7 +370,7 @@ CustomLabel::CustomLabel(const QString &label, bool showSlider, int range, QWidg setRange(0, range); QSize sh; const QFontMetrics &fm = fontMetrics(); - sh.setWidth(fm.width(" " + label + " ")); + sh.setWidth(fm.width(' ' + label + ' ')); setMaximumWidth(sh.width()); setObjectName("dragOnly"); } diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp index e4b0c076..60e5d3d1 100644 --- a/src/effectstack/collapsibleeffect.cpp +++ b/src/effectstack/collapsibleeffect.cpp @@ -81,7 +81,7 @@ CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_ef QDomElement namenode = m_effect.firstChildElement("name"); if (namenode.isNull()) return; QString effectname = i18n(namenode.text().toUtf8().data()); - if (m_regionEffect) effectname.append(":" + KUrl(EffectsList::parameter(m_effect, "resource")).fileName()); + if (m_regionEffect) effectname.append(':' + KUrl(EffectsList::parameter(m_effect, "resource")).fileName()); QHBoxLayout *l = static_cast (frame->layout()); title = new QLabel(this); diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp index 9e5ecbdc..82b228a4 100644 --- a/src/effectstack/parametercontainer.cpp +++ b/src/effectstack/parametercontainer.cpp @@ -163,7 +163,7 @@ ParameterContainer::ParameterContainer(QDomElement effect, ItemInfo info, Effect QStringList listitems = pa.attribute("paramlist").split(';'); if (listitems.count() == 1) { // probably custom effect created before change to ';' as separator - listitems = pa.attribute("paramlist").split(","); + listitems = pa.attribute("paramlist").split(','); } QDomElement list = pa.firstChildElement("paramlistdisplay"); QStringList listitemsdisplay; diff --git a/src/encodingprofilesdialog.cpp b/src/encodingprofilesdialog.cpp index 6a88d165..59116f74 100644 --- a/src/encodingprofilesdialog.cpp +++ b/src/encodingprofilesdialog.cpp @@ -102,7 +102,7 @@ void EncodingProfilesDialog::slotShowParams() profile_parameters->clear(); QListWidgetItem *item = profile_list->currentItem(); if (!item) return; - profile_parameters->setPlainText(item->data(Qt::UserRole).toString().section(";", 0, 0)); + profile_parameters->setPlainText(item->data(Qt::UserRole).toString().section(';', 0, 0)); } void EncodingProfilesDialog::slotDeleteProfile() @@ -136,11 +136,11 @@ void EncodingProfilesDialog::slotAddProfile() QListWidgetItem *item = profile_list->currentItem(); if (item) { QString data = item->data(Qt::UserRole).toString(); - pparams->setPlainText(data.section(";", 0, 0)); - pext->setText(data.section(";", 1, 1)); + pparams->setPlainText(data.section(';', 0, 0)); + pext->setText(data.section(';', 1, 1)); } if (d->exec() == QDialog::Accepted) { - m_configGroup->writeEntry(pname->text(), pparams->toPlainText() + ";" + pext->text()); + m_configGroup->writeEntry(pname->text(), pparams->toPlainText() + ';' + pext->text()); slotLoadProfiles(); } delete d; @@ -169,12 +169,12 @@ void EncodingProfilesDialog::slotEditProfile() if (item) { pname->setText(item->text()); QString data = item->data(Qt::UserRole).toString(); - pparams->setPlainText(data.section(";", 0, 0)); - pext->setText(data.section(";", 1, 1)); + pparams->setPlainText(data.section(';', 0, 0)); + pext->setText(data.section(';', 1, 1)); pparams->setFocus(); } if (d->exec() == QDialog::Accepted) { - m_configGroup->writeEntry(pname->text(), pparams->toPlainText() + ";" + pext->text()); + m_configGroup->writeEntry(pname->text(), pparams->toPlainText() + ';' + pext->text()); slotLoadProfiles(); } delete d; diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index b210a5bc..e5597b54 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -87,9 +87,9 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup bool success = false; // init default document properties - m_documentProperties["zoom"] = "7"; - m_documentProperties["verticalzoom"] = "1"; - m_documentProperties["zonein"] = "0"; + m_documentProperties["zoom"] = '7'; + m_documentProperties["verticalzoom"] = '1'; + m_documentProperties["zonein"] = '0'; m_documentProperties["zoneout"] = "100"; m_documentProperties["enableproxy"] = QString::number((int) KdenliveSettings::enableproxy()); m_documentProperties["proxyparams"] = KdenliveSettings::proxyparams(); @@ -769,7 +769,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene, const cleanupBackupFiles(); QFileInfo info(file); QString fileName = KUrl(path).fileName().section('.', 0, -2); - fileName.append("-" + m_documentProperties.value("documentid")); + fileName.append('-' + m_documentProperties.value("documentid")); fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm")); fileName.append(".kdenlive.png"); KUrl backupFile = m_projectFolder; @@ -1693,7 +1693,7 @@ void KdenliveDoc::backupLastSavedVersion(const QString &path) KIO::NetAccess::mkdir(backupFile, kapp->activeWindow()); QString fileName = KUrl(path).fileName().section('.', 0, -2); QFileInfo info(file); - fileName.append("-" + m_documentProperties.value("documentid")); + fileName.append('-' + m_documentProperties.value("documentid")); fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm")); fileName.append(".kdenlive"); backupFile.addPath(fileName); @@ -1713,7 +1713,7 @@ void KdenliveDoc::cleanupBackupFiles() backupFile.addPath(".backup/"); QDir dir(backupFile.path()); QString projectFile = url().fileName().section('.', 0, -2); - projectFile.append("-" + m_documentProperties.value("documentid")); + projectFile.append('-' + m_documentProperties.value("documentid")); projectFile.append("-??"); projectFile.append("??"); projectFile.append("-??"); diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index b91654ea..1b1bce53 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -437,7 +437,7 @@ void KdenliveSettingsDialog::slotReadAudioDevices() QStringList lines = result.split('\n'); foreach(const QString & data, lines) { //kDebug() << "// READING LINE: " << data; - if (!data.startsWith(" ") && data.count(':') > 1) { + if (!data.startsWith(' ') && data.count(':') > 1) { QString card = data.section(':', 0, 0).section(' ', -1); QString device = data.section(':', 1, 1).section(' ', -1); m_configSdl.kcfg_audio_device->addItem(data.section(':', -1).simplified(), "plughw:" + card + ',' + device); @@ -633,19 +633,19 @@ void KdenliveSettingsDialog::updateSettings() // Check encoding profiles QString data = m_configCapture.kcfg_v4l_profile->itemData(m_configCapture.kcfg_v4l_profile->currentIndex()).toString(); - if (!data.isEmpty() && (data.section(";", 0, 0) != KdenliveSettings::v4l_parameters() || data.section(";", 1, 1) != KdenliveSettings::v4l_extension())) { - KdenliveSettings::setV4l_parameters(data.section(";", 0, 0)); - KdenliveSettings::setV4l_extension(data.section(";", 1, 1)); + if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::v4l_parameters() || data.section(';', 1, 1) != KdenliveSettings::v4l_extension())) { + KdenliveSettings::setV4l_parameters(data.section(';', 0, 0)); + KdenliveSettings::setV4l_extension(data.section(';', 1, 1)); } data = m_configCapture.kcfg_decklink_profile->itemData(m_configCapture.kcfg_decklink_profile->currentIndex()).toString(); - if (!data.isEmpty() && (data.section(";", 0, 0) != KdenliveSettings::decklink_parameters() || data.section(";", 1, 1) != KdenliveSettings::decklink_extension())) { - KdenliveSettings::setDecklink_parameters(data.section(";", 0, 0)); - KdenliveSettings::setDecklink_extension(data.section(";", 1, 1)); + if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::decklink_parameters() || data.section(';', 1, 1) != KdenliveSettings::decklink_extension())) { + KdenliveSettings::setDecklink_parameters(data.section(';', 0, 0)); + KdenliveSettings::setDecklink_extension(data.section(';', 1, 1)); } data = m_configProject.kcfg_proxy_profile->itemData(m_configProject.kcfg_proxy_profile->currentIndex()).toString(); - if (!data.isEmpty() && (data.section(";", 0, 0) != KdenliveSettings::proxyparams() || data.section(";", 1, 1) != KdenliveSettings::proxyextension())) { - KdenliveSettings::setProxyparams(data.section(";", 0, 0)); - KdenliveSettings::setProxyextension(data.section(";", 1, 1)); + if (!data.isEmpty() && (data.section(';', 0, 0) != KdenliveSettings::proxyparams() || data.section(';', 1, 1) != KdenliveSettings::proxyextension())) { + KdenliveSettings::setProxyparams(data.section(';', 0, 0)); + KdenliveSettings::setProxyextension(data.section(';', 1, 1)); } @@ -800,7 +800,7 @@ void KdenliveSettingsDialog::slotAddTranscode() QListWidgetItem *item = new QListWidgetItem(m_configTranscode.profile_name->text()); QString data = m_configTranscode.profile_parameters->toPlainText(); data.append(" %1." + m_configTranscode.profile_extension->text()); - data.append(";"); + data.append(';'); if (!m_configTranscode.profile_description->text().isEmpty()) data.append(m_configTranscode.profile_description->text()); if (m_configTranscode.profile_audioonly->isChecked()) data.append(";audio"); @@ -818,7 +818,7 @@ void KdenliveSettingsDialog::slotUpdateTranscodingProfile() item->setText(m_configTranscode.profile_name->text()); QString data = m_configTranscode.profile_parameters->toPlainText(); data.append(" %1." + m_configTranscode.profile_extension->text()); - data.append(";"); + data.append(';'); if (!m_configTranscode.profile_description->text().isEmpty()) data.append(m_configTranscode.profile_description->text()); if (m_configTranscode.profile_audioonly->isChecked()) data.append(";audio"); @@ -908,19 +908,19 @@ void KdenliveSettingsDialog::slotUpdatev4lDevice() m_configCapture.kcfg_v4l_format->addItem(i18n("Current settings")); } - QStringList pixelformats = info.split(">", QString::SkipEmptyParts); + QStringList pixelformats = info.split('>', QString::SkipEmptyParts); QString itemSize; QString pixelFormat; QStringList itemRates; for (int i = 0; i < pixelformats.count(); i++) { QString format = pixelformats.at(i).section(':', 0, 0); - QStringList sizes = pixelformats.at(i).split(":", QString::SkipEmptyParts); + QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts); pixelFormat = sizes.takeFirst(); for (int j = 0; j < sizes.count(); j++) { - itemSize = sizes.at(j).section("=", 0, 0); - itemRates = sizes.at(j).section("=", 1, 1).split(",", QString::SkipEmptyParts); + itemSize = sizes.at(j).section('=', 0, 0); + itemRates = sizes.at(j).section('=', 1, 1).split(',', QString::SkipEmptyParts); for (int k = 0; k < itemRates.count(); k++) { - m_configCapture.kcfg_v4l_format->addItem("[" + format + "] " + itemSize + " (" + itemRates.at(k) + ")", QStringList() << format << itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1)); + m_configCapture.kcfg_v4l_format->addItem('[' + format + "] " + itemSize + " (" + itemRates.at(k) + ')', QStringList() << format << itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1)); } } } @@ -1060,7 +1060,7 @@ void KdenliveSettingsDialog::slotUpdateDecklinkProfile(int ix) else ix = m_configCapture.kcfg_decklink_profile->currentIndex(); QString data = m_configCapture.kcfg_decklink_profile->itemData(ix).toString(); if (data.isEmpty()) return; - m_configCapture.decklink_parameters->setPlainText(data.section(";", 0, 0)); + m_configCapture.decklink_parameters->setPlainText(data.section(';', 0, 0)); // } @@ -1070,7 +1070,7 @@ void KdenliveSettingsDialog::slotUpdateV4lProfile(int ix) else ix = m_configCapture.kcfg_v4l_profile->currentIndex(); QString data = m_configCapture.kcfg_v4l_profile->itemData(ix).toString(); if (data.isEmpty()) return; - m_configCapture.v4l_parameters->setPlainText(data.section(";", 0, 0)); + m_configCapture.v4l_parameters->setPlainText(data.section(';', 0, 0)); // } @@ -1080,7 +1080,7 @@ void KdenliveSettingsDialog::slotUpdateProxyProfile(int ix) else ix = m_configProject.kcfg_proxy_profile->currentIndex(); QString data = m_configProject.kcfg_proxy_profile->itemData(ix).toString(); if (data.isEmpty()) return; - m_configProject.proxyparams->setPlainText(data.section(";", 0, 0)); + m_configProject.proxyparams->setPlainText(data.section(';', 0, 0)); // } diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp index 0bb08a29..8014cd0e 100644 --- a/src/keyframeedit.cpp +++ b/src/keyframeedit.cpp @@ -126,7 +126,7 @@ void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe) doubleparam->setInTimelineProperty(true); } - QStringList frames = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + QStringList frames = e.attribute("keyframes").split(';', QString::SkipEmptyParts); for (int i = 0; i < frames.count(); i++) { int frame = frames.at(i).section(':', 0, 0).toInt(); bool found = false; diff --git a/src/kthumb.cpp b/src/kthumb.cpp index a87f654d..c5e16913 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -355,7 +355,7 @@ void KThumb::slotGetIntraThumbs() const int theight = KdenliveSettings::trackheight(); const int frameWidth = (int)(theight * m_ratio + 0.5); const int displayWidth = (int)(theight * m_dar + 0.5); - QString path = m_url.path() + "_"; + QString path = m_url.path() + '_'; bool addedThumbs = false; while (!m_intraFramesQueue.isEmpty()) { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f15afb17..b046c309 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -400,11 +400,11 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_loadLayout = new KSelectAction(i18n("Load Layout"), actionCollection()); for (int i = 1; i < 5; i++) { KAction *load = new KAction(KIcon(), i18n("Layout %1", i), this); - load->setData("_" + QString::number(i)); + load->setData('_' + QString::number(i)); layoutActions->addAction("load_layout" + QString::number(i), load); m_loadLayout->addAction(load); KAction *save = new KAction(KIcon(), i18n("Save As Layout %1", i), this); - save->setData("_" + QString::number(i)); + save->setData('_' + QString::number(i)); layoutActions->addAction("save_layout" + QString::number(i), save); } // Required to enable user to add the load layout action to toolbar @@ -1747,16 +1747,16 @@ void MainWindow::loadLayouts() foreach(const QString & key, entries) { if (key.endsWith(QString("_%1").arg(i))) { // Found previously saved layout - QString layoutName = key.section("_", 0, -2); + QString layoutName = key.section('_', 0, -2); for (int j = 0; j < loadActions.count(); j++) { - if (loadActions.at(j)->data().toString().endsWith("_" + QString::number(i))) { + if (loadActions.at(j)->data().toString().endsWith('_' + QString::number(i))) { loadActions[j]->setText(layoutName); loadActions[j]->setData(key); break; } } for (int j = 0; j < saveActions.count(); j++) { - if (saveActions.at(j)->data().toString().endsWith("_" + QString::number(i))) { + if (saveActions.at(j)->data().toString().endsWith('_' + QString::number(i))) { saveActions[j]->setText(i18n("Save as %1", layoutName)); saveActions[j]->setData(key); break; @@ -1790,7 +1790,7 @@ void MainWindow::slotSaveLayout(QAction *action) layouts.deleteEntry(originallayoutName); QByteArray st = saveState(); - layoutName.append("_" + QString::number(layoutId)); + layoutName.append('_' + QString::number(layoutId)); layouts.writeEntry(layoutName, st.toBase64()); loadLayouts(); } @@ -3678,7 +3678,7 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone, DocClipBase *baseClip QString tmppath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash); if (baseClip == NULL) tmppath.append("untitled.mlt"); else { - tmppath.append((baseClip->name().isEmpty() ? baseClip->fileURL().fileName() : baseClip->name()) + "-" + QString::number(zone.x()).rightJustified(4, '0') + ".mlt"); + tmppath.append((baseClip->name().isEmpty() ? baseClip->fileURL().fileName() : baseClip->name()) + '-' + QString::number(zone.x()).rightJustified(4, '0') + ".mlt"); } path = KUrl(tmppath); } @@ -3911,7 +3911,7 @@ void MainWindow::loadTranscoders() QMapIterator i(profiles); while (i.hasNext()) { i.next(); - QStringList data = i.value().split(";"); + QStringList data = i.value().split(';'); QAction *a; // separate audio transcoding in a separate menu if (data.count() > 2 && data.at(2) == "audio") { @@ -4106,12 +4106,12 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS QDomElement e = producers.item(n).toElement(); producerResource = EffectsList::property(e, "resource"); if (producerResource.isEmpty()) continue; - if (!producerResource.startsWith("/")) { - producerResource.prepend(root + "/"); + if (!producerResource.startsWith('/')) { + producerResource.prepend(root + '/'); } if (producerResource.contains('?')) { // slowmotion producer - suffix = "?" + producerResource.section('?', 1); + suffix = '?' + producerResource.section('?', 1); producerResource = producerResource.section('?', 0, 0); } else suffix.clear(); diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp index e93e5419..948e86e6 100644 --- a/src/mltdevicecapture.cpp +++ b/src/mltdevicecapture.cpp @@ -453,11 +453,11 @@ bool MltDeviceCapture::slotStartCapture(const QString ¶ms, const QString &pa renderProps->set("mlt_profile", m_activeProfile.toUtf8().constData()); - QStringList paramList = params.split(" ", QString::SkipEmptyParts); + QStringList paramList = params.split(' ', QString::SkipEmptyParts); char *tmp2; 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); + 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()); tmp2 = qstrdup(value.toUtf8().constData()); renderProps->set(tmp, tmp2); @@ -642,7 +642,7 @@ void MltDeviceCapture::setOverlayEffect(const QString &tag, QStringList paramete delete[] tmp; if (filter && filter->is_valid()) { for (int j = 0; j < parameters.count(); j++) { - filter->set(parameters.at(j).section("=", 0, 0).toUtf8().constData(), parameters.at(j).section("=", 1, 1).toUtf8().constData()); + filter->set(parameters.at(j).section('=', 0, 0).toUtf8().constData(), parameters.at(j).section('=', 1, 1).toUtf8().constData()); } trackService.attach(*filter); } diff --git a/src/parameterplotter.cpp b/src/parameterplotter.cpp index 21bf09b7..a34a3207 100644 --- a/src/parameterplotter.cpp +++ b/src/parameterplotter.cpp @@ -81,20 +81,20 @@ void ParameterPlotter::setPointLists(const QDomElement& d, const QString& paramN QDomElement pa = namenode.item(i).toElement(); QDomNode na = pa.firstChildElement("name"); - m_parameterNameList << pa.attribute("namedesc").split(";"); + m_parameterNameList << pa.attribute("namedesc").split(';'); emit parameterList(m_parameterNameList); //max_y=pa.attributes().namedItem("max").nodeValue().toInt(); //int val=pa.attributes().namedItem("value").nodeValue().toInt(); QStringList defaults; - if (pa.attribute("start").contains(";")) - defaults = pa.attribute("start").split(";"); - else if (pa.attribute("value").contains(";")) - defaults = pa.attribute("value").split(";"); - else if (pa.attribute("default").contains(";")) - defaults = pa.attribute("default").split(";"); - QStringList maxv = pa.attribute("max").split(";"); - QStringList minv = pa.attribute("min").split(";"); + if (pa.attribute("start").contains(';')) + defaults = pa.attribute("start").split(';'); + else if (pa.attribute("value").contains(';')) + defaults = pa.attribute("value").split(';'); + else if (pa.attribute("default").contains(';')) + 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++) { 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(); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 6c77cd7e..df1ac4f5 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -518,7 +518,7 @@ void ProjectList::editClipSelection(QList list) if (clip->getProperty("transparency").isEmpty() || clip->getProperty("transparency").toInt() == 0) { if (transparency == "-") { // first non transparent image - transparency = "0"; + transparency = '0'; } else if (transparency == "1") { // we have transparent and non transparent clips @@ -528,7 +528,7 @@ void ProjectList::editClipSelection(QList list) else { if (transparency == "-") { // first transparent image - transparency = "1"; + transparency = '1'; } else if (transparency == "0") { // we have transparent and non transparent clips @@ -1465,7 +1465,7 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item) DocClipBase *clip = parentItem->referencedClip(); if (!clip) return; int pos = item->zone().x(); - QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + "#" + QString::number(pos) + ".png"; + QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(pos) + ".png"; if (QFile::exists(cachedPixmap)) { QPixmap pix(cachedPixmap); if (pix.isNull()) { @@ -2145,7 +2145,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce if (clip->getProperty("proxy").isEmpty()) { KUrl proxyPath = m_doc->projectFolder(); proxyPath.addPath("proxy/"); - proxyPath.addPath(clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"))); + proxyPath.addPath(clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension"))); QMap newProps; // insert required duration for proxy if (t != IMAGE) newProps.insert("proxy_out", clip->producerProperty("out")); @@ -2708,7 +2708,7 @@ void ProjectList::slotCutClipJob(const QString &id, QPoint zone) if (!item|| item->referencedClip()->isPlaceHolder()) return; QString source = item->clipUrl().path(); QString ext = source.section('.', -1); - QString dest = source.section('.', 0, -2) + "_" + QString::number(zone.x()) + "." + ext; + QString dest = source.section('.', 0, -2) + '_' + QString::number(zone.x()) + '.' + ext; double clipFps = item->referencedClip()->getProperty("fps").toDouble(); if (clipFps == 0) clipFps = m_fps; @@ -2808,9 +2808,9 @@ void ProjectList::slotTranscodeClipJob(const QString &condition, QString params, d->adjustSize(); ui.button_more->setIcon(KIcon("configure")); ui.add_clip->setChecked(KdenliveSettings::add_clip_cut()); - ui.extra_params->setPlainText(params.simplified().section(" ", 0, -2)); + ui.extra_params->setPlainText(params.simplified().section(' ', 0, -2)); QString mess = desc; - mess.append(" " + i18np("(%1 clip)", "(%1 clips)", ids.count())); + mess.append(' ' + i18np("(%1 clip)", "(%1 clips)", ids.count())); ui.info_label->setText(mess); if (d->exec() != QDialog::Accepted) { delete d; @@ -2989,7 +2989,7 @@ void ProjectList::updateProxyConfig() QMap oldProps;// = clip->properties(); oldProps.insert("proxy", QString()); QMap newProps; - newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + "." + m_doc->getDocumentProperty("proxyextension")); + newProps.insert("proxy", proxydir + item->referencedClip()->getClipHash() + '.' + m_doc->getDocumentProperty("proxyextension")); new EditClipCommand(this, clip->getId(), oldProps, newProps, true, command); } } @@ -3093,7 +3093,7 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) //oldProps = clip->properties(); if (doProxy) { newProps.clear(); - QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); + QString path = proxydir + clip->getClipHash() + '.' + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); // insert required duration for proxy newProps.insert("proxy_out", clip->producerProperty("out")); newProps.insert("proxy", path); @@ -3409,10 +3409,10 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo ProjectItem *item = getItemById(id); if (!item) continue; if (ids.count() == 1) { - consumer += ":" + destination; + consumer += ':' + destination; } else { - consumer += ":" + destination + item->clipUrl().fileName() + ".mlt"; + consumer += ':' + destination + item->clipUrl().fileName() + ".mlt"; } preParams << consumer << jobParams; diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index ddc8d146..ba8aebfe 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -509,20 +509,20 @@ QStringList ProjectSettings::extractSlideshowUrls(KUrl url) filters << "*." + ext; dir.setNameFilters(filters); QStringList result = dir.entryList(QDir::Files); - urls.append(path + filters.at(0) + " (" + i18np("1 image found", "%1 images found", result.count()) + ")"); + urls.append(path + filters.at(0) + " (" + i18np("1 image found", "%1 images found", result.count()) + ')'); } else { // this is a pattern slideshow, like sequence%4d.jpg QString filter = url.fileName(); QString ext = filter.section('.', -1); filter = filter.section('%', 0, -2); - QString regexp = "^" + filter + "\\d+\\." + ext + "$"; + QString regexp = '^' + filter + "\\d+\\." + ext + '$'; QRegExp rx(regexp); int count = 0; QStringList result = dir.entryList(QDir::Files); foreach(const QString & path, result) { if (rx.exactMatch(path)) count++; } - urls.append(url.path() + " (" + i18np("1 image found", "%1 images found", count) + ")"); + urls.append(url.path() + " (" + i18np("1 image found", "%1 images found", count) + ')'); } return urls; } @@ -532,14 +532,14 @@ void ProjectSettings::slotExportToText() QString savePath = KFileDialog::getSaveFileName(project_folder->url(), "text/plain", this); if (savePath.isEmpty()) return; QString data; - data.append(i18n("Project folder: %1", project_folder->url().path()) + "\n"); - data.append(i18n("Project profile: %1", profiles_list->currentText()) + "\n"); + 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++) { if (files_list->topLevelItem(i)->childCount() > 0) { - data.append("\n" + files_list->topLevelItem(i)->text(0) + ":\n\n"); + data.append('\n' + files_list->topLevelItem(i)->text(0) + ":\n\n"); for (int j = 0; j < files_list->topLevelItem(i)->childCount(); j++) { - data.append(files_list->topLevelItem(i)->child(j)->text(0) + "\n"); + data.append(files_list->topLevelItem(i)->child(j)->text(0) + '\n'); } } } diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp index 14760724..27bc049e 100644 --- a/src/projecttree/meltjob.cpp +++ b/src/projecttree/meltjob.cpp @@ -44,7 +44,7 @@ MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters) : Ab m_params = parameters; description = i18n("Process clip"); QString consum = m_params.at(5); - if (consum.contains(":")) m_dest = consum.section(":", 1); + if (consum.contains(':')) m_dest = consum.section(':', 1); } void MeltJob::setProducer(Mlt::Producer *producer) @@ -66,7 +66,7 @@ void MeltJob::startJob() QString filterParams = m_params.takeFirst(); QString consumer = m_params.takeFirst(); kDebug()<<"consumer: "<setEnabled(false); m_playAction->setEnabled(true); capturefile = m_capturePath; - if (!capturefile.endsWith("/")) capturefile.append("/"); + if (!capturefile.endsWith('/')) capturefile.append('/'); capturename = KdenliveSettings::decklink_filename(); capturename.append("xxx."); capturename.append(KdenliveSettings::decklink_extension()); @@ -289,7 +289,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix) } else { // Show capture info capturefile = m_capturePath; - if (!capturefile.endsWith("/")) capturefile.append("/"); + if (!capturefile.endsWith('/')) capturefile.append('/'); capturename = KdenliveSettings::dvgrabfilename(); if (capturename.isEmpty()) capturename = "capture"; QString extension; @@ -450,7 +450,7 @@ void RecMonitor::slotStartPreview(bool play) QString path; MltVideoProfile profile; QString producer; - QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(" ", QString::SkipEmptyParts); + QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(' ', QString::SkipEmptyParts); int ix = device_selector->currentIndex(); videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC && ix != FIREWIRE); switch (ix) { @@ -704,7 +704,7 @@ void RecMonitor::slotRecord() m_captureArgs << "--channels" << QString::number(KdenliveSettings::rmd_audio_channels()); if (KdenliveSettings::rmd_use_jack()) { m_captureArgs << "--use-jack"; - QStringList ports = KdenliveSettings::rmd_jackports().split(" ", QString::SkipEmptyParts); + QStringList ports = KdenliveSettings::rmd_jackports().split(' ', QString::SkipEmptyParts); for (int i = 0; i < ports.count(); ++i) { m_captureArgs << ports.at(i); } @@ -858,7 +858,7 @@ void RecMonitor::manageCapturedFiles() QStringList filters; QString capturename = KdenliveSettings::dvgrabfilename(); if (capturename.isEmpty()) capturename = "capture"; - filters << capturename + "*" + extension; + filters << capturename + '*' + extension; const QStringList result = dir.entryList(filters, QDir::Files, QDir::Time); KUrl::List capturedFiles; foreach(const QString & name, result) { diff --git a/src/renderer.cpp b/src/renderer.cpp index 3f423aea..5effeb81 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -285,7 +285,7 @@ void Render::buildConsumer(const QString &profileName) Mlt::Producer *Render::invalidProducer(const QString &id) { Mlt::Producer *clip; - QString txt = "+" + i18n("Missing clip") + ".txt"; + QString txt = '+' + i18n("Missing clip") + ".txt"; char *tmp = qstrdup(txt.toUtf8().constData()); clip = new Mlt::Producer(*m_mltProfile, tmp); delete[] tmp; diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index f7df0ab4..0c5b1395 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -459,7 +459,7 @@ void RenderWidget::slotSaveProfile() if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom"); ui.group_name->setText(customGroup); - QStringList arguments = m_view.advanced_params->toPlainText().split(" ", QString::SkipEmptyParts); + QStringList arguments = m_view.advanced_params->toPlainText().split(' ', QString::SkipEmptyParts); ui.parameters->setText(arguments.join(" ")); ui.extension->setText(m_view.size_list->currentItem()->data(ExtensionRole).toString()); ui.profile_name->setFocus(); @@ -843,7 +843,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString extension = item->data(ExtensionRole).toString(); if (!dest.endsWith(extension, Qt::CaseInsensitive)) { if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) { - dest.append("." + extension); + dest.append('.' + extension); } } @@ -952,7 +952,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const renderArgs.append(subsize); } bool resizeProfile = (subsize != currentSize); - QStringList paramsList = renderArgs.split(" ", QString::SkipEmptyParts); + QStringList paramsList = renderArgs.split(' ', QString::SkipEmptyParts); QScriptEngine sEngine; sEngine.globalObject().setProperty("bitrate", m_view.comboBitrates->currentText()); diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp index 10ac5f34..dfdfc5c5 100644 --- a/src/scopes/audioscopes/audiospectrum.cpp +++ b/src/scopes/audioscopes/audiospectrum.cpp @@ -458,7 +458,7 @@ QImage AudioSpectrum::renderHUD(uint) davinci.drawRect(rect); davinci.drawText(textRect, QString( i18n("%1 dB", QString("%1").arg(db, 0, 'f', 2)) - + "\n" + + '\n' + i18n("%1 kHz", QString("%1").arg(freq/1000, 0, 'f', 2)))); } diff --git a/src/scopes/colorscopes/vectorscope.cpp b/src/scopes/colorscopes/vectorscope.cpp index 55437fff..76661338 100644 --- a/src/scopes/colorscopes/vectorscope.cpp +++ b/src/scopes/colorscopes/vectorscope.cpp @@ -506,7 +506,7 @@ void Vectorscope::slotGainChanged(int newval) { QLocale locale; m_gain = 1 + (float)newval/10; - ui->lblGain->setText(locale.toString(m_gain, 'f', 1) + "x"); + ui->lblGain->setText(locale.toString(m_gain, 'f', 1) + 'x'); forceUpdateScope(); } diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index e9cb4223..457af2e0 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -357,8 +357,8 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS gap++; } } - if (firstFrame > 0) extension = filter + "%" + QString::number(firstFrame).rightJustified(precision, '0', false) + "d" + ext; - else extension = filter + "%" + QString::number(precision) + "d" + ext; + if (firstFrame > 0) extension = filter + '%' + QString::number(firstFrame).rightJustified(precision, '0', false) + 'd' + ext; + else extension = filter + '%' + QString::number(precision) + 'd' + ext; } kDebug() << "// FOUND " << (*list).count() << " items for " << url.path(); return folder + extension; diff --git a/src/spacerdialog.cpp b/src/spacerdialog.cpp index 3cd4132e..2b21e019 100644 --- a/src/spacerdialog.cpp +++ b/src/spacerdialog.cpp @@ -39,7 +39,7 @@ SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, QList trackItems << i18n("All tracks"); for (int i = tracks.count() - 1; i >= 0; --i) { if (!tracks.at(i).trackName.isEmpty()) - trackItems << tracks.at(i).trackName + " (" + QString::number(i) + ")"; + trackItems << tracks.at(i).trackName + " (" + QString::number(i) + ')'; else trackItems << QString::number(i); } diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp index 8294c1e9..f03fbb94 100644 --- a/src/stopmotion/stopmotion.cpp +++ b/src/stopmotion/stopmotion.cpp @@ -439,7 +439,7 @@ void StopmotionWidget::parseExistingSequences() QStringList sequences = dir.entryList(filters, QDir::Files, QDir::Name); //kDebug()<<"PF: "<<<<", sm: "<addItem(sequencename.section("_", 0, -2)); + sequence_name->addItem(sequencename.section('_', 0, -2)); } } @@ -722,7 +722,7 @@ void StopmotionWidget::slotCreateThumbs(QImage img, int ix) QString StopmotionWidget::getPathForFrame(int ix, QString seqName) { if (seqName.isEmpty()) seqName = m_sequenceName; - return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + "_" + QString::number(ix).rightJustified(4, '0', false) + ".png"; + return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + '_' + QString::number(ix).rightJustified(4, '0', false) + ".png"; } void StopmotionWidget::slotShowFrame(const QString& path) diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 3c0f0670..b5073a24 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -2248,7 +2248,7 @@ void TitleWidget::slotAddEffect(int ix) * element, but do not add it to non-text elements. */ if (item->type() == TEXTITEM) { - QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value()); + QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value()); item->setData(100, effdata); } break; @@ -2281,7 +2281,7 @@ void TitleWidget::slotEditTypewriter(int /*ix*/) { QList l = graphicsView->scene()->selectedItems(); if (l.size() == 1) { - QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value()); + QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value()); l[0]->setData(100, effdata); } } diff --git a/src/trackdialog.cpp b/src/trackdialog.cpp index 0f4ffc01..b11b91a2 100644 --- a/src/trackdialog.cpp +++ b/src/trackdialog.cpp @@ -36,7 +36,7 @@ TrackDialog::TrackDialog(KdenliveDoc *doc, QWidget * parent) : for (int i = 0; i < doc->tracksCount(); ++i) { TrackInfo info = doc->trackInfoAt(doc->tracksCount() - i - 1); comboTracks->addItem(info.type == VIDEOTRACK ? videoIcon : audioIcon, - info.trackName.isEmpty() ? QString::number(i) : info.trackName + " (" + QString::number(i) + ")"); + info.trackName.isEmpty() ? QString::number(i) : info.trackName + " (" + QString::number(i) + ')'); } } diff --git a/src/trackview.cpp b/src/trackview.cpp index 9cda82de..af723ce5 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -641,7 +641,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod QString prodId = clip->getId(); if (clip->clipType() == PLAYLIST || clip->clipType() == AV || clip->clipType() == AUDIO) { // We need producer for the track - prodId.append("_" + QString::number(ix)); + prodId.append('_' + QString::number(ix)); } elem.setAttribute("producer", prodId); producerReplacementIds.insert(idString, prodId); @@ -671,7 +671,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod 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 + "_")) { + if (mltProdId == prodId || mltProdId.startsWith(prodId + '_')) { // Found parent producer, clone it QDomElement clone = prod.cloneNode().toElement(); clone.setAttribute("id", prodId); @@ -972,7 +972,7 @@ void TrackView::adjustparameterValue(QDomNodeList clipeffectparams, const QStrin QString fr = kfrs.at(l).section('=', 0, 0); double val = locale.toDouble(kfrs.at(l).section('=', 1, 1)); //kfrs[l] = fr + ":" + locale.toString((int)(val * fact)); - kfrs[l] = fr + ":" + QString::number((int) (offset + val * fact)); + kfrs[l] = fr + ':' + QString::number((int) (offset + val * fact)); } e.setAttribute("keyframes", kfrs.join(";")); } else if (type == "double" || type == "constant") { diff --git a/src/transition.cpp b/src/transition.cpp index 12519ea9..27f66cd6 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -377,7 +377,7 @@ bool Transition::updateKeyframes() } if (keyframes.isEmpty()) return false; int duration = cropDuration().frames(m_fps) - 1; - QStringList values = keyframes.split(";"); + QStringList values = keyframes.split(';'); int frame; int i = 0; foreach(const QString &pos, values) { diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 8946e8d4..6a6fe3b7 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -94,7 +94,7 @@ void TransitionSettings::updateTrackList() 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) + ")", + m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ')', m_tracks.count() - i); } transitionTrack->addItem(i18n("Black"), 0); diff --git a/src/unicodedialog.cpp b/src/unicodedialog.cpp index 51d462d6..7576c3b2 100644 --- a/src/unicodedialog.cpp +++ b/src/unicodedialog.cpp @@ -210,7 +210,7 @@ void UnicodeDialog::updateOverviewChars(uint unicode) for (i = 1; i <= 4; i++) { if (unicode > i && !controlCharacter(unicode - i)) { - left = " " + left; + left = ' ' + left; left = QChar(unicode - i) + left; } } @@ -218,7 +218,7 @@ void UnicodeDialog::updateOverviewChars(uint unicode) for (i = 1; i <= 8; i++) { if (unicode + i <= MAX_UNICODE_V1 && !controlCharacter(unicode + i)) { right += QChar(unicode + i); - right += " "; + right += ' '; } } diff --git a/src/utils/archiveorg.cpp b/src/utils/archiveorg.cpp index 86f9c7d1..7be89ab9 100644 --- a/src/utils/archiveorg.cpp +++ b/src/utils/archiveorg.cpp @@ -166,13 +166,13 @@ void ArchiveOrg::slotParseResults(KJob* job) QString href = links.at(i).toElement().attribute("href"); if (href.endsWith(".thumbs/")) { // sub folder contains image thumbs, display one. - m_thumbsPath = m_metaInfo.value("url") + "/" + href; + m_thumbsPath = m_metaInfo.value("url") + '/' + href; KJob* thumbJob = KIO::storedGet( KUrl(m_thumbsPath), KIO::NoReload, KIO::HideProgressInfo ); thumbJob->setProperty("id", m_metaInfo.value("id")); connect( thumbJob, SIGNAL( result( KJob* ) ), this, SLOT( slotParseThumbs( KJob* ) ) ); } else if (!href.contains('/') && !href.endsWith(".xml")) { - link = m_metaInfo.value("url") + "/" + href; + link = m_metaInfo.value("url") + '/' + href; ct++; if (ct %2 == 0) { html += ""; diff --git a/src/utils/openclipart.cpp b/src/utils/openclipart.cpp index a1202661..e106d22e 100644 --- a/src/utils/openclipart.cpp +++ b/src/utils/openclipart.cpp @@ -115,7 +115,7 @@ QString OpenClipArt::getDefaultDownloadName(QListWidgetItem *item) if (!item) return QString(); QString url = item->data(downloadRole).toString(); QString path = item->text(); - path.append("." + url.section('.', -1)); + path.append('.' + url.section('.', -1)); return path; } diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp index 0ef22871..002d3ec1 100644 --- a/src/utils/resourcewidget.cpp +++ b/src/utils/resourcewidget.cpp @@ -221,7 +221,7 @@ void ResourceWidget::slotSaveItem(const QString originalUrl) if (!path.endsWith('/')) path.append('/'); if (!originalUrl.isEmpty()) { path.append(KUrl(originalUrl).fileName()); - ext = "*." + KUrl(originalUrl).fileName().section(".", -1); + ext = "*." + KUrl(originalUrl).fileName().section('.', -1); m_currentInfo.itemDownload = originalUrl; } else { diff --git a/src/wizard.cpp b/src/wizard.cpp index f62ceffb..a0a0c71f 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -213,19 +213,19 @@ void Wizard::slotUpdateCaptureParameters() MltVideoProfile profileInfo = ProfilesDialog::getVideoProfile(vl4ProfilePath); m_capture.v4l_formats->addItem(i18n("Current settings (%1x%2, %3/%4fps)", profileInfo.width, profileInfo.height, profileInfo.frame_rate_num, profileInfo.frame_rate_den), QStringList() << QString("unknown") <", QString::SkipEmptyParts); + QStringList pixelformats = formats.split('>', QString::SkipEmptyParts); QString itemSize; QString pixelFormat; QStringList itemRates; for (int i = 0; i < pixelformats.count(); i++) { QString format = pixelformats.at(i).section(':', 0, 0); - QStringList sizes = pixelformats.at(i).split(":", QString::SkipEmptyParts); + QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts); pixelFormat = sizes.takeFirst(); for (int j = 0; j < sizes.count(); j++) { - itemSize = sizes.at(j).section("=", 0, 0); - itemRates = sizes.at(j).section("=", 1, 1).split(",", QString::SkipEmptyParts); + itemSize = sizes.at(j).section('=', 0, 0); + itemRates = sizes.at(j).section('=', 1, 1).split(',', QString::SkipEmptyParts); for (int k = 0; k < itemRates.count(); k++) { - QString formatDescription = "[" + format + "] " + itemSize + " (" + itemRates.at(k) + ")"; + QString formatDescription = '[' + format + "] " + itemSize + " (" + itemRates.at(k) + ')'; if (m_capture.v4l_formats->findText(formatDescription) == -1) m_capture.v4l_formats->addItem(formatDescription, QStringList() << format << itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1)); }