GNOME.org
 

[dasher] CDasherModule::iType specified by CDasherInput & CInputFilter not all subclasses

commit 40ecc615c1d5eca7130fc33ee46bfd7f270f7569
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Sat Nov 20 21:38:20 2010 +0000

    CDasherModule::iType specified by CDasherInput & CInputFilter not all subclasses

 Src/DasherCore/ButtonMultiPress.cpp       |    4 ++--
 Src/DasherCore/ButtonMultiPress.h         |    2 +-
 Src/DasherCore/ClickFilter.h              |    2 +-
 Src/DasherCore/DasherButtons.cpp          |    2 +-
 Src/DasherCore/DasherInput.h              |    5 +++--
 Src/DasherCore/DefaultFilter.cpp          |    2 +-
 Src/DasherCore/DynamicFilter.cpp          |    4 ++--
 Src/DasherCore/DynamicFilter.h            |    2 +-
 Src/DasherCore/InputFilter.h              |    6 +++---
 Src/DasherCore/OneButtonDynamicFilter.cpp |    2 +-
 Src/DasherCore/OneButtonFilter.cpp        |    2 +-
 Src/DasherCore/SocketInputBase.cpp        |    2 +-
 Src/DasherCore/TwoButtonDynamicFilter.cpp |    2 +-
 Src/DasherCore/TwoPushDynamicFilter.cpp   |    2 +-
 Src/Gtk2/joystick_input.h                 |    6 +++---
 Src/Gtk2/mouse_input.h                    |    4 ++--
 Src/Gtk2/tilt_input.h                     |    2 +-
 Src/MacOSX/COSXMouseInput.h               |    4 ++--
 Src/Win32/BTSocketInput.cpp               |    2 +-
 Src/Win32/DasherMouseInput.cpp            |    2 +-
 20 files changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/Src/DasherCore/ButtonMultiPress.cpp b/Src/DasherCore/ButtonMultiPress.cpp
index a1d12a2..95e7da2 100644
--- a/Src/DasherCore/ButtonMultiPress.cpp
+++ b/Src/DasherCore/ButtonMultiPress.cpp
@@ -23,8 +23,8 @@
 
 using namespace Dasher;
 
