misc small code cleanups

Author: nschimme

src/global/NamedColors.cpp

@@ -59,22 +59,18 @@ struct NODISCARD GlobalData final
         m_initialized[NamedColorEnum::TRANSPARENT] = true;
 
         // Sane defaults for weather colors
-        std::ignore = setColor(NamedColorEnum::WEATHER_DAWN,
-                               Color(102, 76, 51, 25)); // 0.4, 0.3, 0.2, 0.1
-        std::ignore = setColor(NamedColorEnum::WEATHER_DUSK,
-                               Color(76, 51, 102, 51)); // 0.3, 0.2, 0.4, 0.2
-        std::ignore = setColor(NamedColorEnum::WEATHER_NIGHT,
-                               Color(13, 13, 51, 89)); // 0.05, 0.05, 0.2, 0.35
-        std::ignore = setColor(NamedColorEnum::WEATHER_NIGHT_MOON,
-                               Color(13, 13, 64, 77)); // 0.05, 0.05, 0.25, 0.3
+        setColor(NamedColorEnum::WEATHER_DAWN, Color(102, 76, 51, 25)); // 0.4, 0.3, 0.2, 0.1
+        setColor(NamedColorEnum::WEATHER_DUSK, Color(76, 51, 102, 51)); // 0.3, 0.2, 0.4, 0.2
+        setColor(NamedColorEnum::WEATHER_NIGHT, Color(13, 13, 51, 89)); // 0.05, 0.05, 0.2, 0.35
+        setColor(NamedColorEnum::WEATHER_NIGHT_MOON, Color(13, 13, 64, 77)); // 0.05, 0.05, 0.25, 0.3
     }
 
 public:
     NODISCARD bool isInitialized(const NamedColorEnum id) const { return m_initialized[id]; }
 
 public:
     NODISCARD Color getColor(const NamedColorEnum id) { return m_colors.at(getIndex(id)); }
-    NODISCARD bool setColor(const NamedColorEnum id, Color c)
+    ALLOW_DISCARD bool setColor(const NamedColorEnum id, const Color c)
     {
         if (id == NamedColorEnum::DEFAULT || id == NamedColorEnum::TRANSPARENT) {
             return false;

src/observer/gameobserver.h

@@ -55,10 +55,10 @@ class NODISCARD GameObserver final
     void observeGainedLevel() { sig2_gainedLevel.invoke(); }
 
 public:
-    MumeTimeEnum getTimeOfDay() const { return m_timeOfDay; }
-    MumeMoonPhaseEnum getMoonPhase() const { return m_moonPhase; }
-    MumeMoonVisibilityEnum getMoonVisibility() const { return m_moonVisibility; }
-    MumeSeasonEnum getSeason() const { return m_season; }
-    PromptWeatherEnum getWeather() const { return m_weather; }
-    PromptFogEnum getFog() const { return m_fog; }
+    NODISCARD MumeTimeEnum getTimeOfDay() const { return m_timeOfDay; }
+    NODISCARD MumeMoonPhaseEnum getMoonPhase() const { return m_moonPhase; }
+    NODISCARD MumeMoonVisibilityEnum getMoonVisibility() const { return m_moonVisibility; }
+    NODISCARD MumeSeasonEnum getSeason() const { return m_season; }
+    NODISCARD PromptWeatherEnum getWeather() const { return m_weather; }
+    NODISCARD PromptFogEnum getFog() const { return m_fog; }
 };

src/opengl/OpenGLProber.cpp

@@ -172,12 +172,10 @@ NODISCARD std::optional<GLContextCheckResult> probeCompat(
                                                                version,
                                                                QSurfaceFormat::CompatibilityProfile);
         if (contextCheckResult.valid) {
-            if (contextCheckResult.valid) {
-                compatResult = contextCheckResult;
-                MMLOG_DEBUG() << "[GL Probe] Found highest supported Compat version: "
-                              << compatResult->version;
-                break;
-            }
+            compatResult = contextCheckResult;
+            MMLOG_DEBUG() << "[GL Probe] Found highest supported Compat version: "
+                          << compatResult->version;
+            break;
         }
     }
     return compatResult;

src/preferences/configdialog.cpp

@@ -116,18 +116,15 @@ void ConfigDialog::createIcons()
 {
     const QSize iconTargetSize = ui->contentsWidget->iconSize();
 
-    auto addItem = [this, iconTargetSize](const QString &iconPath,
-                                          const QString &label) /*-> QListWidgetItem * */ {
+    auto addItem = [this, iconTargetSize](const QString &iconPath, const QString &label) {
         QPixmap pixmap(iconPath);
         QPixmap scaled = pixmap.scaled(iconTargetSize,
                                        Qt::KeepAspectRatio,
                                        Qt::SmoothTransformation);
 
-        // does this leak, or is ownership given to ui->contentsWidget?
         auto *item = new QListWidgetItem(QIcon(scaled), label, ui->contentsWidget);
         item->setTextAlignment(Qt::AlignHCenter);
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        // return item;
     };
 
     addItem(":/icons/generalcfg.png", tr("General"));

src/preferences/graphicspage.cpp

@@ -85,17 +85,17 @@ GraphicsPage::GraphicsPage(QWidget *parent)
             this,
             &GraphicsPage::slot_drawUpperLayersTexturedStateChanged);
 
-    connect(ui->weatherAtmosphereSlider, &QSlider::valueChanged, this, [this](int value) {
+    connect(ui->weatherAtmosphereSlider, &QSlider::valueChanged, this, [this](const int value) {
         setConfig().canvas.weatherAtmosphereIntensity.set(value);
         graphicsSettingsChanged();
     });
 
-    connect(ui->weatherPrecipitationSlider, &QSlider::valueChanged, this, [this](int value) {
+    connect(ui->weatherPrecipitationSlider, &QSlider::valueChanged, this, [this](const int value) {
         setConfig().canvas.weatherPrecipitationIntensity.set(value);
         graphicsSettingsChanged();
     });
 
-    connect(ui->weatherTimeOfDaySlider, &QSlider::valueChanged, this, [this](int value) {
+    connect(ui->weatherTimeOfDaySlider, &QSlider::valueChanged, this, [this](const int value) {
         setConfig().canvas.weatherTimeOfDayIntensity.set(value);
         graphicsSettingsChanged();
     });