[PATCH by Ray Lehtiniemi] Do not return references to temporaries.

[kdenlive] / src / wizard.cpp

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 7cdefed7438259649974c23ec6dfb13fd1ff92ea..c858906ce92a998aa6115fcea4b2f1cc9b71fce3 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -17,20 +17,19 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QLabel>
-#include <QFile>
-#include <QXmlStreamWriter>
-#include <QApplication>
-#include <QTimer>
+#include "wizard.h"
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
 
 #include <KStandardDirs>
 #include <KLocale>
 #include <KProcess>
 #include <kmimetype.h>
 
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "wizard.h"
+#include <QLabel>
+#include <QFile>
+#include <QXmlStreamWriter>
+#include <QTimer>
 
 Wizard::Wizard(QWidget *parent): QWizard(parent) {
     setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png")));
@@ -143,6 +142,7 @@ void Wizard::checkMltComponents() {
             avformatItem->setIcon(0, okIcon);
             // Make sure we have MLT > 0.3.4
             bool recentMlt = false;
+            int version = 0;
             QString exepath = KStandardDirs::findExe("pkg-config");
             if (!exepath.isEmpty()) {
                 checkProcess.start(exepath, QStringList() << "--variable=version" << "mlt-framework");
@@ -151,20 +151,21 @@ void Wizard::checkMltComponents() {
                 } else {
                     checkProcess.waitForFinished();
                     QString mltVersion = checkProcess.readAllStandardOutput();
-                    int version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt();
+                    version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt();
                     kDebug() << "// FOUND MLT's pkgconfig version: " << version;
                     if (version > 34) recentMlt = true;
                 }
-            } else {
+            }
+            if (version == 0) {
                 checkProcess.start(KdenliveSettings::rendererpath(), QStringList() << "--version");
                 if (!checkProcess.waitForStarted()) {
                     kDebug() << "// Error querying MLT's version";
                 } else {
                     checkProcess.waitForFinished();
                     QString mltVersion = checkProcess.readAllStandardError();
-                    mltVersion = mltVersion.section("\n", 0, 0).simplified();
+                    mltVersion = mltVersion.section('\n', 0, 0).simplified();
                     mltVersion = mltVersion.section(' ', -1).simplified();
-                    int version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt();
+                    version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt();
                     kDebug() << "// FOUND MLT version: " << version;
                     if (version > 34) recentMlt = true;
                 }
@@ -182,7 +183,7 @@ void Wizard::checkMltComponents() {
                     QByteArray codecList = checkProcess2.readAllStandardError();
                     QString acodecList(codecList);
                     QStringList result;
-                    QStringList alist = acodecList.split("\n", QString::SkipEmptyParts);
+                    QStringList alist = acodecList.split('\n', QString::SkipEmptyParts);
                     for (int i = 0; i < alist.count(); i++) {
                         if (alist.at(i).contains("- ")) result.append(alist.at(i).section("- ", 1).simplified().toLower());
                     }
@@ -199,7 +200,7 @@ void Wizard::checkMltComponents() {
                     QByteArray codecList = checkProcess2.readAllStandardError();
                     QString vcodecList(codecList);
                     QStringList result;
-                    QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts);
+                    QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts);
                     for (int i = 0; i < vlist.count(); i++) {
                         if (vlist.at(i).contains("- ")) result.append(vlist.at(i).section("- ", 1).simplified().toLower());
                     }
@@ -216,7 +217,7 @@ void Wizard::checkMltComponents() {
                     QByteArray codecList = checkProcess2.readAllStandardError();
                     QString vcodecList(codecList);
                     QStringList result;
-                    QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts);
+                    QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts);
                     for (int i = 0; i < vlist.count(); i++) {
                         if (vlist.at(i).contains("- ")) {
                             QString format = vlist.at(i).section("- ", 1).simplified().toLower();
@@ -454,12 +455,12 @@ void Wizard::slotCheckMlt() {
     QProcess checkProcess2;
     checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "consumer");
     if (!checkProcess2.waitForStarted())
-        errorMessage.append(i18n("Error starting MLT's command line player (inigo).") + "\n");
+        errorMessage.append(i18n("Error starting MLT's command line player (inigo).") + '\n');
 
     checkProcess2.waitForFinished();
 
     QByteArray result = checkProcess2.readAllStandardError();
-    if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + "\n");
+    if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n');
 
     if (!errorMessage.isEmpty()) {
         errorMessage.prepend(QString("<b>%1</b><br>").arg(i18n("Fatal Error")));