From ef315183f31b302a4ce333e1e682e3096083801c Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 12 Mar 2025 22:42:43 -0400 Subject: [PATCH] chore: rm unused ARCH:getPlatform --- src/lib/arch/IArchSystem.h | 7 ------- src/lib/arch/unix/ArchSystemUnix.cpp | 11 ----------- src/lib/arch/unix/ArchSystemUnix.h | 1 - src/lib/arch/win32/ArchSystemWindows.cpp | 16 ---------------- src/lib/arch/win32/ArchSystemWindows.h | 1 - src/lib/gui/core/CoreTool.h | 1 - 6 files changed, 37 deletions(-) diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h index ed59b336b..ee283d009 100644 --- a/src/lib/arch/IArchSystem.h +++ b/src/lib/arch/IArchSystem.h @@ -20,13 +20,6 @@ public: //! @name accessors //@{ - //! Identify the platform - /*! - Returns a string identifying the platform this OS is running on. - */ - virtual std::string getPlatformName() const = 0; - //@} - //! Get a Deskflow setting /*! Reads a Deskflow setting from the system. diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp index e2e1a209f..31d3d351a 100644 --- a/src/lib/arch/unix/ArchSystemUnix.cpp +++ b/src/lib/arch/unix/ArchSystemUnix.cpp @@ -32,17 +32,6 @@ ArchSystemUnix::~ArchSystemUnix() // do nothing } -std::string ArchSystemUnix::getPlatformName() const -{ -#if defined(HAVE_SYS_UTSNAME_H) - struct utsname info; - if (uname(&info) == 0) { - return std::string(info.machine); - } -#endif - return "unknown"; -} - std::string ArchSystemUnix::setting(const std::string &) const { return ""; diff --git a/src/lib/arch/unix/ArchSystemUnix.h b/src/lib/arch/unix/ArchSystemUnix.h index 59e66fc7c..e363b82fa 100644 --- a/src/lib/arch/unix/ArchSystemUnix.h +++ b/src/lib/arch/unix/ArchSystemUnix.h @@ -19,7 +19,6 @@ public: virtual ~ArchSystemUnix(); // IArchSystem overrides - virtual std::string getPlatformName() const; virtual std::string setting(const std::string &) const; virtual void setting(const std::string &, const std::string &) const; virtual std::string getLibsUsed(void) const; diff --git a/src/lib/arch/win32/ArchSystemWindows.cpp b/src/lib/arch/win32/ArchSystemWindows.cpp index bb1070d02..a66e4fb93 100644 --- a/src/lib/arch/win32/ArchSystemWindows.cpp +++ b/src/lib/arch/win32/ArchSystemWindows.cpp @@ -34,22 +34,6 @@ ArchSystemWindows::~ArchSystemWindows() // do nothing } -std::string ArchSystemWindows::getPlatformName() const -{ -#ifdef _X86_ - if (isWOW64()) - return "x86 (WOW64)"; - else - return "x86"; -#else -#ifdef _AMD64_ - return "x64"; -#else - return "Unknown"; -#endif -#endif -} - std::string ArchSystemWindows::setting(const std::string &valueName) const { HKEY key = ArchMiscWindows::openKey(HKEY_LOCAL_MACHINE, s_settingsKeyNames); diff --git a/src/lib/arch/win32/ArchSystemWindows.h b/src/lib/arch/win32/ArchSystemWindows.h index 1a69e6662..9c91671f9 100644 --- a/src/lib/arch/win32/ArchSystemWindows.h +++ b/src/lib/arch/win32/ArchSystemWindows.h @@ -19,7 +19,6 @@ public: virtual ~ArchSystemWindows(); // IArchSystem overrides - virtual std::string getPlatformName() const; virtual std::string setting(const std::string &valueName) const; virtual void setting(const std::string &valueName, const std::string &valueString) const; virtual void clearSettings() const; diff --git a/src/lib/gui/core/CoreTool.h b/src/lib/gui/core/CoreTool.h index eb56fae63..805042bf3 100644 --- a/src/lib/gui/core/CoreTool.h +++ b/src/lib/gui/core/CoreTool.h @@ -13,5 +13,4 @@ class CoreTool public: QString getProfileDir() const; QString getInstalledDir() const; - QString getArch() const; };