From 0a4be71ae2317f7a0abfc30322919717b4273d93 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 28 Apr 2019 20:57:25 -0400 Subject: [PATCH] add regex support to C define reading --- src/mainwindow.cpp | 2 -- src/project.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f8a76bf7..8d44952b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -80,8 +80,6 @@ void MainWindow::initCustomUI() { ui->mapList->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->mapList, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onOpenMapListContextMenu(const QPoint &))); - - // temporary } void MainWindow::initExtraSignals() { diff --git a/src/project.cpp b/src/project.cpp index 4f4b73c3..65e51aef 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -1588,7 +1588,7 @@ void Project::readCoordEventWeatherNames() { void Project::readSecretBaseIds() { QString filepath = root + "/include/constants/secret_bases.h"; - QStringList prefixes = (QStringList() << "SECRET_BASE_"); + QStringList prefixes = (QStringList() << "SECRET_BASE_[A-Za-z0-9_]*_[0-9]+"); readCDefinesSorted(filepath, prefixes, secretBaseIds); } @@ -1842,7 +1842,7 @@ QMap Project::readCDefines(QString text, QStringList prefixes) { int value = parser.evaluateDefine(expression, &allDefines); allDefines.insert(name, value); for (QString prefix : prefixes) { - if (name.startsWith(prefix)) { + if (name.startsWith(prefix) || QRegularExpression(prefix).match(name).hasMatch()) { filteredDefines.insert(name, value); } }