[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src: Add more QStringLiteral
From: Montel Laurent <null () kde ! org>
Date: 2017-02-28 20:18:45
Message-ID: E1cioEP-0007fe-EH () code ! kde ! org
[Download RAW message or body]
Git commit 14ff0d088e0dc8e3206e52a48e27d12e3d56015c by Montel Laurent.
Committed on 28/02/2017 at 20:18.
Pushed by mlaurent into branch 'master'.
Add more QStringLiteral
M +1 -1 src/dialogs/renderwidget.cpp
M +4 -2 src/dvdwizard/dvdwizard.cpp
M +2 -2 src/dvdwizard/dvdwizardvob.cpp
M +1 -1 src/effectstack/collapsibleeffect.cpp
M +2 -2 src/mltcontroller/clippropertiescontroller.cpp
M +1 -1 src/titler/titlewidget.cpp
M +1 -2 src/utils/archiveorg.cpp
M +2 -2 src/utils/freesound.cpp
M +2 -1 src/utils/resourcewidget.cpp
https://commits.kde.org/kdenlive/14ff0d088e0dc8e3206e52a48e27d12e3d56015c
diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index 850fc71ac..4c211b4db 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -971,7 +971,7 @@ void RenderWidget::slotPrepareExport(bool scriptExport, const \
QString &scriptPat }
QString chapterFile;
if (m_view.create_chapter->isChecked()) {
- chapterFile = m_view.out_file->url().toLocalFile() + ".dvdchapter";
+ chapterFile = m_view.out_file->url().toLocalFile() + \
QStringLiteral(".dvdchapter"); }
// mantisbt 1051
diff --git a/src/dvdwizard/dvdwizard.cpp b/src/dvdwizard/dvdwizard.cpp
index a1845271b..aaf264912 100644
--- a/src/dvdwizard/dvdwizard.cpp
+++ b/src/dvdwizard/dvdwizard.cpp
@@ -181,7 +181,7 @@ void DvdWizard::slotPageChanged(int page)
void DvdWizard::generateDvd()
{
m_isoMessage->animatedHide();
- QDir dir(m_status.tmp_folder->url().toLocalFile() + "DVD/");
+ QDir dir(m_status.tmp_folder->url().toLocalFile() + QStringLiteral("DVD/"));
if (!dir.exists()) {
dir.mkpath(dir.absolutePath());
}
@@ -870,7 +870,9 @@ void DvdWizard::slotIsoFinished(int exitCode, \
QProcess::ExitStatus status) //qCDebug(KDENLIVE_LOG) << m_creationLog;
infoMessage(i18n("DVD ISO image %1 successfully created.", \
m_status.iso_image->url().toLocalFile()));
- m_status.error_log->append("<a name=\"result\" /><strong>" + i18n("DVD ISO image \
%1 successfully created.", m_status.iso_image->url().toLocalFile()) + "</strong>"); + \
m_status.error_log->append(QStringLiteral("<a name=\"result\" /><strong>") + \
+ i18n("DVD ISO image %1 successfully created.", \
m_status.iso_image->url().toLocalFile()) + + \
QStringLiteral("</strong>")); \
m_status.error_log->scrollToAnchor(QStringLiteral("result")); \
m_status.button_preview->setEnabled(true); m_status.button_burn->setEnabled(true);
diff --git a/src/dvdwizard/dvdwizardvob.cpp b/src/dvdwizard/dvdwizardvob.cpp
index 0fa72b3c5..b8b2ec628 100644
--- a/src/dvdwizard/dvdwizardvob.cpp
+++ b/src/dvdwizard/dvdwizardvob.cpp
@@ -367,9 +367,9 @@ void DvdWizardVob::slotAddVobFile(const QUrl &url, const QString \
&chapters, bool
if (chapters.isEmpty() == false) {
item->setData(1, Qt::UserRole + 1, chapters);
- } else if (QFile::exists(url.toLocalFile() + ".dvdchapter")) {
+ } else if (QFile::exists(url.toLocalFile() + QStringLiteral(".dvdchapter"))) {
// insert chapters as children
- QFile file(url.toLocalFile() + ".dvdchapter");
+ QFile file(url.toLocalFile() + QStringLiteral(".dvdchapter"));
if (file.open(QIODevice::ReadOnly)) {
QDomDocument doc;
if (doc.setContent(&file) == false) {
diff --git a/src/effectstack/collapsibleeffect.cpp \
b/src/effectstack/collapsibleeffect.cpp index decbc993d..b667d565c 100644
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -213,7 +213,7 @@ void CollapsibleEffect::slotCreateGroup()
void CollapsibleEffect::slotCreateRegion()
{
QString allExtensions = ClipCreationDialog::getExtensions().join(QLatin1Char(' \
'));
- const QString dialogFilter = allExtensions + QLatin1Char(' ') + QLatin1Char('|') \
+ i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files"); + \
const QString dialogFilter = allExtensions + QLatin1Char(' ') + QLatin1Char('|') + \
i18n("All Supported Files") + QStringLiteral("\n* ") + QLatin1Char('|') + i18n("All \
Files");
QString clipFolder = KRecentDirs::dir(QStringLiteral(":KdenliveClipFolder"));
if (clipFolder.isEmpty()) {
clipFolder = QDir::homePath();
diff --git a/src/mltcontroller/clippropertiescontroller.cpp \
b/src/mltcontroller/clippropertiescontroller.cpp index 604a30a01..5f805ebd1 100644
--- a/src/mltcontroller/clippropertiescontroller.cpp
+++ b/src/mltcontroller/clippropertiescontroller.cpp
@@ -763,7 +763,7 @@ void ClipPropertiesController::fillProperties()
if (m_type == Image) {
int width = m_controller->int_property(QStringLiteral("meta.media.width"));
int height = \
m_controller->int_property(QStringLiteral("meta.media.height"));
- propertyMap.append(QStringList() << i18n("Image size") << \
QString::number(width) + "x" + QString::number(height)); + \
propertyMap.append(QStringList() << i18n("Image size") << QString::number(width) + \
QLatin1Char('x') + QString::number(height)); }
if (m_type == AV || m_type == Video || m_type == Audio) {
int vindex = m_controller->int_property(QStringLiteral("video_index"));
@@ -797,7 +797,7 @@ void ClipPropertiesController::fillProperties()
}
int width = \
m_controller->int_property(QStringLiteral("meta.media.width"));
int height = \
m_controller->int_property(QStringLiteral("meta.media.height"));
- propertyMap.append(QStringList() << i18n("Frame size") << \
QString::number(width) + "x" + QString::number(height)); + \
propertyMap.append(QStringList() << i18n("Frame size") << QString::number(width) + \
QLatin1Char('x') + QString::number(height));
snprintf(property, sizeof(property), "meta.media.%d.stream.frame_rate", \
vindex); QString fpsValue = m_controller->property(property);
diff --git a/src/titler/titlewidget.cpp b/src/titler/titlewidget.cpp
index 38be39655..386cf33ea 100644
--- a/src/titler/titlewidget.cpp
+++ b/src/titler/titlewidget.cpp
@@ -737,7 +737,7 @@ void TitleWidget::slotImageTool()
QStringList mimeTypeFilters;
QString allExtensions = i18n("All Images") + QStringLiteral(" (");
foreach (const QByteArray &mimeType, supported) {
- mimeTypeFilters.append(i18n("%1 Image", QString(mimeType)) + "( *." + \
QString(mimeType) + QLatin1Char(')')); + mimeTypeFilters.append(i18n("%1 \
Image", QString(mimeType)) + QStringLiteral("( *.") + QString(mimeType) + \
QLatin1Char(')')); allExtensions.append("*." + mimeType + QLatin1Char(' '));
}
mimeTypeFilters.sort();
diff --git a/src/utils/archiveorg.cpp b/src/utils/archiveorg.cpp
index 53be47ea0..bcdbbd7b5 100644
--- a/src/utils/archiveorg.cpp
+++ b/src/utils/archiveorg.cpp
@@ -249,7 +249,7 @@ void ArchiveOrg::slotParseResults(KJob *job)
if (format != QLatin1String("Animated GIF") && format != \
QLatin1String("Metadata") && format != QLatin1String("Archive BitTorrent") && format \
!= QLatin1String("Thumbnail") && format != QLatin1String("JSON") && format != \
QLatin1String("JPEG") && format != QLatin1String("JPEG Thumb") && format != \
QLatin1String("PNG") && format != QLatin1String("Video Index")) { // the a href url \
has the tag _import added at the end. This tag is removed by \
ResourceWidget::slotOpenLink before being used to download the file
- html += "<tr><td>" + format + QStringLiteral(" (") + \
fileSize + "kb " + minsLong + "min) " + QStringLiteral("</td><td><a \
href=\"%1\">%2</a></td></tr>").arg(sDownloadUrl + "_import", i18n("Import")); + \
html += QStringLiteral("<tr><td>") + format + QStringLiteral(" (") + fileSize + "kb " \
+ minsLong + "min) " + QStringLiteral("</td><td><a \
href=\"%1\">%2</a></td></tr>").arg(sDownloadUrl + "_import", i18n("Import")); }
//if (format==QLatin1String("Animated GIF"))// widget does \
not run through the frames of the animated gif
if (format == QLatin1String("Thumbnail") && \
!bThumbNailFound) { @@ -260,7 +260,6 @@ void ArchiveOrg::slotParseResults(KJob *job)
emit gotThumb(sThumbUrl);
}
if (format == QLatin1String("Animated GIF")) //
-
{
sPreviewUrl = "https://archive.org/download/" + \
m_metaInfo.value(QStringLiteral("id")) + j.key();
m_metaInfo.insert(QStringLiteral("preview"), \
sPreviewUrl);
diff --git a/src/utils/freesound.cpp b/src/utils/freesound.cpp
index ff95a0db1..d5edbc8e0 100644
--- a/src/utils/freesound.cpp
+++ b/src/utils/freesound.cpp
@@ -123,9 +123,9 @@ void FreeSound::slotShowResults(KJob *job)
QVariant authorInfo = \
soundmap.value(QStringLiteral("username"));
item->setData(authorRole, authorInfo);
- item->setData(authorUrl, \
"http://freesound.org/people/" + \
soundmap.value(QStringLiteral("username")).toString()); + \
item->setData(authorUrl, QStringLiteral("http://freesound.org/people/") + \
soundmap.value(QStringLiteral("username")).toString());
item->setData(licenseRole, \
soundmap.value(QStringLiteral("license")));
- item->setData(infoData, \
"http://www.freesound.org/apiv2/sounds/" + vid.toString() + "/?format=json&token=" + \
OAuth2_strClientSecret); + item->setData(infoData, \
QStringLiteral("http://www.freesound.org/apiv2/sounds/") + vid.toString() + \
QStringLiteral("/?format=json&token=") + OAuth2_strClientSecret); }
}
}
diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index 12a285a3f..42aeb9fde 100644
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -455,7 +455,8 @@ void ResourceWidget::slotFreesoundUseHQPreview()
mSaveLocation = mSaveLocation + QStringLiteral(".mp3"); // HQ previews are .mp3 \
files - so append this to file name previously chosen
if (QFile::exists(mSaveLocation)) { // check that this newly created file name \
file does not already exist int ret = QMessageBox::warning(this, i18n("File \
Exists"),
- i18n("HQ preview files are all mp3 files. We \
have added .mp3 as a file extension to the destination file name you chose. However, \
there is an existing file of this name present. \n Do you want to overwrite the \
existing file?. ") + "\n" + mSaveLocation, + \
i18n("HQ preview files are all mp3 files. We have added .mp3 as a file extension to \
the destination file name you chose. However, there is an existing file of this name \
present. \n Do you want to overwrite the existing file?. ") + \
+ QStringLiteral("\n") + mSaveLocation,
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No);
if (ret == QMessageBox::No) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic