From 17c35f53f48b4853e64a8cc1abea8e24626dab33 Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Thu, 5 May 2016 15:24:16 +0100
Subject: [PATCH] Applied name convention to KeyResource #2765

---
 src/lib/platform/CMakeLists.txt                        |  4 ++--
 .../{OSXIKeyResource.cpp => IOSXKeyResource.cpp}       | 10 +++-------
 .../platform/{OSXIKeyResource.h => IOSXKeyResource.h}  |  2 +-
 src/lib/platform/OSXKeyState.cpp                       |  4 ++--
 src/lib/platform/OSXKeyState.h                         |  4 ++--
 src/lib/platform/OSXUchrKeyResource.h                  |  4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)
 rename src/lib/platform/{OSXIKeyResource.cpp => IOSXKeyResource.cpp} (96%)
 rename src/lib/platform/{OSXIKeyResource.h => IOSXKeyResource.h} (96%)

diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index b5c747b7..2070d487 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -18,8 +18,8 @@ if (WIN32)
 	file(GLOB headers "MSWindows*.h")
 	file(GLOB sources "MSWindows*.cpp")
 elseif (APPLE)
-	file(GLOB headers "OSX*.h")
-	file(GLOB sources "OSX*.cpp" "OSX*.m")
+	file(GLOB headers "OSX*.h" "IOSX*.h")
+	file(GLOB sources "OSX*.cpp" "IOSX*.cpp" "OSX*.m")
 elseif (UNIX)
 	file(GLOB headers "XWindows*.h")
 	file(GLOB sources "XWindows*.cpp")
diff --git a/src/lib/platform/OSXIKeyResource.cpp b/src/lib/platform/IOSXKeyResource.cpp
similarity index 96%
rename from src/lib/platform/OSXIKeyResource.cpp
rename to src/lib/platform/IOSXKeyResource.cpp
index c6b5a954..384d4369 100644
--- a/src/lib/platform/OSXIKeyResource.cpp
+++ b/src/lib/platform/IOSXKeyResource.cpp
@@ -15,16 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "platform/OSXIKeyResource.h"
+#include "platform/IOSXKeyResource.h"
 
 #include <Carbon/Carbon.h>
 
-//
-// OSXKeyState::KeyResource
-//
-
 KeyID
-IKeyResource::getKeyID(UInt8 c)
+IOSXKeyResource::getKeyID(UInt8 c)
 {
 	if (c == 0) {
 		return kKeyNone;
@@ -163,7 +159,7 @@ IKeyResource::getKeyID(UInt8 c)
 }
 
 KeyID
-IKeyResource::unicharToKeyID(UniChar c)
+IOSXKeyResource::unicharToKeyID(UniChar c)
 {
 	switch (c) {
 	case 3:
diff --git a/src/lib/platform/OSXIKeyResource.h b/src/lib/platform/IOSXKeyResource.h
similarity index 96%
rename from src/lib/platform/OSXIKeyResource.h
rename to src/lib/platform/IOSXKeyResource.h
index cc71cf39..57d826ea 100644
--- a/src/lib/platform/OSXIKeyResource.h
+++ b/src/lib/platform/IOSXKeyResource.h
@@ -19,7 +19,7 @@
 
 #include "synergy/KeyState.h"
 
-class IKeyResource : public IInterface {
+class IOSXKeyResource : public IInterface {
 public:
 	virtual bool	isValid() const = 0;
 	virtual UInt32	getNumModifierCombinations() const = 0;
diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
index 10491f5f..71700d95 100644
--- a/src/lib/platform/OSXKeyState.cpp
+++ b/src/lib/platform/OSXKeyState.cpp
@@ -297,7 +297,7 @@ OSXKeyState::mapKeyFromEvent(KeyIDs& ids,
 			if (count != 0 || m_deadKeyState == 0) {
 				m_deadKeyState = 0;
 				for (UniCharCount i = 0; i < count; ++i) {
-					ids.push_back(IKeyResource::unicharToKeyID(chars[i]));
+					ids.push_back(IOSXKeyResource::unicharToKeyID(chars[i]));
 				}
 				adjustAltGrModifier(ids, maskOut, isCommand);
 				return mapVirtualKeyToKeyButton(vkCode);
@@ -581,7 +581,7 @@ OSXKeyState::getKeyMapForSpecialKeys(synergy::KeyMap& keyMap, SInt32 group) cons
 
 bool
 OSXKeyState::getKeyMap(synergy::KeyMap& keyMap,
-				SInt32 group, const IKeyResource& r) const
+				SInt32 group, const IOSXKeyResource& r) const
 {
 	if (!r.isValid()) {
 		return false;
diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h
index b5cdbc1f..ae54c2d3 100644
--- a/src/lib/platform/OSXKeyState.h
+++ b/src/lib/platform/OSXKeyState.h
@@ -26,7 +26,7 @@
 #include <Carbon/Carbon.h>
 
 typedef TISInputSourceRef KeyLayout;
-class IKeyResource;
+class IOSXKeyResource;
 
 //! OS X key state
 /*!
@@ -113,7 +113,7 @@ private:
 
 	// Convert keyboard resource to a key map
 	bool				getKeyMap(synergy::KeyMap& keyMap,
-							SInt32 group, const IKeyResource& r) const;
+							SInt32 group, const IOSXKeyResource& r) const;
 
 	// Get the available keyboard groups
 	bool				getGroups(GroupList&) const;
diff --git a/src/lib/platform/OSXUchrKeyResource.h b/src/lib/platform/OSXUchrKeyResource.h
index bffee607..6d97cc51 100644
--- a/src/lib/platform/OSXUchrKeyResource.h
+++ b/src/lib/platform/OSXUchrKeyResource.h
@@ -18,13 +18,13 @@
 #pragma once
 
 #include "synergy/KeyState.h"
-#include "platform/OSXIKeyResource.h"
+#include "platform/IOSXKeyResource.h"
 
 #include <Carbon/Carbon.h>
 
 typedef TISInputSourceRef KeyLayout;
 
-class OSXUchrKeyResource : public IKeyResource {
+class OSXUchrKeyResource : public IOSXKeyResource {
 public:
 	OSXUchrKeyResource(const void*, UInt32 keyboardType);