Skip to content

Commit

Permalink
Remove some macros related to Windows app info.
Browse files Browse the repository at this point in the history
  • Loading branch information
przemek83 committed Jan 22, 2025
1 parent 9a9bbc3 commit 2a42a05
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 32 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Update/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ set(SOURCES

set(HEADERS
Update.h
UpdateProperties.h
)

set(UI
Expand Down
6 changes: 0 additions & 6 deletions src/Update/UpdateProperties.h

This file was deleted.

9 changes: 4 additions & 5 deletions src/Update/UpdateProperties.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ IDI_ICON1 ICON DISCARDABLE "Update.ico"

#include <windows.h>
#include "../Shared/CommonProperties.h"
#include "UpdateProperties.h"

VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/Update/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "Shared/Application.h"
#include "Shared/Logger.h"
#include "Update/UpdateProperties.h"

#include "Update.h"

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 0 additions & 6 deletions src/Volbx/VolbxProperties.h

This file was deleted.

9 changes: 4 additions & 5 deletions src/Volbx/VolbxProperties.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ IDI_ICON1 ICON DISCARDABLE "Volbx.ico"

#include <windows.h>
#include "../Shared/CommonProperties.h"
#include "VolbxProperties.h"

VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/Volbx/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#include <Shared/Application.h>
#include <Shared/Logger.h>

#include "VolbxProperties.h"

namespace
{
void overwriteUpdaterfIfNeeded()
Expand All @@ -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());

Expand Down

0 comments on commit 2a42a05

Please sign in to comment.