diff --git a/src/console_window.cpp b/src/console_window.cpp index 31d6b1f..1593196 100644 --- a/src/console_window.cpp +++ b/src/console_window.cpp @@ -32,8 +32,6 @@ #include #include -// #include -// #include // required for getURI, VCM 12 April 2017 #include #include @@ -54,14 +52,6 @@ #include #include -// QString::SkipEmptyParts was deprecated in favor of Qt::SkipEmptyParts in -// Qt 5.14.0 -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) - #define SPLIT_FLAG (Qt::SkipEmptyParts) -#else - #define SPLIT_FLAG (QString::SkipEmptyParts) -#endif - using namespace Qt; namespace log_level_mask { @@ -282,7 +272,7 @@ void ConsoleWindow::nodeSelectionChanged() db_proxy_->setNodeFilter(nodes); for (int i = 0; i < node_names.size(); i++) { - node_names[i] = node_names[i].split("/", SPLIT_FLAG).last(); + node_names[i] = node_names[i].split("/", Qt::SkipEmptyParts).last(); } setWindowTitle(QString("SWRI Console (") + node_names.join(", ") + ")"); @@ -401,7 +391,7 @@ void ConsoleWindow::setFollowNewest(bool follow) void ConsoleWindow::includeFilterUpdated(const QString &text) { - QStringList items = text.split(";", SPLIT_FLAG); + QStringList items = text.split(";", Qt::SkipEmptyParts); QStringList filtered; for (int i = 0; i < items.size(); i++) { @@ -419,7 +409,7 @@ void ConsoleWindow::includeFilterUpdated(const QString &text) void ConsoleWindow::excludeFilterUpdated(const QString &text) { - QStringList items = text.split(";", SPLIT_FLAG); + QStringList items = text.split(";", Qt::SkipEmptyParts); QStringList filtered; for (int i = 0; i < items.size(); i++) {