From 3b811a1bd07b4eb89a849b2ed1622add693d0f01 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 12 Mar 2025 22:40:40 -0400 Subject: [PATCH] chore: remove unused Arch::getOsName --- src/lib/arch/IArchSystem.h | 6 ------ src/lib/arch/unix/ArchSystemUnix.cpp | 15 --------------- src/lib/arch/unix/ArchSystemUnix.h | 1 - src/lib/arch/win32/ArchSystemWindows.cpp | 20 -------------------- src/lib/arch/win32/ArchSystemWindows.h | 1 - 5 files changed, 43 deletions(-) diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h index 335d05c4a..ed59b336b 100644 --- a/src/lib/arch/IArchSystem.h +++ b/src/lib/arch/IArchSystem.h @@ -20,12 +20,6 @@ public: //! @name accessors //@{ - //! Identify the OS - /*! - Returns a string identifying the operating system. - */ - virtual std::string getOSName() const = 0; - //! Identify the platform /*! Returns a string identifying the platform this OS is running on. diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp index ec40f00dd..e2e1a209f 100644 --- a/src/lib/arch/unix/ArchSystemUnix.cpp +++ b/src/lib/arch/unix/ArchSystemUnix.cpp @@ -32,21 +32,6 @@ ArchSystemUnix::~ArchSystemUnix() // do nothing } -std::string ArchSystemUnix::getOSName() const -{ -#if defined(HAVE_SYS_UTSNAME_H) - struct utsname info; - if (uname(&info) == 0) { - std::string msg; - msg += info.sysname; - msg += " "; - msg += info.release; - return msg; - } -#endif - return "Unix"; -} - std::string ArchSystemUnix::getPlatformName() const { #if defined(HAVE_SYS_UTSNAME_H) diff --git a/src/lib/arch/unix/ArchSystemUnix.h b/src/lib/arch/unix/ArchSystemUnix.h index bbd9e381a..59e66fc7c 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 getOSName() const; virtual std::string getPlatformName() const; virtual std::string setting(const std::string &) const; virtual void setting(const std::string &, const std::string &) const; diff --git a/src/lib/arch/win32/ArchSystemWindows.cpp b/src/lib/arch/win32/ArchSystemWindows.cpp index 85f1c18b7..8e4738074 100644 --- a/src/lib/arch/win32/ArchSystemWindows.cpp +++ b/src/lib/arch/win32/ArchSystemWindows.cpp @@ -34,26 +34,6 @@ ArchSystemWindows::~ArchSystemWindows() // do nothing } -std::string ArchSystemWindows::getOSName() const -{ - std::string osName("Microsoft Windows "); - static const TCHAR *const windowsVersionKeyNames[] = { - _T("SOFTWARE"), _T("Microsoft"), _T("Windows NT"), _T("CurrentVersion"), NULL - }; - - HKEY key = ArchMiscWindows::openKey(HKEY_LOCAL_MACHINE, windowsVersionKeyNames); - if (key == NULL) { - return osName; - } - - std::string productName = ArchMiscWindows::readValueString(key, "ProductName"); - if (osName.empty()) { - return osName; - } - - return "Microsoft " + productName; -} - std::string ArchSystemWindows::getPlatformName() const { #ifdef _X86_ diff --git a/src/lib/arch/win32/ArchSystemWindows.h b/src/lib/arch/win32/ArchSystemWindows.h index 562722d67..88e1e1e05 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 getOSName() const; 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;