From b22777d3a7d21924c21481fda062fa49105f8e02 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 12 Oct 2023 15:42:48 +0200
Subject: [PATCH] Replace macro by constants, fix minor warnings
---
.../ArmarXGui/ArmarXMainWindow.cpp | 35 +++++++++----------
.../applications/ArmarXGui/ArmarXMainWindow.h | 2 +-
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
index e62d2caf..b484a134 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
@@ -101,15 +101,14 @@
// To start ArViz Godot
#include <fcntl.h>
-
-#define ARMARX_ORGANIZATION "KIT"
-#define ARMARX_GUI_APPLICATION_NAME "ArmarX"
-
-#define CONFIG_LOAD_LAST_CONFIG "LoadLastConfig"
-#define CONFIG_BLACKLISTED_TIPS "BlacklistedTips"
-
namespace armarx
{
+ // static const char* ARMARX_ORGANIZATION = "KIT";
+ static const char* ARMARX_GUI_APPLICATION_NAME = "ArmarX";
+
+ static const char* CONFIG_LOAD_LAST_CONFIG = "LoadLastConfig";
+ static const char* CONFIG_BLACKLISTED_TIPS = "BlacklistedTips";
+
ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfacePtr& registry,
const std::vector<std::string>& packages,
const QString& configToLoad,
@@ -132,11 +131,11 @@ namespace armarx
}
)");
- mainWidgets = QStringList() << "Meta.LogViewer"
- << "Meta.ScenarioManager"
- << "Meta.SystemStateMonitor"
- << "Statecharts.StatechartEditor"
- << "ArMem.MemoryViewer";
+ mainWidgetNames = QStringList() << "Meta.LogViewer"
+ << "Meta.ScenarioManager"
+ << "Meta.SystemStateMonitor"
+ << "Statecharts.StatechartEditor"
+ << "ArMem.MemoryViewer";
splashscreenPrefix = "v" + QString::fromStdString(Application::GetVersion()) + " - ";
QPixmap pm(QString("://icons/ArmarX-Splashscreen.png"));
@@ -202,7 +201,7 @@ namespace armarx
loadPlugins(pluginDirs, false);
if (!disablePreloading)
{
- pluginCache.preloadAsync(getFavoriteWidgets() + mainWidgets);
+ pluginCache.preloadAsync(getFavoriteWidgets() + mainWidgetNames);
}
// instantiatePlugins();
@@ -270,7 +269,7 @@ namespace armarx
void
ArmarXMainWindow::removeViewerWidget(QObject* widget)
{
- ARMARX_WARNING << "Removing 3d viewer" << std::endl;
+ ARMARX_WARNING << "Removing 3D viewer" << std::endl;
if (!widget)
{
@@ -422,7 +421,7 @@ namespace armarx
for (auto it = ranking.rbegin(); it != ranking.rend() && i < favCount; it++)
{
auto& widgetName = it->second;
- if (!mainWidgets.contains(widgetName))
+ if (!mainWidgetNames.contains(widgetName))
{
favoriteWidgetNames << widgetName;
i++;
@@ -1293,7 +1292,7 @@ namespace armarx
action->setData(fullWidgetName);
menu->addAction(action);
- if (mainWidgets.contains(fullWidgetName))
+ if (mainWidgetNames.contains(fullWidgetName))
{
actionsForToolBar[fullWidgetName] = action;
}
@@ -1308,7 +1307,7 @@ namespace armarx
}
// Populate toolbar.
- for (const QString& widgetName : mainWidgets)
+ for (const QString& widgetName : mainWidgetNames)
{
if (QAction* action = actionsForToolBar.value(widgetName))
{
@@ -1431,7 +1430,7 @@ namespace armarx
bool allowText = false;
addActionToToolBar(action, allowText);
- auto slot = [action, this, binaryPath]()
+ auto slot = [this, binaryPath]()
{
if (not std::filesystem::exists(binaryPath))
{
diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
index 6212e244..d274cba2 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
@@ -263,7 +263,7 @@ namespace armarx
QSplashScreen* splashSceen;
QString splashscreenPrefix;
GuiUseCaseSelector* guiUseCaseSelector;
- QStringList mainWidgets;
+ QStringList mainWidgetNames;
QToolButton* openWidgetButton;
QLineEdit* searchField;
AddArmarXWidgetAction* addWidgetAction;
--
GitLab