X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fsampleplugin%2Fsampleplugin.cpp;h=3c27a26d2344cd988cfddd16510dc33e88b13f7f;hb=7effb944762e06530bf3fb826c6dde064a27d436;hp=2acae56816123e81da31286cb33087e5a88bb961;hpb=5d4746e4c3e8665de83e6d281dcd08a46cd22c31;p=kdenlive

diff --git a/plugins/sampleplugin/sampleplugin.cpp b/plugins/sampleplugin/sampleplugin.cpp
index 2acae568..3c27a26d 100644
--- a/plugins/sampleplugin/sampleplugin.cpp
+++ b/plugins/sampleplugin/sampleplugin.cpp
@@ -31,8 +31,8 @@
 QStringList SamplePlugin::generators(const QStringList &producers) const
 {
     QStringList result;
-    if (producers.contains("pango")) result << i18n("Countdown");
-    if (producers.contains("noise")) result << i18n("Noise");
+    if (producers.contains(QLatin1String("pango"))) result << i18n("Countdown");
+    if (producers.contains(QLatin1String("noise"))) result << i18n("Noise");
     return result;
 }
 
@@ -41,13 +41,13 @@ KUrl SamplePlugin::generatedClip(const QString &renderer, const QString &generat
 {
     QString prePath;
     if (generator == i18n("Noise")) {
-        prePath = projectFolder.path() + "/noise";
-    } else prePath = projectFolder.path() + "/counter";
+        prePath = projectFolder.path() + QLatin1String("/noise");
+    } else prePath = projectFolder.path() + QLatin1String("/counter");
     int ct = 0;
-    QString counter = QString::number(ct).rightJustified(5, '0', false);
-    while (QFile::exists(prePath + counter + ".mlt")) {
+    QString counter = QString::number(ct).rightJustified(5, QLatin1Char('0'), false);
+    while (QFile::exists(prePath + counter + QLatin1String(".mlt"))) {
         ct++;
-        counter = QString::number(ct).rightJustified(5, '0', false);
+        counter = QString::number(ct).rightJustified(5, QLatin1Char('0'), false);
     }
     QPointer<QDialog> d = new QDialog;
     Ui::CountDown_UI view;
@@ -64,7 +64,7 @@ KUrl SamplePlugin::generatedClip(const QString &renderer, const QString &generat
     // Set single file mode. Default seems to be File::ExistingOnly.
     view.path->setMode(KFile::File);
 
-    QString clipFile = prePath + counter + ".mlt";
+    QString clipFile = prePath + counter + QLatin1String(".mlt");
     view.path->setUrl(KUrl(clipFile));
     KUrl result;
     
@@ -74,33 +74,33 @@ KUrl SamplePlugin::generatedClip(const QString &renderer, const QString &generat
         // Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU
 #if QT_VERSION >= 0x040600
         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-        env.insert("MLT_NO_VDPAU", "1");
+        env.insert(QLatin1String("MLT_NO_VDPAU"), QLatin1String("1"));
         generatorProcess.setProcessEnvironment(env);
 #else
         QStringList env = QProcess::systemEnvironment();
-        env << "MLT_NO_VDPAU=1";
+        env << QLatin1String("MLT_NO_VDPAU=1");
         generatorProcess.setEnvironment(env);
 #endif
         QStringList args;
         if (generator == i18n("Noise")) {
-            args << "noise:" << "in=0" << QString("out=" + QString::number((int) fps * view.duration->value()));
+            args << QLatin1String("noise:") << QLatin1String("in=0") << QLatin1String("out=") + QString::number((int) fps * view.duration->value());
         }
         else {
             // Countdown producer
             for (int i = 0; i < view.duration->value(); i++) {
                 // Create the producers
-                args << "pango:" << "in=0" << QString("out=" + QString::number((int) fps * view.duration->value()));
-                args << QString("text=" + QString::number(view.duration->value() - i));
-                args << QString("font=" + QString::number(view.font->value()) + "px");
+                args << QLatin1String("pango:") << QLatin1String("in=0") << QLatin1String("out=") + QString::number((int) fps * view.duration->value());
+                args << QLatin1String("text=") + QString::number(view.duration->value() - i);
+                args << QLatin1String("font=") + QString::number(view.font->value()) + QLatin1String("px");
             }
         }
 
-        args << "-consumer"<<QString("xml:%1").arg(view.path->url().path());
+        args << QLatin1String("-consumer")<<QString::fromLatin1("xml:%1").arg(view.path->url().path());
         generatorProcess.start(renderer, args);
         if (generatorProcess.waitForFinished()) {
             if (generatorProcess.exitStatus() == QProcess::CrashExit) {
                 kDebug() << "/// Generator failed: ";
-                QString error = generatorProcess.readAllStandardError();
+                QString error = QString::fromLocal8Bit(generatorProcess.readAllStandardError());
                 KMessageBox::sorry(kapp->activeWindow(), i18n("Failed to generate clip:\n%1", error, i18n("Generator Failed")));
             }
             else {
@@ -108,7 +108,7 @@ KUrl SamplePlugin::generatedClip(const QString &renderer, const QString &generat
             }
         } else {
             kDebug() << "/// Generator failed: ";
-            QString error = generatorProcess.readAllStandardError();
+            QString error = QString::fromLocal8Bit(generatorProcess.readAllStandardError());
             KMessageBox::sorry(kapp->activeWindow(), i18n("Failed to generate clip:\n%1", error, i18n("Generator Failed")));
         }
     }