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

Timestamp:

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

Author:

stuerze

Message:

deprecated functions exchanged libs updated

File:

• trunk/BNC/src/bncutils.cpp (modified) (2 diffs)

trunk/BNC/src/bncutils.cpp

@@ -43 +43 @@
 #include <math.h>
 
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QDateTime>
@@ -156 +156 @@
 }
 
-//
+// Replace each ${NAME} by the environment variable NAME (empty if not set);
+// BNC's own file name placeholders are kept
 ////////////////////////////////////////////////////////////////////////////
 void expandEnvVar(QString& str) {
 
-  QRegExp rx("(\\$\\{.+\\})");
-
-  if (rx.indexIn(str) != -1) {
-    QStringListIterator it(rx.capturedTexts());
-    if (it.hasNext()) {
-      QString rxStr  = it.next();
-      QString envVar = rxStr.mid(2,rxStr.length()-3);
-      str.replace(rxStr, qgetenv(envVar.toLatin1()));
-    }
-  }
+  static const QStringList placeholders = QStringList() << "GPSWD" << "V3OBS" << "V3PROD";
+
+  QString result;
+  int     last = 0;
+  QRegularExpressionMatchIterator it = QRegularExpression("\\$\\{([^}]+)\\}").globalMatch(str);
+  while (it.hasNext()) {
+    QRegularExpressionMatch match = it.next();
+    QString name = match.captured(1);
+    result += str.mid(last, match.capturedStart() - last);
+    result += placeholders.contains(name) ? match.captured(0)
+                                          : QString::fromUtf8(qgetenv(name.toLatin1()));
+    last = match.capturedEnd();
+  }
+  str = result + str.mid(last);
 }