move the stringification to places where they are used, prep to remov…

…e the file
Rossmaxx · Feb 2, 2025 · bf44367 · bf44367
1 parent 10ec2cf
commit bf44367
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/include/Plugin.h b/include/Plugin.h
@@ -31,6 +31,7 @@
 #include "JournallingObject.h"
 #include "Model.h"
 
+#define LMMS_STRINGIFY(s) #s // Used to stringify plugin numbers
 
 class QWidget;
 

diff --git a/include/embed.h b/include/embed.h
@@ -32,7 +32,9 @@
 #include <QString>
 
 #include "lmms_export.h"
-#include "lmms_basics.h"
+
+
+#define LMMS_STRINGIFY(s) #s // a macro used to get stringified plugin name
 
 namespace lmms {
 

diff --git a/include/lmms_basics.h b/include/lmms_basics.h
@@ -63,8 +63,6 @@ constexpr char LADSPA_PATH_SEPERATOR =
 #endif
 
 
-#define LMMS_STRINGIFY(s) #s
-
 // Abstract away GUI CTRL key (linux/windows) vs ⌘ (apple)
 constexpr const char* UI_CTRL_KEY =
 #ifdef LMMS_BUILD_APPLE

diff --git a/include/versioninfo.h b/include/versioninfo.h
@@ -1,14 +1,13 @@
 #ifndef LMMS_VERSION_INFO_H
 #define LMMS_VERSION_INFO_H
 
-#include "lmms_basics.h"
 
 #if defined(__GNUC__)
 constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "GCC " __VERSION__;
 #elif defined(__clang__)
 constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "Clang " __clang_version__;
 #elif defined(_MSC_VER)
-constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "MSVC " LMMS_STRINGIFY(_MSC_FULL_VER);
+constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "MSVC " _MSC_FULL_VER;
 #else
 constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "unknown compiler";
 #endif