This commit is contained in:
Steve Checkoway
2006-08-05 02:35:17 +00:00
parent 50e35457dc
commit 5440a7b613
6 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -9,7 +9,7 @@ public:
/* /*
* Return the general name of the architecture, eg. "Windows", "OS X", "Unix". * Return the general name of the architecture, eg. "Windows", "OS X", "Unix".
*/ */
virtual RString GetArchName() { return "generic"; } virtual RString GetArchName() const { return "generic"; }
/* This is called as soon as the loading window is shown, and we can /* This is called as soon as the loading window is shown, and we can
* safely log. */ * safely log. */
@@ -27,7 +27,7 @@ public:
/* /*
* A string that uniquely identifies the machine in some way * A string that uniquely identifies the machine in some way
*/ */
virtual RString GetMachineId() { return RString(); } virtual RString GetMachineId() const { return RString(); }
/* /*
* If this is a second instance, return true. Optionally, give focus to the existing * If this is a second instance, return true. Optionally, give focus to the existing
@@ -6,7 +6,7 @@ class ArchHooks_Unix: public ArchHooks
{ {
public: public:
ArchHooks_Unix(); ArchHooks_Unix();
RString GetArchName() { return "Unix"; } RString GetArchName() const { return "Unix"; }
void DumpDebugInfo(); void DumpDebugInfo();
void SetTime( tm newtime ); void SetTime( tm newtime );
@@ -75,7 +75,7 @@ static BOOL CALLBACK GetEnabledPopup( HWND hWnd, LPARAM lParam )
static const RString CURRENT_VERSION_KEY = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion"; static const RString CURRENT_VERSION_KEY = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion";
RString ArchHooks_Win32::GetMachineId() RString ArchHooks_Win32::GetMachineId() const
{ {
RString s; RString s;
if( RegistryAccess::GetRegValue( CURRENT_VERSION_KEY, "ProductID", s ) ) if( RegistryAccess::GetRegValue( CURRENT_VERSION_KEY, "ProductID", s ) )
@@ -9,10 +9,10 @@ class ArchHooks_Win32: public ArchHooks
public: public:
ArchHooks_Win32(); ArchHooks_Win32();
~ArchHooks_Win32(); ~ArchHooks_Win32();
RString GetArchName() { return "Windows"; } RString GetArchName() const { return "Windows"; }
void DumpDebugInfo(); void DumpDebugInfo();
void RestartProgram(); void RestartProgram();
RString GetMachineId(); RString GetMachineId() const;
bool CheckForMultipleInstances(); bool CheckForMultipleInstances();
int OldThreadPriority; int OldThreadPriority;
@@ -133,7 +133,7 @@ ArchHooks_darwin::~ArchHooks_darwin()
#endif #endif
} }
RString ArchHooks_darwin::GetMachineId() RString ArchHooks_darwin::GetMachineId() const
{ {
RString ret; RString ret;
CFMutableDictionaryRef dict = IOServiceMatching( "IOPlatformExpertDevice" ); CFMutableDictionaryRef dict = IOServiceMatching( "IOPlatformExpertDevice" );
@@ -9,8 +9,8 @@ class ArchHooks_darwin : public ArchHooks
public: public:
ArchHooks_darwin(); ArchHooks_darwin();
~ArchHooks_darwin(); ~ArchHooks_darwin();
RString GetArchName() { return "OS X"; } RString GetArchName() const { return "OS X"; }
RString GetMachineId(); RString GetMachineId() const;
void DumpDebugInfo(); void DumpDebugInfo();
RString GetPreferredLanguage(); RString GetPreferredLanguage();
void EnterTimeCriticalSection(); void EnterTimeCriticalSection();