[dasher] GC more input meth params and some CDasherInterfaceBase locking structures

[Patrick Welche <pwelche src gnome org>]

commit 99a06797daa343e36f5ada315094e11992059061
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Thu May 6 15:55:42 2010 +0100

    GC more input meth params and some CDasherInterfaceBase locking structures
    
    Specifically: BP_CLICK_MODE, BP_START_STYLUS and BP_KEY_CONTROL;
                  m_iNextLockID, m_mapCurrentLocks

 Src/DasherCore/DasherInterfaceBase.cpp |    2 --
 Src/DasherCore/DasherInterfaceBase.h   |    3 ---
 Src/DasherCore/Parameters.h            |    7 ++-----
 3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index eeb7dfb..09ea7bc 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -123,8 +123,6 @@ CDasherInterfaceBase::CDasherInterfaceBase() {
                               g_iLogOptions);
 #endif
 
-  m_iNextLockID = 1;
-
 }
 
 void CDasherInterfaceBase::Realize() {
diff --git a/Src/DasherCore/DasherInterfaceBase.h b/Src/DasherCore/DasherInterfaceBase.h
index 0443d6e..a73e7c9 100644
--- a/Src/DasherCore/DasherInterfaceBase.h
+++ b/Src/DasherCore/DasherInterfaceBase.h
@@ -570,9 +570,6 @@ protected:
   EState m_iCurrentState;
   bool m_bOldVisible;
 
-  std::map<int, SLockData> m_mapCurrentLocks;
-  int m_iNextLockID;
-
   /// @}
 
   bool m_bLastChanged;
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index 1dbebb3..3de96ba 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -32,12 +32,12 @@
 enum { 
   BP_DRAW_MOUSE_LINE, BP_DRAW_MOUSE, BP_CURVE_MOUSE_LINE,
   BP_SHOW_SLIDER, BP_START_MOUSE,
-  BP_START_SPACE, BP_START_STYLUS, BP_STOP_IDLE, BP_KEY_CONTROL, BP_CONTROL_MODE, 
+  BP_START_SPACE, BP_STOP_IDLE, BP_CONTROL_MODE, 
   BP_COLOUR_MODE, BP_MOUSEPOS_MODE,
   BP_OUTLINE_MODE, BP_PALETTE_CHANGE,
   BP_AUTOCALIBRATE, BP_DASHER_PAUSED,
   BP_GAME_MODE, BP_TRAINING, BP_REDRAW, BP_LM_DICTIONARY, 
-  BP_LM_LETTER_EXCLUSION, BP_AUTO_SPEEDCONTROL, BP_CLICK_MODE, 
+  BP_LM_LETTER_EXCLUSION, BP_AUTO_SPEEDCONTROL,
   BP_LM_ADAPTIVE, BP_SOCKET_INPUT_ENABLE, BP_SOCKET_DEBUG, 
   BP_CIRCLE_START, BP_GLOBAL_KEYBOARD, BP_NONLINEAR_Y,
   BP_SMOOTH_OFFSET, BP_CONVERSION_MODE, BP_PAUSE_OUTSIDE, BP_BACKOFF_BUTTON,
@@ -132,9 +132,7 @@ static bp_table boolparamtable[] = {
 #endif
   {BP_START_MOUSE, "StartOnLeft", PERS, true, "StartOnLeft"},
   {BP_START_SPACE, "StartOnSpace", PERS, false, "StartOnSpace"},
-  {BP_START_STYLUS, "StartOnStylus", PERS, false, "StartOnStylus"},
   {BP_STOP_IDLE, "StopOnIdle", PERS, false, "StopOnIdle"},
-  {BP_KEY_CONTROL, "KeyControl", PERS, false, "KeyControl"},
   {BP_CONTROL_MODE, "ControlMode", PERS, false, "ControlMode"},
   {BP_COLOUR_MODE, "ColourMode", PERS, true, "ColourMode"},
   {BP_MOUSEPOS_MODE, "StartOnMousePosition", PERS, false, "StartOnMousePosition"},
@@ -148,7 +146,6 @@ static bp_table boolparamtable[] = {
   {BP_LM_DICTIONARY, "Dictionary", PERS, true, "Whether the word-based language model uses a dictionary"},
   {BP_LM_LETTER_EXCLUSION, "LetterExclusion", PERS, true, "Whether to do letter exclusion in the word-based model"},
   {BP_AUTO_SPEEDCONTROL, "AutoSpeedControl", PERS, true, "AutoSpeedControl"},
-  {BP_CLICK_MODE, "ClickMode", PERS, false, "Dasher Click Mode"},
   {BP_LM_ADAPTIVE, "LMAdaptive", PERS, true, "Whether language model should learn as you enter text"},
   {BP_SOCKET_INPUT_ENABLE, "SocketInputEnable", PERS, false, "Read pointer coordinates from network socket instead of mouse"},
   {BP_SOCKET_DEBUG, "SocketInputDebug", PERS, false, "Print information about socket input processing to console"},