GNOME.org
 

[dasher] Remove empty DasherView.inl and move input filters into namespace Dasher.

commit b0c2eb55b42eeb15914d7f52806b84c225a1771a
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Mon Aug 10 10:15:05 2009 +0200

    Remove empty DasherView.inl and move input filters into namespace Dasher.
    DasherView.inl had contained a 'using namespace Dasher' directive,
    which had thus sneaked its way into many other header files via
    &hash;include, and removing that broke a lot of namespacing. (24-Jul-2009)

 ChangeLog                                   |    1 +
 Src/DasherCore/AutoSpeedControl.cpp         |    2 +
 Src/DasherCore/AutoSpeedControl.h           |    2 +
 Src/DasherCore/ButtonMultiPress.cpp         |    2 +
 Src/DasherCore/ButtonMultiPress.h           |    2 +
 Src/DasherCore/CircleStartHandler.cpp       |    2 +
 Src/DasherCore/CircleStartHandler.h         |    2 +
 Src/DasherCore/ClickFilter.cpp              |    2 +
 Src/DasherCore/ClickFilter.h                |    2 +
 Src/DasherCore/DasherButtons.cpp            |    3 +
 Src/DasherCore/DasherButtons.h              |    3 +-
 Src/DasherCore/DasherView.cpp               |    1 +
 Src/DasherCore/DasherView.h                 |    1 -
 Src/DasherCore/DasherView.inl               |   60 ---------------------------
 Src/DasherCore/DasherViewSquare.cpp         |    1 +
 Src/DasherCore/DefaultFilter.cpp            |    2 +
 Src/DasherCore/DefaultFilter.h              |    2 +
 Src/DasherCore/DynamicFilter.cpp            |    2 +
 Src/DasherCore/DynamicFilter.h              |    4 +-
 Src/DasherCore/EyetrackerFilter.cpp         |    2 +
 Src/DasherCore/EyetrackerFilter.h           |    2 +
 Src/DasherCore/InputFilter.h                |    3 +-
 Src/DasherCore/NodeCreationManager.cpp      |    2 +
 Src/DasherCore/OneButtonDynamicFilter.cpp   |    2 +
 Src/DasherCore/OneButtonDynamicFilter.h     |    2 +
 Src/DasherCore/OneButtonFilter.cpp          |    3 +
 Src/DasherCore/OneButtonFilter.h            |    2 +
 Src/DasherCore/OneDimensionalFilter.cpp     |    2 +
 Src/DasherCore/OneDimensionalFilter.h       |    2 +
 Src/DasherCore/StartHandler.h               |    2 +
 Src/DasherCore/StylusFilter.cpp             |    2 +
 Src/DasherCore/StylusFilter.h               |    2 +
 Src/DasherCore/TwoBoxStartHandler.cpp       |    2 +
 Src/DasherCore/TwoBoxStartHandler.h         |    2 +
 Src/DasherCore/TwoButtonDynamicFilter.cpp   |    2 +
 Src/DasherCore/TwoButtonDynamicFilter.h     |    2 +
 Src/DasherCore/TwoPushDynamicFilter.cpp     |    2 +
 Src/DasherCore/TwoPushDynamicFilter.h       |    3 +-
 Src/MacOSX/Dasher.xcodeproj/project.pbxproj |    4 --
 39 files changed, 71 insertions(+), 70 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e4963fe..a338a4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* Alphabet{,Map}: Optimise single byte UTF8 case.
 	* DasherView{,Square}: Remove b1D/bNonLinearity.
 	* MacOSX: Remove ZippyCache as DasherViewOpenGL makes no use of it.
+	* Remove empty DasherView.inl and move input filters into namespace Dasher.
 
 2009-08-08  Alan Lawrence <acl33 inf phy cam ac uk>
 
diff --git a/Src/DasherCore/AutoSpeedControl.cpp b/Src/DasherCore/AutoSpeedControl.cpp
index 68b5841..be487e2 100644
--- a/Src/DasherCore/AutoSpeedControl.cpp
+++ b/Src/DasherCore/AutoSpeedControl.cpp
@@ -22,6 +22,8 @@ double round(double dVal) {
 }
 #endif
 
