Changeset 11158 in ntrip for trunk/BNC/src/bncmain.cpp

Timestamp:

Nov 3, 2026, 10:53:35 AM (4 days ago)

Author:

stuerze

Message:

deprecated functions exchanged libs updated

File:

• trunk/BNC/src/bncmain.cpp (modified) (4 diffs)

trunk/BNC/src/bncmain.cpp

@@ -47 +47 @@
 #include <QApplication>
 #include <QFile>
+#include <QRegularExpression>
 #include <iostream>
 #include <QNetworkProxyFactory>
@@ -100 +101 @@
 // Main Program
 /////////////////////////////////////////////////////////////////////////////
+// Command line argument matches the option pattern, e.g. "--?conf"
+////////////////////////////////////////////////////////////////////////////
+static bool isOption(const char* arg, const char* pattern) {
+  return QRegularExpression(QRegularExpression::anchoredPattern(pattern)).match(arg).hasMatch();
+}
+
 int main(int argc, char* argv[]) {
 
@@ -405 +412 @@
 
     for (int ii = 1; ii < argc; ii++) {
-        if (QRegExp("--?help").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?help")) {
             cout << printHelp.data();
             exit(0);
         }
-        if (QRegExp("--?nw").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?nw")) {
             interactive = false;
         }
-        if (QRegExp("--?version").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?version")) {
             cout << BNCPGMNAME << endl;
             exit(0);
         }
-        if (QRegExp("--?display").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?display")) {
             displaySet = true;
             strcpy(argv[ii], "-display"); // make it "-display" not "--display"
         }
         if (ii + 1 < argc) {
-            if (QRegExp("--?conf").exactMatch(argv[ii])) {
+            if (isOption(argv[ii], "--?conf")) {
                 confFileName = QString(argv[ii + 1]);
             }
-            if (QRegExp("--?file").exactMatch(argv[ii])) {
+            if (isOption(argv[ii], "--?file")) {
                 interactive = false;
                 rawFileName = QByteArray(argv[ii + 1]);
@@ -479 +486 @@
 
     for (int ii = 1; ii < argc - 2; ii++) {
-        if (QRegExp("--?key").exactMatch(argv[ii])) {
+        if (isOption(argv[ii], "--?key")) {
             QString key(argv[ii + 1]);
             QString val(argv[ii + 2]);