-CButtonMultiPress::CButtonMultiPress(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, int iType, const char *szName)
-  : CDynamicFilter(pEventHandler, pSettingsStore, pInterface, iID, iType, szName) {
+CButtonMultiPress::CButtonMultiPress(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName)
+  : CDynamicFilter(pEventHandler, pSettingsStore, pInterface, iID, szName) {
 }
 
 void CButtonMultiPress::KeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel, CUserLogBase *pUserLog) {
diff --git a/Src/DasherCore/ButtonMultiPress.h b/Src/DasherCore/ButtonMultiPress.h
index 687b9ca..89acd14 100644
--- a/Src/DasherCore/ButtonMultiPress.h
+++ b/Src/DasherCore/ButtonMultiPress.h
@@ -31,7 +31,7 @@ namespace Dasher {
 /// to the number of presses, for subclasses to handle/decide how to respond.)
 class CButtonMultiPress : public CDynamicFilter {
  public:
-  CButtonMultiPress(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, int iType, const char *szName);
+  CButtonMultiPress(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName);
   
   virtual void KeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel, CUserLogBase *pUserLog);
 
diff --git a/Src/DasherCore/ClickFilter.h b/Src/DasherCore/ClickFilter.h
index 76ef6e2..4900b6e 100644
--- a/Src/DasherCore/ClickFilter.h
+++ b/Src/DasherCore/ClickFilter.h
@@ -9,7 +9,7 @@ namespace Dasher {
 class CClickFilter : public CInputFilter {
  public:
   CClickFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
-    : CInputFilter(pEventHandler, pSettingsStore, pInterface, 7, 1, _("Click Mode")) { };
+    : CInputFilter(pEventHandler, pSettingsStore, pInterface, 7, _("Click Mode")) { };
 
   virtual bool DecorateView(CDasherView *pView);
   virtual bool Timer(int Time, CDasherView *pDasherView, CDasherModel *pDasherModel, Dasher::VECTOR_SYMBOL_PROB *pAdded, int *pNumDeleted, CExpansionPolicy **pol);
diff --git a/Src/DasherCore/DasherButtons.cpp b/Src/DasherCore/DasherButtons.cpp
index 703199f..bdb2358 100644
--- a/Src/DasherCore/DasherButtons.cpp
+++ b/Src/DasherCore/DasherButtons.cpp
@@ -26,7 +26,7 @@ using namespace Dasher;
 // FIXME - should compass mode be made a separate class?
 
 CDasherButtons::CDasherButtons(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, bool bMenu, ModuleID_t iID, const char *szName)
-  : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, 1, szName), m_bMenu(bMenu), m_bDecorationChanged(true), m_pBoxes(NULL), iActiveBox(0) {}
+  : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, szName), m_bMenu(bMenu), m_bDecorationChanged(true), m_pBoxes(NULL), iActiveBox(0) {}
 
 CDasherButtons::~CDasherButtons()
 {
diff --git a/Src/DasherCore/DasherInput.h b/Src/DasherCore/DasherInput.h
index 54b68c1..b8332d0 100644
--- a/Src/DasherCore/DasherInput.h
+++ b/Src/DasherCore/DasherInput.h
@@ -7,6 +7,7 @@
 
 #include "DasherTypes.h"
 #include "DasherModule.h"
+#include "ModuleManager.h"
 
 namespace Dasher {
   class CDasherInput;
@@ -18,8 +19,8 @@ class Dasher::CDasherInput : public CDasherModule {
 
 public:
 
-  CDasherInput(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, ModuleID_t iID, int iType, const char *szName) 
-    : CDasherModule(pEventHandler, pSettingsStore, iID, iType, szName) {};
+  CDasherInput(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, ModuleID_t iID, const char *szName) 
+    : CDasherModule(pEventHandler, pSettingsStore, iID, InputDevice, szName) {};
 
   /// Set the maximum values for each of the coordinates. Minimum
   /// values are assumed to be zero for now
diff --git a/Src/DasherCore/DefaultFilter.cpp b/Src/DasherCore/DefaultFilter.cpp
index 74b2a6c..c14e1e1 100644
--- a/Src/DasherCore/DefaultFilter.cpp
+++ b/Src/DasherCore/DefaultFilter.cpp
@@ -23,7 +23,7 @@ bool CDefaultFilter::GetSettings(SModuleSettings **sets, int *iCount) {
 }
 
 CDefaultFilter::CDefaultFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName)
-  : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, 1, szName) {
+  : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, szName) {
   m_pStartHandler = 0;
   m_pAutoSpeedControl = new CAutoSpeedControl(m_pEventHandler, m_pSettingsStore);
 
diff --git a/Src/DasherCore/DynamicFilter.cpp b/Src/DasherCore/DynamicFilter.cpp
index af6229f..bea055e 100644
--- a/Src/DasherCore/DynamicFilter.cpp
+++ b/Src/DasherCore/DynamicFilter.cpp
@@ -23,8 +23,8 @@
 
 using namespace Dasher;
 
-CDynamicFilter::CDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, int iType, const char *szName)
-  : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, iType, szName) {
+CDynamicFilter::CDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName)
+  : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, szName) {
   m_bDecorationChanged = true;
   m_bKeyDown = false;
   pause();
diff --git a/Src/DasherCore/DynamicFilter.h b/Src/DasherCore/DynamicFilter.h
index 7a94357..8b0f1b9 100644
--- a/Src/DasherCore/DynamicFilter.h
+++ b/Src/DasherCore/DynamicFilter.h
@@ -29,7 +29,7 @@ namespace Dasher {
 ///filter with three states: paused, reversing, running. Hold any button down to reverse.
 class CDynamicFilter : public CInputFilter {
  public:
-  CDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, int iType, const char *szName);
+  CDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName);
   
   virtual bool supportsPause() {return true;}
   
diff --git a/Src/DasherCore/InputFilter.h b/Src/DasherCore/InputFilter.h
index f6abf3b..87832a8 100644
--- a/Src/DasherCore/InputFilter.h
+++ b/Src/DasherCore/InputFilter.h
@@ -3,7 +3,7 @@
 
 #include "DasherView.h"
 #include "DasherModel.h"
-#include "DasherModule.h"
+#include "ModuleManager.h"
 #include "UserLogBase.h"
 
 namespace Dasher {
@@ -14,8 +14,8 @@ namespace Dasher {
 namespace Dasher {
 class CInputFilter : public CDasherModule {
  public:
-  CInputFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, int iType, const char *szName)
-    : CDasherModule(pEventHandler, pSettingsStore, iID, iType, szName) {
+  CInputFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName)
+    : CDasherModule(pEventHandler, pSettingsStore, iID, InputMethod, szName) {
     m_pInterface = pInterface;
   };
 
diff --git a/Src/DasherCore/OneButtonDynamicFilter.cpp b/Src/DasherCore/OneButtonDynamicFilter.cpp
index 6655a79..1ff85ca 100644
--- a/Src/DasherCore/OneButtonDynamicFilter.cpp
+++ b/Src/DasherCore/OneButtonDynamicFilter.cpp
@@ -41,7 +41,7 @@ static SModuleSettings sSettings[] = {
 };
 
 COneButtonDynamicFilter::COneButtonDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
-  : CButtonMultiPress(pEventHandler, pSettingsStore, pInterface, 6, 1, _("One Button Dynamic Mode")) {
+  : CButtonMultiPress(pEventHandler, pSettingsStore, pInterface, 6, _("One Button Dynamic Mode")) {
   m_iTarget = 0;
 
   m_iTargetX = new int[2];
diff --git a/Src/DasherCore/OneButtonFilter.cpp b/Src/DasherCore/OneButtonFilter.cpp
index f8b83d8..67c4cda 100644
--- a/Src/DasherCore/OneButtonFilter.cpp
+++ b/Src/DasherCore/OneButtonFilter.cpp
@@ -14,7 +14,7 @@ static SModuleSettings sSettings[] = {
 };
 
 COneButtonFilter::COneButtonFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
-  : CInputFilter(pEventHandler, pSettingsStore, pInterface, 9, 1, "Static One Button Mode") {
+  : CInputFilter(pEventHandler, pSettingsStore, pInterface, 9, "Static One Button Mode") {
 
   bStarted = 0;
   iLocation = 0;
diff --git a/Src/DasherCore/SocketInputBase.cpp b/Src/DasherCore/SocketInputBase.cpp
index e318f34..c21bf8d 100644
--- a/Src/DasherCore/SocketInputBase.cpp
+++ b/Src/DasherCore/SocketInputBase.cpp
@@ -35,7 +35,7 @@ static SModuleSettings sSettings[] = {
 };
 
 Dasher::CSocketInputBase::CSocketInputBase(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore) 
-  : CDasherInput(pEventHandler, pSettingsStore, 1, 0, _("Socket Input")) {
+  : CDasherInput(pEventHandler, pSettingsStore, 1, _("Socket Input")) {
   port = -1;
   debug_socket_input = false;
   readerRunning = false;
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp
index 8f49e88..869613b 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.cpp
+++ b/Src/DasherCore/TwoButtonDynamicFilter.cpp
@@ -49,7 +49,7 @@ static SModuleSettings sSettings[] = {
 };
 
 CTwoButtonDynamicFilter::CTwoButtonDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
-  : CButtonMultiPress(pEventHandler, pSettingsStore, pInterface, 14, 1, _("Two Button Dynamic Mode"))
+  : CButtonMultiPress(pEventHandler, pSettingsStore, pInterface, 14, _("Two Button Dynamic Mode"))
 {
   //ensure that m_dLagMul is properly initialised
   Dasher::CParameterNotificationEvent oEvent(LP_DYNAMIC_BUTTON_LAG);
diff --git a/Src/DasherCore/TwoPushDynamicFilter.cpp b/Src/DasherCore/TwoPushDynamicFilter.cpp
index a117ae8..3a5ae90 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.cpp
+++ b/Src/DasherCore/TwoPushDynamicFilter.cpp
@@ -44,7 +44,7 @@ static SModuleSettings sSettings[] = {
 };
 
 CTwoPushDynamicFilter::CTwoPushDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
-  : CDynamicFilter(pEventHandler, pSettingsStore, pInterface, 14, 1, _("Two-push Dynamic Mode (New One Button)")), m_dNatsSinceFirstPush(-std::numeric_limits<double>::infinity()) {
+  : CDynamicFilter(pEventHandler, pSettingsStore, pInterface, 14, _("Two-push Dynamic Mode (New One Button)")), m_dNatsSinceFirstPush(-std::numeric_limits<double>::infinity()) {
   
   Dasher::CParameterNotificationEvent oEvent(LP_TWO_PUSH_OUTER);//and all the others too!
   HandleEvent(&oEvent);
diff --git a/Src/Gtk2/joystick_input.h b/Src/Gtk2/joystick_input.h
index f95a7c7..7e6cf1e 100644
--- a/Src/Gtk2/joystick_input.h
+++ b/Src/Gtk2/joystick_input.h
@@ -16,7 +16,7 @@ using namespace Dasher;
 class CDasherJoystickInput : public CDasherInput {
 public:
   CDasherJoystickInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface) 
-    : CDasherInput(pEventHandler, pSettingsStore, 16, 0, "Joystick Input") {
+    : CDasherInput(pEventHandler, pSettingsStore, 16, "Joystick Input") {
 
     m_pInterface = pInterface;
     
@@ -113,7 +113,7 @@ private:
 class CDasherJoystickInputDiscrete : public CDasherInput {
 public:
   CDasherJoystickInputDiscrete(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface) 
-    : CDasherInput(pEventHandler, pSettingsStore, 17, 0, "Joystick Input (Discrete)") {
+    : CDasherInput(pEventHandler, pSettingsStore, 17, "Joystick Input (Discrete)") {
 
     m_pInterface = pInterface;
     iZone = -1;
@@ -241,7 +241,7 @@ private:
 class CDasher1DJoystickInput : public CDasherInput {
 public:
   CDasher1DJoystickInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface) 
-    : CDasherInput(pEventHandler, pSettingsStore, 18, 0, "Joystick Input (1D)") {
+    : CDasherInput(pEventHandler, pSettingsStore, 18, "Joystick Input (1D)") {
 
     m_pInterface = pInterface;
     iZone = -1;
diff --git a/Src/Gtk2/mouse_input.h b/Src/Gtk2/mouse_input.h
index 29c2be0..68b81a1 100644
--- a/Src/Gtk2/mouse_input.h
+++ b/Src/Gtk2/mouse_input.h
@@ -12,7 +12,7 @@ using namespace Dasher;
 class CDasherMouseInput : public CDasherInput {
 public:
   CDasherMouseInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore) 
-    : CDasherInput(pEventHandler, pSettingsStore, 0, 0, _("Mouse Input")) {
+    : CDasherInput(pEventHandler, pSettingsStore, 0, _("Mouse Input")) {
 
     m_iX = 0;
     m_iY = 0;
@@ -55,7 +55,7 @@ class CDasher1DMouseInput:public CDasherInput {
 public:
   CDasher1DMouseInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore) 
     /* TRANSLATORS: Only use the vertical mouse coordinate - this is prefered for some disabled users. */
-    : CDasherInput(pEventHandler, pSettingsStore, 2, 0, _("One Dimensional Mouse Input")) {
+    : CDasherInput(pEventHandler, pSettingsStore, 2, _("One Dimensional Mouse Input")) {
 
     m_iOffset = 0;
 
diff --git a/Src/Gtk2/tilt_input.h b/Src/Gtk2/tilt_input.h
index b72de69..99cfc58 100644
--- a/Src/Gtk2/tilt_input.h
+++ b/Src/Gtk2/tilt_input.h
@@ -48,7 +48,7 @@ using namespace Dasher;
 class CDasherTiltInput : public CDasherInput {
 public:
   CDasherTiltInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface) 
-    : CDasherInput(pEventHandler, pSettingsStore, 19, 0, "Tilt Input") {
+    : CDasherInput(pEventHandler, pSettingsStore, 19, "Tilt Input") {
 
     m_pInterface = pInterface;
     
diff --git a/Src/MacOSX/COSXMouseInput.h b/Src/MacOSX/COSXMouseInput.h
index 2ef4082..623294c 100644
--- a/Src/MacOSX/COSXMouseInput.h
+++ b/Src/MacOSX/COSXMouseInput.h
@@ -17,7 +17,7 @@ using namespace Dasher;
 class COSXMouseInput : public CDasherInput {
 public:
   COSXMouseInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore) 
-  : CDasherInput(pEventHandler, pSettingsStore, 0, 0, "Mouse Input") {
+  : CDasherInput(pEventHandler, pSettingsStore, 0, "Mouse Input") {
   };
   
   // Fill pCoordinates with iN coordinate values, return 0 if the
@@ -56,7 +56,7 @@ static SModuleSettings sSettings[] = {
 class COSX1DMouseInput:public CDasherInput {
 public:
   COSX1DMouseInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore) 
-  : CDasherInput(pEventHandler, pSettingsStore, 2, 0, "One Dimensional Mouse Input") {
+  : CDasherInput(pEventHandler, pSettingsStore, 2, "One Dimensional Mouse Input") {
     
     m_iOffset = 0;
   };
diff --git a/Src/Win32/BTSocketInput.cpp b/Src/Win32/BTSocketInput.cpp
index 3fa2b2f..77b22c8 100644
--- a/Src/Win32/BTSocketInput.cpp
+++ b/Src/Win32/BTSocketInput.cpp
@@ -32,7 +32,7 @@ static const int ymax = -32;
 // TODO: Probably incompatable with the socket server module
 
 CBTSocketInput::CBTSocketInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore)
-: CDasherInput(pEventHandler, pSettingsStore, 100, 0, "BT Tilt Socket"){
+: CDasherInput(pEventHandler, pSettingsStore, 100, "BT Tilt Socket"){
 }
 
 CBTSocketInput::~CBTSocketInput(void) {
diff --git a/Src/Win32/DasherMouseInput.cpp b/Src/Win32/DasherMouseInput.cpp
index e50e6eb..42875b2 100644
--- a/Src/Win32/DasherMouseInput.cpp
+++ b/Src/Win32/DasherMouseInput.cpp
@@ -15,7 +15,7 @@ static char THIS_FILE[] = __FILE__;
 #endif
 
 CDasherMouseInput::CDasherMouseInput(CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, HWND _hwnd)
-: CDasherInput(pEventHandler, pSettingsStore, 0, 0, "Mouse Input"), m_hwnd(_hwnd) {
+: CDasherInput(pEventHandler, pSettingsStore, 0, "Mouse Input"), m_hwnd(_hwnd) {
 }
 
 CDasherMouseInput::~CDasherMouseInput(void) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]