diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e99675..a0b0d51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,6 @@ set(SOURCES qt_add_resources(SOURCES Resources/Resources.qrc) set(HEADERS - src/Volbx/VolbxProperties.h src/GUI/About.h src/GUI/CheckUpdates.h src/GUI/DockTitleBar.h diff --git a/src/Update/CMakeLists.txt b/src/Update/CMakeLists.txt index c336f24..2de283b 100644 --- a/src/Update/CMakeLists.txt +++ b/src/Update/CMakeLists.txt @@ -10,7 +10,6 @@ set(SOURCES set(HEADERS Update.h - UpdateProperties.h ) set(UI diff --git a/src/Update/UpdateProperties.h b/src/Update/UpdateProperties.h deleted file mode 100644 index 43c79c9..0000000 --- a/src/Update/UpdateProperties.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#define VER_FILEDESCRIPTION_STR "VersionCheck" -#define VER_INTERNALNAME_STR "VersionCheck" -#define VER_ORIGINALFILENAME_STR "VersionCheck.exe" -#define VER_PRODUCTNAME_STR "VersionCheck" diff --git a/src/Update/UpdateProperties.rc b/src/Update/UpdateProperties.rc index 716a25a..95fcc65 100644 --- a/src/Update/UpdateProperties.rc +++ b/src/Update/UpdateProperties.rc @@ -2,7 +2,6 @@ IDI_ICON1 ICON DISCARDABLE "Update.ico" #include #include "../Shared/CommonProperties.h" -#include "UpdateProperties.h" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -13,14 +12,14 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", VER_COMPANYNAME_STR - VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileDescription", "VersionCheck" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "InternalName", "VersionCheck" VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR - VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR - VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "OriginalFilename", "VersionCheck.exe" + VALUE "ProductName", "VersionCheck" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/Update/main.cpp b/src/Update/main.cpp index 1c45ac7..34460d3 100644 --- a/src/Update/main.cpp +++ b/src/Update/main.cpp @@ -4,7 +4,6 @@ #include "Shared/Application.h" #include "Shared/Logger.h" -#include "Update/UpdateProperties.h" #include "Update.h" @@ -54,12 +53,12 @@ int main(int argc, char* argv[]) { const QApplication a(argc, argv); - application::setAdditionalApplicatioInfo( - QStringLiteral(VER_PRODUCTNAME_STR)); + const QString appName{QStringLiteral("VersionCheck")}; + + application::setAdditionalApplicatioInfo(appName); application::setQtStyle(QStringLiteral("Fusion")); - if (QSharedMemory sharedMemory(QStringLiteral(VER_PRODUCTNAME_STR)); - isUniqueInstance(sharedMemory)) + if (QSharedMemory sharedMemory(appName); isUniqueInstance(sharedMemory)) { Update w; w.show(); diff --git a/src/Volbx/VolbxProperties.h b/src/Volbx/VolbxProperties.h deleted file mode 100644 index 2bcb008..0000000 --- a/src/Volbx/VolbxProperties.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#define VER_FILEDESCRIPTION_STR "Volbx" -#define VER_INTERNALNAME_STR "Volbx" -#define VER_ORIGINALFILENAME_STR "Volbx.exe" -#define VER_PRODUCTNAME_STR "Volbx" diff --git a/src/Volbx/VolbxProperties.rc b/src/Volbx/VolbxProperties.rc index 461ea37..d1bb245 100644 --- a/src/Volbx/VolbxProperties.rc +++ b/src/Volbx/VolbxProperties.rc @@ -2,7 +2,6 @@ IDI_ICON1 ICON DISCARDABLE "Volbx.ico" #include #include "../Shared/CommonProperties.h" -#include "VolbxProperties.h" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -13,14 +12,14 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", VER_COMPANYNAME_STR - VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileDescription", "Volbx" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "InternalName", "Volbx" VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR - VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR - VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "OriginalFilename", "Volbx.exe" + VALUE "ProductName", "Volbx" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/Volbx/main.cpp b/src/Volbx/main.cpp index 7934a14..25d505b 100644 --- a/src/Volbx/main.cpp +++ b/src/Volbx/main.cpp @@ -7,8 +7,6 @@ #include #include -#include "VolbxProperties.h" - namespace { void overwriteUpdaterfIfNeeded() @@ -33,7 +31,9 @@ void overwriteUpdaterfIfNeeded() int main(int argc, char* argv[]) { const QApplication a(argc, argv); - application::setAdditionalApplicatioInfo(VER_PRODUCTNAME_STR); + + const QString appName{QStringLiteral("Volbx")}; + application::setAdditionalApplicatioInfo(appName); Configuration config; application::initStyle(config.getStyleName());