Don't use Qt keywords

kcat · May 12, 2024 · e8daa5b · e8daa5b
1 parent 82ccc4f
commit e8daa5b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/utils/alsoft-config/CMakeLists.txt b/utils/alsoft-config/CMakeLists.txt
@@ -15,6 +15,7 @@ if(Qt5Widgets_FOUND)
     target_link_libraries(alsoft-config PUBLIC Qt5::Widgets PRIVATE alcommon)
     target_include_directories(alsoft-config PRIVATE "${alsoft-config_BINARY_DIR}"
         "${OpenAL_BINARY_DIR}")
+    target_compile_definitions(alsoft-config PRIVATE QT_NO_KEYWORDS)
     set_target_properties(alsoft-config PROPERTIES ${DEFAULT_TARGET_PROPS}
         RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR})
     if(TARGET build_version)

diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
@@ -487,7 +487,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}
     {
         QList<QListWidgetItem*> items = ui->backendListWidget->findItems(
             std::data(backendList[i].full_string), Qt::MatchFixedString);
-        foreach(QListWidgetItem *item, items)
+        Q_FOREACH(QListWidgetItem *item, items)
             item->setHidden(false);
     }
 
@@ -538,7 +538,7 @@ QStringList MainWindow::collectHrtfs()
     {
         QDir dir(ui->hrtfFileList->item(i)->text());
         QStringList fnames = dir.entryList(QDir::Files | QDir::Readable, QDir::Name);
-        foreach(const QString &fname, fnames)
+        Q_FOREACH(const QString &fname, fnames)
         {
             if(!fname.endsWith(QStringLiteral(".mhr"), Qt::CaseInsensitive))
                 continue;
@@ -569,11 +569,11 @@ QStringList MainWindow::collectHrtfs()
     if(ui->defaultHrtfPathsCheckBox->isChecked())
     {
         QStringList paths = getAllDataPaths(QStringLiteral("/openal/hrtf"));
-        foreach(const QString &name, paths)
+        Q_FOREACH(const QString &name, paths)
         {
             QDir dir{name};
             QStringList fnames{dir.entryList(QDir::Files | QDir::Readable, QDir::Name)};
-            foreach(const QString &fname, fnames)
+            Q_FOREACH(const QString &fname, fnames)
             {
                 if(!fname.endsWith(QStringLiteral(".mhr"), Qt::CaseInsensitive))
                     continue;
@@ -800,7 +800,7 @@ void MainWindow::loadConfig(const QString &fname)
     if(ui->defaultHrtfPathsCheckBox->isChecked())
     {
         QStringList hrtfs{collectHrtfs()};
-        foreach(const QString &name, hrtfs)
+        Q_FOREACH(const QString &name, hrtfs)
             ui->preferredHrtfComboBox->addItem(name);
     }
 
@@ -842,7 +842,7 @@ void MainWindow::loadConfig(const QString &fname)
         }
 
         bool lastWasEmpty{false};
-        foreach(const QString &backend, drivers)
+        Q_FOREACH(const QString &backend, drivers)
         {
             lastWasEmpty = backend.isEmpty();
             if(lastWasEmpty) continue;
@@ -971,7 +971,7 @@ void MainWindow::saveConfig(const QString &fname) const
 
     /* HACK: Compound any stringlist values into a comma-separated string. */
     QStringList allkeys{settings.allKeys()};
-    foreach(const QString &key, allkeys)
+    Q_FOREACH(const QString &key, allkeys)
     {
         QStringList vals{settings.value(key).toStringList()};
         if(vals.size() > 1)
@@ -1155,7 +1155,7 @@ void MainWindow::saveConfig(const QString &fname) const
      * FIXME: Should only remove keys whose value matches the globally-specified value.
      */
     allkeys = settings.allKeys();
-    foreach(const QString &key, allkeys)
+    Q_FOREACH(const QString &key, allkeys)
     {
         QString str{settings.value(key).toString()};
         if(str.isEmpty())

diff --git a/utils/alsoft-config/mainwindow.h b/utils/alsoft-config/mainwindow.h
@@ -13,7 +13,7 @@ class MainWindow;
 class MainWindow : public QMainWindow {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void cancelCloseAction();
 
     void saveCurrentConfig();