Qt 5.15 deprecated the QProcess::start(cmdline) function.

Convert to existing alternative QProcess::start(cmd, arglist) function.
MythTV · Jun 19, 2020 · b50234e · b50234e
1 parent f4eddb8
commit b50234e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -6958,8 +6958,9 @@ void MainServer::HandleMusicGetLyricGrabbers(const QStringList &/*slist*/, Playb
     // query the grabbers to get their name
     for (int x = 0; x < scripts.count(); x++)
     {
+        QStringList args { scripts.at(x), "-v" };
         QProcess p;
-        p.start(QString("%1 %2 -v").arg(PYTHON_EXE).arg(scripts.at(x)));
+        p.start(PYTHON_EXE, args);
         p.waitForFinished(-1);
         QString result = p.readAllStandardOutput();
 

diff --git a/mythtv/programs/mythexternrecorder/MythExternRecApp.cpp b/mythtv/programs/mythexternrecorder/MythExternRecApp.cpp
@@ -271,13 +271,14 @@ Q_SLOT void MythExternRecApp::Cleanup(void)
     if (m_cleanup.isEmpty())
         return;
 
-    QString cmd = m_cleanup;
+    QStringList args = m_cleanup.split(QRegularExpression("\\s+"));
+    QString cmd = args.takeFirst();
 
     LOG(VB_RECORD, LOG_WARNING, LOC +
         QString(" Beginning cleanup: '%1'").arg(cmd));
 
     QProcess cleanup;
-    cleanup.start(cmd);
+    cleanup.start(cmd, args);
     if (!cleanup.waitForStarted())
     {
         LOG(VB_RECORD, LOG_ERR, LOC + ": Failed to start cleanup process: "
@@ -302,14 +303,15 @@ Q_SLOT void MythExternRecApp::DataStarted(void)
     if (m_onDataStart.isEmpty())
         return;
 
-    QString cmd = m_onDataStart;
+    QStringList args = m_onDataStart.split(QRegularExpression("\\s+"));
+    QString cmd = args.takeFirst();
     cmd.replace("%CHANNUM%", m_tunedChannel);
 
     LOG(VB_RECORD, LOG_INFO, LOC +
         QString(" Data started, finishing tune: '%1'").arg(cmd));
 
     QProcess finish;
-    finish.start(cmd);
+    finish.start(cmd, args);
     if (!finish.waitForStarted())
     {
         LOG(VB_RECORD, LOG_ERR, LOC + ": Failed to finish tune process: "
@@ -340,11 +342,12 @@ Q_SLOT void MythExternRecApp::LoadChannels(const QString & serial)
 
     if (!m_scanCommand.isEmpty())
     {
-        QString cmd = m_scanCommand;
+        QStringList args = m_scanCommand.split(QRegularExpression("\\s+"));
+        QString cmd = args.takeFirst();
         cmd.replace("%CHANCONF%", m_channelsIni);
 
         QProcess scanner;
-        scanner.start(cmd);
+        scanner.start(cmd, args);
 
         if (!scanner.waitForStarted())
         {
@@ -454,14 +457,15 @@ Q_SLOT void MythExternRecApp::NextChannel(const QString & serial)
 
 void MythExternRecApp::NewEpisodeStarting(const QString & channum)
 {
-    QString cmd = m_newEpisodeCommand;
+    QStringList args = m_newEpisodeCommand.split(QRegularExpression("\\s+"));
+    QString cmd = args.takeFirst();
     cmd.replace("%CHANNUM%", channum);
 
     LOG(VB_RECORD, LOG_WARNING, LOC +
         QString(" New episode starting on current channel: '%1'").arg(cmd));
 
     QProcess proc;
-    proc.start(cmd);
+    proc.start(cmd, args);
     if (!proc.waitForStarted())
     {
         LOG(VB_RECORD, LOG_ERR, LOC +
@@ -568,8 +572,10 @@ Q_SLOT void MythExternRecApp::TuneChannel(const QString & serial,
 
     if (!m_tuneCommand.isEmpty())
     {
+        QStringList args = tunecmd.split(QRegularExpression("\\s+"));
+        QString cmd = args.takeFirst();
         m_tuningChannel = channum;
-        m_tuneProc.start(tunecmd);
+        m_tuneProc.start(cmd, args);
         if (!m_tuneProc.waitForStarted())
         {
             QString errmsg = QString("Tune `%1` failed: ").arg(tunecmd) + ENO;
@@ -684,7 +690,9 @@ Q_SLOT void MythExternRecApp::StartStreaming(const QString & serial)
         return;
     }
 
-    m_proc.start(m_command, QIODevice::ReadOnly|QIODevice::Unbuffered);
+    QStringList args = m_command.split(QRegularExpression("\\s+"));
+    QString cmd = args.takeFirst();
+    m_proc.start(cmd, args, QIODevice::ReadOnly|QIODevice::Unbuffered);
     m_proc.setTextModeEnabled(false);
     m_proc.setReadChannel(QProcess::StandardOutput);
 

diff --git a/mythtv/programs/mythutil/musicmetautils.cpp b/mythtv/programs/mythutil/musicmetautils.cpp
@@ -491,8 +491,9 @@ static int FindLyrics(const MythUtilCommandLineParser &cmdline)
     // query the grabbers to get their priority
     for (int x = 0; x < scripts.count(); x++)
     {
+        QStringList args { scripts.at(x), "-v" };
         QProcess p;
-        p.start(QString("%1 %2 -v").arg(PYTHON_EXE).arg(scripts.at(x)));
+        p.start(PYTHON_EXE, args);
         p.waitForFinished(-1);
         QString result = p.readAllStandardOutput();
 
@@ -536,8 +537,12 @@ static int FindLyrics(const MythUtilCommandLineParser &cmdline)
         gCoreContext->SendMessage(QString("MUSIC_LYRICS_STATUS %1 %2").arg(songID).arg(statusMessage));
 
         QProcess p;
-        p.start(QString(R"(%1 %2 --artist="%3" --album="%4" --title="%5" --filename="%6")")
-                        .arg(PYTHON_EXE).arg(grabber.m_filename).arg(artist).arg(album).arg(title).arg(filename));
+        QStringList args { grabber.m_filename,
+                           QString(R"(--artist="%1")").arg(artist),
+                           QString(R"(--album="%1")").arg(album),
+                           QString(R"(--title="%1")").arg(title),
+                           QString(R"(--filename="%1")").arg(filename) };
+        p.start(PYTHON_EXE, args);
         p.waitForFinished(-1);
         QString result = p.readAllStandardOutput();