From d33f5f3621667df299f3852bcb4523b964d4cf1c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 22 Feb 2026 17:19:04 -0500 Subject: [PATCH] Relocate porymapVersion --- include/config/keyvalueconfigbase.h | 3 --- include/core/converter.h | 2 ++ include/core/version.h | 9 +++++++++ porymap.pro | 2 ++ src/config/keyvalueconfigbase.cpp | 2 -- src/core/version.cpp | 3 +++ src/mainwindow.cpp | 1 + src/scriptapi/scripting.cpp | 1 + src/ui/updatepromoter.cpp | 1 + 9 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 include/core/version.h create mode 100644 src/core/version.cpp diff --git a/include/config/keyvalueconfigbase.h b/include/config/keyvalueconfigbase.h index 52e58a03..f7db0d96 100644 --- a/include/config/keyvalueconfigbase.h +++ b/include/config/keyvalueconfigbase.h @@ -4,12 +4,9 @@ #include #include -#include #include "fieldmanager.h" -extern const QVersionNumber porymapVersion; - class KeyValueConfigBase { public: diff --git a/include/core/converter.h b/include/core/converter.h index 6ddf92fc..25859092 100644 --- a/include/core/converter.h +++ b/include/core/converter.h @@ -3,6 +3,8 @@ #define CONVERTER_H #include +#include + #include "magic_enum.hpp" #include "orderedset.h" #include "scriptsettings.h" diff --git a/include/core/version.h b/include/core/version.h new file mode 100644 index 00000000..876f6890 --- /dev/null +++ b/include/core/version.h @@ -0,0 +1,9 @@ +#pragma once +#ifndef VERSION_H +#define VERSION_H + +#include + +extern const QVersionNumber porymapVersion; + +#endif // VERSION_H diff --git a/porymap.pro b/porymap.pro index 38d650b5..2cf2251d 100644 --- a/porymap.pro +++ b/porymap.pro @@ -72,6 +72,7 @@ SOURCES += src/config/keyvalueconfigbase.cpp \ src/core/tileset.cpp \ src/core/utility.cpp \ src/core/validator.cpp \ + src/core/version.cpp \ src/core/regionmap.cpp \ src/core/wildmoninfo.cpp \ src/core/editcommands.cpp \ @@ -195,6 +196,7 @@ HEADERS += include/config/keyvalueconfigbase.h \ include/core/tileset.h \ include/core/utility.h \ include/core/validator.h \ + include/core/version.h \ include/core/regionmap.h \ include/core/wildmoninfo.h \ include/core/editcommands.h \ diff --git a/src/config/keyvalueconfigbase.cpp b/src/config/keyvalueconfigbase.cpp index bf92797e..82d9a93d 100644 --- a/src/config/keyvalueconfigbase.cpp +++ b/src/config/keyvalueconfigbase.cpp @@ -3,8 +3,6 @@ #include -const QVersionNumber porymapVersion = QVersionNumber::fromString(PORYMAP_VERSION); - void KeyValueConfigBase::setRoot(const QString& root) { m_root = root; QDir dir(m_root); diff --git a/src/core/version.cpp b/src/core/version.cpp new file mode 100644 index 00000000..07ebbbde --- /dev/null +++ b/src/core/version.cpp @@ -0,0 +1,3 @@ +#include "version.h" + +const QVersionNumber porymapVersion = QVersionNumber::fromString(PORYMAP_VERSION); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b1b721a5..1e03cc78 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -29,6 +29,7 @@ #include "newmapgroupdialog.h" #include "newlocationdialog.h" #include "loadingscreen.h" +#include "version.h" #include #include diff --git a/src/scriptapi/scripting.cpp b/src/scriptapi/scripting.cpp index 4489641a..5b4bca25 100644 --- a/src/scriptapi/scripting.cpp +++ b/src/scriptapi/scripting.cpp @@ -5,6 +5,7 @@ #include "log.h" #include "config.h" #include "mainwindow.h" +#include "version.h" Scripting *instance = nullptr; diff --git a/src/ui/updatepromoter.cpp b/src/ui/updatepromoter.cpp index 4b66fbff..cea5b753 100644 --- a/src/ui/updatepromoter.cpp +++ b/src/ui/updatepromoter.cpp @@ -3,6 +3,7 @@ #include "ui_updatepromoter.h" #include "log.h" #include "config.h" +#include "version.h" #include #include