From cd352d9052b42781887996da5b0691dd581ce48c Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 27 Jul 2020 22:31:26 +0200
Subject: rbutil: QString::split() changed with Qt 5.14.

Avoid a deprecated warning, and make it compile with Qt6, which removes
the old version.

Change-Id: Iaad10660a0c8bda9d7aa52ee250489ed135bd8a8
---
 rbutil/rbutilqt/base/ttsfestival.cpp  |  4 ++++
 rbutil/rbutilqt/base/ttssapi.cpp      |  6 +++++-
 rbutil/rbutilqt/base/utils.cpp        | 16 ++++++++++++++++
 rbutil/rbutilqt/installtalkwindow.cpp |  6 +++++-
 4 files changed, 30 insertions(+), 2 deletions(-)

(limited to 'rbutil/rbutilqt')

diff --git a/rbutil/rbutilqt/base/ttsfestival.cpp b/rbutil/rbutilqt/base/ttsfestival.cpp
index 41358ba488..6ed08ddacc 100644
--- a/rbutil/rbutilqt/base/ttsfestival.cpp
+++ b/rbutil/rbutilqt/base/ttsfestival.cpp
@@ -295,7 +295,11 @@ QString TTSFestival::getVoiceInfo(QString voice)
                     Qt::CaseInsensitive, QRegExp::Wildcard));
         LOG_INFO() << "voiceInfo w/o descr:" << response;
         response = response.remove(')');
+#if QT_VERSION >= 0x050e00
+        QStringList responseLines = response.split('(', Qt::SkipEmptyParts);
+#else
         QStringList responseLines = response.split('(', QString::SkipEmptyParts);
+#endif
         responseLines.removeAt(0); // the voice name itself
 
         QString description;
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp
index d2d8cf801a..3d07c09a98 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/rbutil/rbutilqt/base/ttssapi.cpp
@@ -204,7 +204,11 @@ QStringList TTSSapi::getVoiceList(QString language)
     if(dataRaw.startsWith("Error")) {
         LOG_INFO() << "Error:" << dataRaw;
     }
-    result = dataRaw.split(";",QString::SkipEmptyParts);
+#if QT_VERSION >= 0x050e00
+    result = dataRaw.split(";", Qt::SkipEmptyParts);
+#else
+    result = dataRaw.split(";", QString::SkipEmptyParts);
+#endif
     if(result.size() > 0)
     {
         result.sort();
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index e185effe2b..277dcb512c 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
@@ -93,7 +93,11 @@ QString Utils::resolvePathCase(QString path)
 {
     int start;
     QString realpath;
+#if QT_VERSION >= 0x050e00
+    QStringList elems = path.split("/", Qt::SkipEmptyParts);
+#else
     QStringList elems = path.split("/", QString::SkipEmptyParts);
+#endif
 
     if(path.isEmpty())
         return QString();
@@ -280,9 +284,17 @@ QString Utils::findExecutable(QString name)
     QString exepath;
     //try autodetect tts   
 #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
+#if QT_VERSION >= 0x050e00
+    QStringList path = QString(getenv("PATH")).split(":", Qt::SkipEmptyParts);
+#else
     QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts);
+#endif
 #elif defined(Q_OS_WIN)
+#if QT_VERSION >= 0x050e00
+    QStringList path = QString(getenv("PATH")).split(";", Qt::SkipEmptyParts);
+#else
     QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts);
+#endif
 #endif
     LOG_INFO() << "system path:" << path;
     for(int i = 0; i < path.size(); i++)
@@ -290,7 +302,11 @@ QString Utils::findExecutable(QString name)
         QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + name;
 #if defined(Q_OS_WIN)
         executable += ".exe";
+#if QT_VERSION >= 0x050e00
+        QStringList ex = executable.split("\"", Qt::SkipEmptyParts);
+#else
         QStringList ex = executable.split("\"", QString::SkipEmptyParts);
+#endif
         executable = ex.join("");
 #endif
         if(QFileInfo(executable).isExecutable())
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index d9f2cc7e98..81552b03db 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -111,7 +111,11 @@ void InstallTalkWindow::accept()
     talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
     talkcreator->setTalkFolders(ui.talkFolders->isChecked());
     talkcreator->setTalkFiles(ui.talkFiles->isChecked());
-    talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",",QString::SkipEmptyParts));
+#if QT_VERSION >= 0x050e00
+    talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", Qt::SkipEmptyParts));
+#else
+    talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts));
+#endif
 
     connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished()));
     connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
-- 
cgit