From ad933ecdf6654cc08021fe7319c26c474d448699 Mon Sep 17 00:00:00 2001
From: "jean.chalard" <jean.chalard@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Thu, 18 Feb 2010 20:09:19 +0000
Subject: [PATCH] J : * Change the name of a define to harmonize stuff.

---
 JGE/include/JGE.h |  6 +++---
 JGE/src/JGE.cpp   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/JGE/include/JGE.h b/JGE/include/JGE.h
index a17754eed..5a60be6fb 100644
--- a/JGE/include/JGE.h
+++ b/JGE/include/JGE.h
@@ -28,15 +28,15 @@
 #if defined(WIN32)
 #include <windows.h>
 typedef WPARAM LocalKeySym;
-#define LOCAL_NO_KEY ((WPARAM)-1)
+#define LOCAL_KEY_NONE ((WPARAM)-1)
 #elif defined(LINUX)
 #include <X11/XKBlib.h>
 #include <X11/keysym.h>
 typedef KeySym LocalKeySym;
-#define LOCAL_NO_KEY XK_VoidSymbol
+#define LOCAL_KEY_NONE XK_VoidSymbol
 #else
 typedef u32 LocalKeySym;
-#define LOCAL_NO_KEY ((u32)-1)
+#define LOCAL_KEY_NONE ((u32)-1)
 #endif
 
 
diff --git a/JGE/src/JGE.cpp b/JGE/src/JGE.cpp
index 8cb9773f3..2eada06c9 100644
--- a/JGE/src/JGE.cpp
+++ b/JGE/src/JGE.cpp
@@ -85,7 +85,7 @@ void JGE::PressKey(const LocalKeySym sym)
 }
 void JGE::PressKey(const JButton sym)
 {
-  keyBuffer.push(make_pair(LOCAL_NO_KEY, sym));
+  keyBuffer.push(make_pair(LOCAL_KEY_NONE, sym));
 }
 void JGE::HoldKey(const LocalKeySym sym)
 {
@@ -113,12 +113,12 @@ void JGE::HoldKey_NoRepeat(const LocalKeySym sym)
 }
 void JGE::HoldKey(const JButton sym)
 {
-  keyBuffer.push(make_pair(LOCAL_NO_KEY, sym));
+  keyBuffer.push(make_pair(LOCAL_KEY_NONE, sym));
   if (holds.end() == holds.find(sym)) holds[sym] = REPEAT_DELAY;
 }
 void JGE::HoldKey_NoRepeat(const JButton sym)
 {
-  keyBuffer.push(make_pair(LOCAL_NO_KEY, sym));
+  keyBuffer.push(make_pair(LOCAL_KEY_NONE, sym));
   if (holds.end() == holds.find(sym)) holds[sym] = std::numeric_limits<float>::quiet_NaN();
 }
 void JGE::ReleaseKey(const LocalKeySym sym)
@@ -135,7 +135,7 @@ void JGE::Update(float dt)
 {
   for (map<JButton, float>::iterator it = holds.begin(); it != holds.end(); ++it)
     {
-      if (it->second < 0) { keyBuffer.push(make_pair(LOCAL_NO_KEY, it->first)); it->second = REPEAT_PERIOD; }
+      if (it->second < 0) { keyBuffer.push(make_pair(LOCAL_KEY_NONE, it->first)); it->second = REPEAT_PERIOD; }
       it->second -= dt;
     }
   if (mApp != NULL) mApp->Update();
@@ -165,7 +165,7 @@ JButton JGE::ReadButton()
 
 LocalKeySym JGE::ReadLocalKey()
 {
-  if (keyBuffer.empty()) return LOCAL_NO_KEY;
+  if (keyBuffer.empty()) return LOCAL_KEY_NONE;
   LocalKeySym val = keyBuffer.front().first;
   keyBuffer.pop();
   return val;