Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
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
+30
-2
+4
rbutil/rbutilqt/base/ttsfestival.cpp
+4
rbutil/rbutilqt/base/ttsfestival.cpp
···
295
295
Qt::CaseInsensitive, QRegExp::Wildcard));
296
296
LOG_INFO() << "voiceInfo w/o descr:" << response;
297
297
response = response.remove(')');
298
+
#if QT_VERSION >= 0x050e00
299
+
QStringList responseLines = response.split('(', Qt::SkipEmptyParts);
300
+
#else
298
301
QStringList responseLines = response.split('(', QString::SkipEmptyParts);
302
+
#endif
299
303
responseLines.removeAt(0); // the voice name itself
300
304
301
305
QString description;
+5
-1
rbutil/rbutilqt/base/ttssapi.cpp
+5
-1
rbutil/rbutilqt/base/ttssapi.cpp
···
204
204
if(dataRaw.startsWith("Error")) {
205
205
LOG_INFO() << "Error:" << dataRaw;
206
206
}
207
-
result = dataRaw.split(";",QString::SkipEmptyParts);
207
+
#if QT_VERSION >= 0x050e00
208
+
result = dataRaw.split(";", Qt::SkipEmptyParts);
209
+
#else
210
+
result = dataRaw.split(";", QString::SkipEmptyParts);
211
+
#endif
208
212
if(result.size() > 0)
209
213
{
210
214
result.sort();
+16
rbutil/rbutilqt/base/utils.cpp
+16
rbutil/rbutilqt/base/utils.cpp
···
93
93
{
94
94
int start;
95
95
QString realpath;
96
+
#if QT_VERSION >= 0x050e00
97
+
QStringList elems = path.split("/", Qt::SkipEmptyParts);
98
+
#else
96
99
QStringList elems = path.split("/", QString::SkipEmptyParts);
100
+
#endif
97
101
98
102
if(path.isEmpty())
99
103
return QString();
···
280
284
QString exepath;
281
285
//try autodetect tts
282
286
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
287
+
#if QT_VERSION >= 0x050e00
288
+
QStringList path = QString(getenv("PATH")).split(":", Qt::SkipEmptyParts);
289
+
#else
283
290
QStringList path = QString(getenv("PATH")).split(":", QString::SkipEmptyParts);
291
+
#endif
284
292
#elif defined(Q_OS_WIN)
293
+
#if QT_VERSION >= 0x050e00
294
+
QStringList path = QString(getenv("PATH")).split(";", Qt::SkipEmptyParts);
295
+
#else
285
296
QStringList path = QString(getenv("PATH")).split(";", QString::SkipEmptyParts);
297
+
#endif
286
298
#endif
287
299
LOG_INFO() << "system path:" << path;
288
300
for(int i = 0; i < path.size(); i++)
···
290
302
QString executable = QDir::fromNativeSeparators(path.at(i)) + "/" + name;
291
303
#if defined(Q_OS_WIN)
292
304
executable += ".exe";
305
+
#if QT_VERSION >= 0x050e00
306
+
QStringList ex = executable.split("\"", Qt::SkipEmptyParts);
307
+
#else
293
308
QStringList ex = executable.split("\"", QString::SkipEmptyParts);
309
+
#endif
294
310
executable = ex.join("");
295
311
#endif
296
312
if(QFileInfo(executable).isExecutable())
+5
-1
rbutil/rbutilqt/installtalkwindow.cpp
+5
-1
rbutil/rbutilqt/installtalkwindow.cpp
···
111
111
talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
112
112
talkcreator->setTalkFolders(ui.talkFolders->isChecked());
113
113
talkcreator->setTalkFiles(ui.talkFiles->isChecked());
114
-
talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",",QString::SkipEmptyParts));
114
+
#if QT_VERSION >= 0x050e00
115
+
talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", Qt::SkipEmptyParts));
116
+
#else
117
+
talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts));
118
+
#endif
115
119
116
120
connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished()));
117
121
connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));