+using namespace Dasher;
+
 CAutoSpeedControl::CAutoSpeedControl(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore) 
   : CDasherComponent(pEventHandler, pSettingsStore) {
   //scale #samples by #samples = m_dSamplesScale / (current bitrate) + m_dSampleOffset
diff --git a/Src/DasherCore/AutoSpeedControl.h b/Src/DasherCore/AutoSpeedControl.h
index 36d0b7b..2a184ff 100644
--- a/Src/DasherCore/AutoSpeedControl.h
+++ b/Src/DasherCore/AutoSpeedControl.h
@@ -9,6 +9,7 @@
 
 /// \defgroup AutoSpeed Auto speed control
 /// @{
+namespace Dasher {
 class CAutoSpeedControl : public Dasher::CDasherComponent {
  public:
   CAutoSpeedControl(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore);
@@ -82,6 +83,7 @@ class CAutoSpeedControl : public Dasher::CDasherComponent {
   double m_dSigma1, m_dSigma2, m_dMinRadius;
 
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/ButtonMultiPress.cpp b/Src/DasherCore/ButtonMultiPress.cpp
index 08aacd0..bff31eb 100644
--- a/Src/DasherCore/ButtonMultiPress.cpp
+++ b/Src/DasherCore/ButtonMultiPress.cpp
@@ -21,6 +21,8 @@
 #include "DasherInterfaceBase.h"
 #include "ButtonMultiPress.h"
 
+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) {
 }
diff --git a/Src/DasherCore/ButtonMultiPress.h b/Src/DasherCore/ButtonMultiPress.h
index faf4026..6893a9e 100644
--- a/Src/DasherCore/ButtonMultiPress.h
+++ b/Src/DasherCore/ButtonMultiPress.h
@@ -23,6 +23,7 @@
 
 #include "DynamicFilter.h"
 
+namespace Dasher {
 /// \ingroup InputFilter
 /// @{
 ///DynamicFilter which additionally starts reversing whenever a button is pushed enough times in a short interval
@@ -44,5 +45,6 @@ class CButtonMultiPress : public CDynamicFilter {
   int m_iQueueId;
   std::deque<int> m_deQueueTimes;
  };
+}
 
 #endif
diff --git a/Src/DasherCore/CircleStartHandler.cpp b/Src/DasherCore/CircleStartHandler.cpp
index 8453073..9ac296a 100644
--- a/Src/DasherCore/CircleStartHandler.cpp
+++ b/Src/DasherCore/CircleStartHandler.cpp
@@ -23,6 +23,8 @@
 #include "CircleStartHandler.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 CCircleStartHandler::CCircleStartHandler(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface) 
   : CStartHandler(pEventHandler, pSettingsStore, pInterface) {
   m_iStatus = -1;
diff --git a/Src/DasherCore/CircleStartHandler.h b/Src/DasherCore/CircleStartHandler.h
index ba76a80..21c2f55 100644
--- a/Src/DasherCore/CircleStartHandler.h
+++ b/Src/DasherCore/CircleStartHandler.h
@@ -4,6 +4,7 @@
 #include "StartHandler.h"
 /// \ingroup Start
 /// @{
+namespace Dasher {
 class CCircleStartHandler : public CStartHandler {
 public:
   CCircleStartHandler(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface);
@@ -18,6 +19,7 @@ private:
   int m_iCircleRadius;
   int m_iScreenRadius;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/ClickFilter.cpp b/Src/DasherCore/ClickFilter.cpp
index 289be35..c55347f 100644
--- a/Src/DasherCore/ClickFilter.cpp
+++ b/Src/DasherCore/ClickFilter.cpp
@@ -3,6 +3,8 @@
 #include "DasherInterfaceBase.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 static SModuleSettings sSettings[] = {
   {LP_MAXZOOM, T_LONG, 11, 400, 10, 1, _("Maximum Zoom")},
 };
diff --git a/Src/DasherCore/ClickFilter.h b/Src/DasherCore/ClickFilter.h
index 37a7c64..ff483c5 100644
--- a/Src/DasherCore/ClickFilter.h
+++ b/Src/DasherCore/ClickFilter.h
@@ -5,6 +5,7 @@
 
 /// \ingroup InputFilter
 /// @{
+namespace Dasher {
 class CClickFilter : public CInputFilter {
  public:
   CClickFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
@@ -18,6 +19,7 @@ class CClickFilter : public CInputFilter {
   virtual bool GetSettings(SModuleSettings **pSettings, int *iCount);
 
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/DasherButtons.cpp b/Src/DasherCore/DasherButtons.cpp
index 22c9988..0a00969 100644
--- a/Src/DasherCore/DasherButtons.cpp
+++ b/Src/DasherCore/DasherButtons.cpp
@@ -7,6 +7,7 @@
 
 
 #include "DasherButtons.h"
+#include "DasherScreen.h"
 #include <valarray>
 #include <iostream>
 
@@ -20,6 +21,8 @@ static char THIS_FILE[] = __FILE__;
 #endif
 #endif
 
+using namespace Dasher;
+
 static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode. */
   {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Zoom steps")},
diff --git a/Src/DasherCore/DasherButtons.h b/Src/DasherCore/DasherButtons.h
index 5b7b886..d7c05f2 100644
--- a/Src/DasherCore/DasherButtons.h
+++ b/Src/DasherCore/DasherButtons.h
@@ -17,7 +17,7 @@
 
 
 using namespace std;
-
+namespace Dasher {
 /// \ingroup Input
 /// @{
 class CDasherButtons : public CInputFilter
@@ -69,6 +69,7 @@ class CDasherButtons : public CInputFilter
   bool m_bDecorationChanged;
 
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
index 35ccf70..b9924e0 100644
--- a/Src/DasherCore/DasherView.cpp
+++ b/Src/DasherCore/DasherView.cpp
@@ -26,6 +26,7 @@
 #include "DasherView.h"
 #include "Event.h"
 #include "EventHandler.h"
+#include "DasherScreen.h"
 
 using namespace Dasher;
 
diff --git a/Src/DasherCore/DasherView.h b/Src/DasherCore/DasherView.h
index 8ed616c..934b4f4 100644
--- a/Src/DasherCore/DasherView.h
+++ b/Src/DasherCore/DasherView.h
@@ -204,6 +204,5 @@ private:
   bool m_bGameMode;
 };
 /// @}
-#include "DasherView.inl"
 
 #endif /* #ifndef __DasherView_h_ */
diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
index cfb75a4..bb064e5 100644
--- a/Src/DasherCore/DasherViewSquare.cpp
+++ b/Src/DasherCore/DasherViewSquare.cpp
@@ -27,6 +27,7 @@
 //#include "DasherGameMode.h"
 #include "DasherViewSquare.h"
 #include "DasherModel.h"
+#include "DasherScreen.h"
 #include "DasherView.h"
 #include "DasherTypes.h"
 #include "Event.h"
diff --git a/Src/DasherCore/DefaultFilter.cpp b/Src/DasherCore/DefaultFilter.cpp
index 9dc6f55..7af5d83 100644
--- a/Src/DasherCore/DefaultFilter.cpp
+++ b/Src/DasherCore/DefaultFilter.cpp
@@ -8,6 +8,8 @@
 
 #include <iostream>
 
+using namespace Dasher;
+
 CDefaultFilter::CDefaultFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName)
   : CInputFilter(pEventHandler, pSettingsStore, pInterface, iID, 1, szName) {
   m_pStartHandler = 0;
diff --git a/Src/DasherCore/DefaultFilter.h b/Src/DasherCore/DefaultFilter.h
index 05a14ee..063d0d7 100644
--- a/Src/DasherCore/DefaultFilter.h
+++ b/Src/DasherCore/DefaultFilter.h
@@ -5,6 +5,7 @@
 #include "AutoSpeedControl.h"
 #include "StartHandler.h"
 
+namespace Dasher {
 /// \ingroup InputFilter
 /// @{
 class CDefaultFilter : public CInputFilter {
@@ -30,6 +31,7 @@ class CDefaultFilter : public CInputFilter {
   CAutoSpeedControl *m_pAutoSpeedControl;
   CStartHandler *m_pStartHandler;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/DynamicFilter.cpp b/Src/DasherCore/DynamicFilter.cpp
index d83e449..081cdee 100644
--- a/Src/DasherCore/DynamicFilter.cpp
+++ b/Src/DasherCore/DynamicFilter.cpp
@@ -21,6 +21,8 @@
 #include "DasherInterfaceBase.h"
 #include "DynamicFilter.h"
 
+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) {
   m_bDecorationChanged = true;
diff --git a/Src/DasherCore/DynamicFilter.h b/Src/DasherCore/DynamicFilter.h
index db702b5..78388ee 100644
--- a/Src/DasherCore/DynamicFilter.h
+++ b/Src/DasherCore/DynamicFilter.h
@@ -25,7 +25,7 @@
 
 /// \ingroup InputFilter
 /// @{
-
+namespace Dasher {
 ///filter with three states: paused, reversing, running. Hold any button down to reverse.
 class CDynamicFilter : public CInputFilter {
  public:
@@ -63,5 +63,5 @@ class CDynamicFilter : public CInputFilter {
 	
     CUserLogBase *m_pUserLog;
 };
-
+}
 #endif
diff --git a/Src/DasherCore/EyetrackerFilter.cpp b/Src/DasherCore/EyetrackerFilter.cpp
index 778e655..8cd6ce5 100644
--- a/Src/DasherCore/EyetrackerFilter.cpp
+++ b/Src/DasherCore/EyetrackerFilter.cpp
@@ -3,6 +3,8 @@
 
 #include <iostream>
 
+using namespace Dasher;
+
 static SModuleSettings sSettings[] = {
   {BP_AUTOCALIBRATE, T_BOOL, -1, -1, -1, -1, _("Automatic calibration")}
 };
diff --git a/Src/DasherCore/EyetrackerFilter.h b/Src/DasherCore/EyetrackerFilter.h
index 7686a2c..b1e14f4 100644
--- a/Src/DasherCore/EyetrackerFilter.h
+++ b/Src/DasherCore/EyetrackerFilter.h
@@ -3,6 +3,7 @@
 
 #include "DefaultFilter.h"
 
+namespace Dasher {
 /// \ingroup InputFilter
 /// @{
 class CEyetrackerFilter : public CDefaultFilter {
@@ -24,6 +25,7 @@ class CEyetrackerFilter : public CDefaultFilter {
   int m_iCounter;
   int m_iFilterTimescale;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/InputFilter.h b/Src/DasherCore/InputFilter.h
index 790460b..3eb6649 100644
--- a/Src/DasherCore/InputFilter.h
+++ b/Src/DasherCore/InputFilter.h
@@ -9,9 +9,9 @@
 namespace Dasher {
   class CDasherInterfaceBase;
 }
-
 /// \defgroup InputFilter Input filters
 /// @{
+namespace Dasher {
 class CInputFilter : public CDasherModule {
  public:
   CInputFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, int iType, const char *szName)
@@ -45,6 +45,7 @@ class CInputFilter : public CDasherModule {
   virtual void KeyDown(int Time, int iId, CDasherView *pDasherView, CDasherModel *pModel, CUserLogBase *pUserLog) {};
   virtual void KeyUp(int Time, int iId, CDasherView *pDasherView, CDasherModel *pModel) {};
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/NodeCreationManager.cpp b/Src/DasherCore/NodeCreationManager.cpp
index b389b77..5781702 100644
--- a/Src/DasherCore/NodeCreationManager.cpp
+++ b/Src/DasherCore/NodeCreationManager.cpp
@@ -8,6 +8,8 @@
 #include "NodeCreationManager.h"
 #include "ControlManager.h"
 
+using namespace Dasher;
+
 CNodeCreationManager::CNodeCreationManager(Dasher::CDasherInterfaceBase *pInterface,
 					   Dasher::CEventHandler *pEventHandler, 
 					   CSettingsStore *pSettingsStore,
diff --git a/Src/DasherCore/OneButtonDynamicFilter.cpp b/Src/DasherCore/OneButtonDynamicFilter.cpp
index a5de472..25aa398 100644
--- a/Src/DasherCore/OneButtonDynamicFilter.cpp
+++ b/Src/DasherCore/OneButtonDynamicFilter.cpp
@@ -24,6 +24,8 @@
 #include "DasherInterfaceBase.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The time for which a button must be held before it counts as a 'long' (rather than short) press. */
   {LP_HOLD_TIME, T_LONG, 100, 10000, 1000, 100, _("Long press time")},
diff --git a/Src/DasherCore/OneButtonDynamicFilter.h b/Src/DasherCore/OneButtonDynamicFilter.h
index 461f2cc..0bb9b72 100644
--- a/Src/DasherCore/OneButtonDynamicFilter.h
+++ b/Src/DasherCore/OneButtonDynamicFilter.h
@@ -25,6 +25,7 @@
 
 /// \ingroup InputFilter
 /// @{
+namespace Dasher {
 class COneButtonDynamicFilter : public CButtonMultiPress {
  public:
   COneButtonDynamicFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface);
@@ -48,6 +49,7 @@ class COneButtonDynamicFilter : public CButtonMultiPress {
   int *m_iTargetX;
   int *m_iTargetY;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/OneButtonFilter.cpp b/Src/DasherCore/OneButtonFilter.cpp
index 472fb9b..d0db4b1 100644
--- a/Src/DasherCore/OneButtonFilter.cpp
+++ b/Src/DasherCore/OneButtonFilter.cpp
@@ -3,6 +3,9 @@
 
 #include "OneButtonFilter.h"
 #include "Event.h"
+#include "DasherScreen.h"
+
+using namespace Dasher;
 
 COneButtonFilter::COneButtonFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
   : CInputFilter(pEventHandler, pSettingsStore, pInterface, 9, 1, "One Button Mode") {
diff --git a/Src/DasherCore/OneButtonFilter.h b/Src/DasherCore/OneButtonFilter.h
index 82ef32d..0cdc9d2 100644
--- a/Src/DasherCore/OneButtonFilter.h
+++ b/Src/DasherCore/OneButtonFilter.h
@@ -3,6 +3,7 @@
 
 #include "InputFilter.h"
 
+namespace Dasher {
 /// \ingroup InputFilter
 /// @{
 class COneButtonFilter : public CInputFilter {
@@ -22,6 +23,7 @@ class COneButtonFilter : public CInputFilter {
   int iStartTime;
   int iLocation;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/OneDimensionalFilter.cpp b/Src/DasherCore/OneDimensionalFilter.cpp
index 89effa7..7159cd1 100644
--- a/Src/DasherCore/OneDimensionalFilter.cpp
+++ b/Src/DasherCore/OneDimensionalFilter.cpp
@@ -1,6 +1,8 @@
 #include "../Common/Common.h"
 #include "OneDimensionalFilter.h"
 
+using namespace Dasher;
+
 COneDimensionalFilter::COneDimensionalFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface)
   : CDefaultFilter(pEventHandler, pSettingsStore, pInterface, 4, _("One Dimensional Mode")) {
 }
diff --git a/Src/DasherCore/OneDimensionalFilter.h b/Src/DasherCore/OneDimensionalFilter.h
index 53030f9..e028d04 100644
--- a/Src/DasherCore/OneDimensionalFilter.h
+++ b/Src/DasherCore/OneDimensionalFilter.h
@@ -5,6 +5,7 @@
 
 /// \ingroup InputFilter
 /// @{
+namespace Dasher {
 class COneDimensionalFilter : public CDefaultFilter {
  public:
   COneDimensionalFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface);
@@ -15,6 +16,7 @@ class COneDimensionalFilter : public CDefaultFilter {
    int iLastY;
    int iOffset;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/StartHandler.h b/Src/DasherCore/StartHandler.h
index 440de5f..6c46fe0 100644
--- a/Src/DasherCore/StartHandler.h
+++ b/Src/DasherCore/StartHandler.h
@@ -3,6 +3,7 @@
 
 #include "DasherInterfaceBase.h"
 #include "DasherComponent.h"
+namespace Dasher {
 /// \defgroup Start Start handlers
 /// @{
 class CStartHandler : public CDasherComponent {
@@ -19,6 +20,7 @@ public:
 protected:
   CDasherInterfaceBase *m_pInterface;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/StylusFilter.cpp b/Src/DasherCore/StylusFilter.cpp
index c4162f8..391caef 100644
--- a/Src/DasherCore/StylusFilter.cpp
+++ b/Src/DasherCore/StylusFilter.cpp
@@ -3,6 +3,8 @@
 #include "DasherInterfaceBase.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 CStylusFilter::CStylusFilter(Dasher::CEventHandler *pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName)
   : CDefaultFilter(pEventHandler, pSettingsStore, pInterface, iID, szName) {
 }
diff --git a/Src/DasherCore/StylusFilter.h b/Src/DasherCore/StylusFilter.h
index baa2356..cb9392d 100644
--- a/Src/DasherCore/StylusFilter.h
+++ b/Src/DasherCore/StylusFilter.h
@@ -5,6 +5,7 @@
 
 /// \ingroup InputFilter
 /// @{
+namespace Dasher {
 class CStylusFilter : public CDefaultFilter {
  public:
   CStylusFilter(Dasher::CEventHandler * pEventHandler, CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, ModuleID_t iID, const char *szName);
@@ -12,6 +13,7 @@ class CStylusFilter : public CDefaultFilter {
   virtual void KeyDown(int iTime, int iId, CDasherView *pView, CDasherModel *pModel, CUserLogBase *pUserLog);
   virtual void KeyUp(int iTime, int iId, CDasherView *pView, CDasherModel *pModel);
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/TwoBoxStartHandler.cpp b/Src/DasherCore/TwoBoxStartHandler.cpp
index e4f6901..61c7510 100644
--- a/Src/DasherCore/TwoBoxStartHandler.cpp
+++ b/Src/DasherCore/TwoBoxStartHandler.cpp
@@ -1,6 +1,8 @@
 #include "TwoBoxStartHandler.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 CTwoBoxStartHandler::CTwoBoxStartHandler(Dasher::CEventHandler * pEventHandler, CSettingsStore * pSettingsStore, CDasherInterfaceBase *pInterface)
   : CStartHandler(pEventHandler, pSettingsStore, pInterface) {
   m_bInBox = false;
diff --git a/Src/DasherCore/TwoBoxStartHandler.h b/Src/DasherCore/TwoBoxStartHandler.h
index 4071b15..896d24a 100644
--- a/Src/DasherCore/TwoBoxStartHandler.h
+++ b/Src/DasherCore/TwoBoxStartHandler.h
@@ -3,6 +3,7 @@
 
 #include "StartHandler.h"
 
+namespace Dasher {
 /// \ingroup Start
 /// @{
 class CTwoBoxStartHandler : public CStartHandler {
@@ -18,6 +19,7 @@ public:
   int m_iBoxStart;
   bool m_bInBox;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp
index 5f9fbde..c001ffc 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.cpp
+++ b/Src/DasherCore/TwoButtonDynamicFilter.cpp
@@ -24,6 +24,8 @@
 #include "DasherInterfaceBase.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 static SModuleSettings sSettings[] = {
   {LP_TWO_BUTTON_OFFSET, T_LONG, 1024, 2048, 2048, 100, _("Button offset")},
   /* TRANSLATORS: The time for which a button must be held before it counts as a 'long' (rather than short) press. */
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.h b/Src/DasherCore/TwoButtonDynamicFilter.h
index a1b818b..ee35438 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.h
+++ b/Src/DasherCore/TwoButtonDynamicFilter.h
@@ -25,6 +25,7 @@
 
 #include <deque>
 
+namespace Dasher {
 /// \ingroup InputFilter
 /// @{
 class CTwoButtonDynamicFilter : public CButtonMultiPress {
@@ -61,6 +62,7 @@ class CTwoButtonDynamicFilter : public CButtonMultiPress {
   long m_lOffsetApplied;
   double m_dMulSinceFirstPush;
 };
+}
 /// @}
 
 #endif
diff --git a/Src/DasherCore/TwoPushDynamicFilter.cpp b/Src/DasherCore/TwoPushDynamicFilter.cpp
index 350639e..86a6805 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.cpp
+++ b/Src/DasherCore/TwoPushDynamicFilter.cpp
@@ -24,6 +24,8 @@
 #include "DasherInterfaceBase.h"
 #include "Event.h"
 
+using namespace Dasher;
+
 static SModuleSettings sSettings[] = {
   {LP_TWO_PUSH_OUTER, T_LONG, 1024, 2048, 2048, 128, _("Offset for outer (second) button")},
   {LP_TWO_PUSH_UP, T_LONG, 256, 2048, 2048/*divisor*/, 128/*step*/, _("Distance for 1st button UP")},
diff --git a/Src/DasherCore/TwoPushDynamicFilter.h b/Src/DasherCore/TwoPushDynamicFilter.h
index 00e1c91..34ee8d2 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.h
+++ b/Src/DasherCore/TwoPushDynamicFilter.h
@@ -22,7 +22,7 @@
 #define __TWO_PUSH_DYNAMIC_FILTER_H__
 
 #include "DynamicFilter.h"
-
+namespace Dasher {
 /// \ingroup InputFilter
 /// @{
 class CTwoPushDynamicFilter : public CDynamicFilter /*long push, but do our own "multi-push" detection*/ {
@@ -60,6 +60,7 @@ class CTwoPushDynamicFilter : public CDynamicFilter /*long push, but do our own
   int m_aiTarget[2];
   int m_aaiGuideAreas[2][2];
 };
+}
 /// @}
 
 #endif
diff --git a/Src/MacOSX/Dasher.xcodeproj/project.pbxproj b/Src/MacOSX/Dasher.xcodeproj/project.pbxproj
index 6f3b68d..d5f842c 100755
--- a/Src/MacOSX/Dasher.xcodeproj/project.pbxproj
+++ b/Src/MacOSX/Dasher.xcodeproj/project.pbxproj
@@ -75,7 +75,6 @@
 		1948BEDA0C226CFD001DFA32 /* DasherTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1948BE340C226CFD001DFA32 /* DasherTypes.h */; };
 		1948BEDB0C226CFD001DFA32 /* DasherView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1948BE350C226CFD001DFA32 /* DasherView.cpp */; };
 		1948BEDC0C226CFD001DFA32 /* DasherView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1948BE360C226CFD001DFA32 /* DasherView.h */; };
-		1948BEDD0C226CFD001DFA32 /* DasherView.inl in Resources */ = {isa = PBXBuildFile; fileRef = 1948BE370C226CFD001DFA32 /* DasherView.inl */; };
 		1948BEDE0C226CFD001DFA32 /* DasherViewSquare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1948BE380C226CFD001DFA32 /* DasherViewSquare.cpp */; };
 		1948BEDF0C226CFD001DFA32 /* DasherViewSquare.h in Headers */ = {isa = PBXBuildFile; fileRef = 1948BE390C226CFD001DFA32 /* DasherViewSquare.h */; };
 		1948BEE00C226CFD001DFA32 /* DasherViewSquare.inl in Resources */ = {isa = PBXBuildFile; fileRef = 1948BE3A0C226CFD001DFA32 /* DasherViewSquare.inl */; };
@@ -478,7 +477,6 @@
 		1948BE340C226CFD001DFA32 /* DasherTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DasherTypes.h; sourceTree = "<group>"; };
 		1948BE350C226CFD001DFA32 /* DasherView.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DasherView.cpp; sourceTree = "<group>"; };
 		1948BE360C226CFD001DFA32 /* DasherView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DasherView.h; sourceTree = "<group>"; };
-		1948BE370C226CFD001DFA32 /* DasherView.inl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DasherView.inl; sourceTree = "<group>"; };
 		1948BE380C226CFD001DFA32 /* DasherViewSquare.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DasherViewSquare.cpp; sourceTree = "<group>"; };
 		1948BE390C226CFD001DFA32 /* DasherViewSquare.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DasherViewSquare.h; sourceTree = "<group>"; };
 		1948BE3A0C226CFD001DFA32 /* DasherViewSquare.inl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DasherViewSquare.inl; sourceTree = "<group>"; };
@@ -983,7 +981,6 @@
 				1948BE340C226CFD001DFA32 /* DasherTypes.h */,
 				1948BE350C226CFD001DFA32 /* DasherView.cpp */,
 				1948BE360C226CFD001DFA32 /* DasherView.h */,
-				1948BE370C226CFD001DFA32 /* DasherView.inl */,
 				1948BE380C226CFD001DFA32 /* DasherViewSquare.cpp */,
 				1948BE390C226CFD001DFA32 /* DasherViewSquare.h */,
 				1948BE3A0C226CFD001DFA32 /* DasherViewSquare.inl */,
@@ -1570,7 +1567,6 @@
 				1974FE440714861B00B95DA0 /* DasherApp.icns in Resources */,
 				1974FE5A0714861B00B95DA0 /* Credits.html in Resources */,
 				198EC6D5071493BB00474B38 /* MainMenu.nib in Resources */,
-				1948BEDD0C226CFD001DFA32 /* DasherView.inl in Resources */,
 				1948BEE00C226CFD001DFA32 /* DasherViewSquare.inl in Resources */,
 				19BEF35C0C228F7300275D06 /* alphabet-nest.xsl in Resources */,
 				19BEF35D0C228F7300275D06 /* alphabet-nest2.xsl in Resources */,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]