Skip to content

Commit 3f888bd

Browse files
committed
Undo fix-deprecation because new version of Qt not available in GH worker ubuntu-latest
1 parent ec8584d commit 3f888bd

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/mainwindow.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void MainWindow::load_config(QString filename) {
132132
// ----------------------------
133133
QStringList onlineSyncStreams = pt.value("OnlineSync", QStringList()).toStringList();
134134
for (QString &oss : onlineSyncStreams) {
135-
QStringList words = oss.split(' ', Qt::SkipEmptyParts);
135+
QStringList words = oss.split(' ', QString::SkipEmptyParts); // Deprecated --> Qt::SkipEmptyParts as of Qt 5.14, but not easily available to Ubuntu 18.04
136136
// The first two words ("StreamName (PC)") are the stream identifier
137137
if (words.length() < 2) {
138138
qInfo() << "Invalid sync stream config: " << oss;
@@ -277,9 +277,8 @@ std::vector<lsl::stream_info> MainWindow::refreshStreams() {
277277

278278
const QSet<QString> previouslyChecked = getCheckedStreams();
279279
// Missing streams: all checked or required streams that weren't found
280-
missingStreams =
281-
(previouslyChecked + QSet<QString>(requiredStreams.begin(), requiredStreams.end())) -
282-
foundStreamNames;
280+
// requiredStreams.toSet() is deprecated. Eventually change to: QSet<QString>(requiredStreams.begin(), requiredStreams.end())
281+
missingStreams = (previouslyChecked + requiredStreams.toSet()) - foundStreamNames;
283282

284283
// (Re-)Populate the UI list
285284
const QBrush good_brush(QColor(0, 128, 0)), bad_brush(QColor(255, 0, 0));

0 commit comments

Comments
 (0)