[dasher] White space to keep gcc happy, and typos.

[Patrick Welche <pwelche src gnome org>]

commit 87671b84a0fa34120db6b3cc787f7acdd0db22e9
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Jul 2 14:01:45 2009 +0100

    White space to keep gcc happy, and typos.

 ChangeLog                                 |    4 ++++
 Src/DasherCore/ButtonMultiPress.cpp       |    8 ++++----
 Src/DasherCore/ConversionManager.cpp      |    6 +++---
 Src/DasherCore/DasherModel.cpp            |    1 -
 Src/DasherCore/DasherModel.h              |    2 +-
 Src/DasherCore/Parameters.h               |    2 +-
 Src/DasherCore/TwoButtonDynamicFilter.cpp |    2 +-
 Src/DasherCore/TwoPushDynamicFilter.h     |    2 +-
 8 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7ba826c..6db7146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-02  Patrick Welche <prlw1 cam ac uk>
+
+	* White space to keep gcc happy, and typos.
+
 2009-07-02  Alan Lawrence <acl33 inf phy cam ac uk>
 
 	* Remove global 'using namespace Dasher' from top-level of header
diff --git a/Src/DasherCore/ButtonMultiPress.cpp b/Src/DasherCore/ButtonMultiPress.cpp
index ace0652..08aacd0 100644
--- a/Src/DasherCore/ButtonMultiPress.cpp
+++ b/Src/DasherCore/ButtonMultiPress.cpp
@@ -51,10 +51,10 @@ void CButtonMultiPress::KeyDown(int iTime, int iId, CDasherView *pView, CDasherM
     m_deQueueTimes.clear(); //clear record of previous, different, button
     m_iQueueId = iId;
   }
-   
-  //record press...
+
+  // Record press...
   m_deQueueTimes.push_back(iTime);
-  //...and process normally; if it changes the state, pause()/reverse()'ll clear the queue
+  // ... and process normally; if it changes the state, pause()/reverse()'ll clear the queue
   CDynamicFilter::KeyDown(iTime, iId, pView, pModel, pUserLog);
 }
 
@@ -79,4 +79,4 @@ void CButtonMultiPress::run(int newState)
   }
   CDynamicFilter::run(newState);
   m_deQueueTimes.clear();
-}
\ No newline at end of file
+}
diff --git a/Src/DasherCore/ConversionManager.cpp b/Src/DasherCore/ConversionManager.cpp
index 21b2b35..5ac3223 100644
--- a/Src/DasherCore/ConversionManager.cpp
+++ b/Src/DasherCore/ConversionManager.cpp
@@ -18,8 +18,8 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif 
 
 #include "ConversionManager.h"
@@ -372,7 +372,7 @@ void CConversionManager::PopulateChildren( CDasherNode *pNode ) {
 
   }
 
-  else {//End of conversion -> defalt to alphabet
+  else {//End of conversion -> default to alphabet
    
       //Phil//
       // TODO: Placeholder algorithm here
diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index e646aff..64fe4d8 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -1028,7 +1028,6 @@ void CDasherModel::Offset(int iOffset) {
 } 
 
 void CDasherModel::AbortOffset() {
-  
   m_Rootmin += m_iDisplayOffset;
   m_Rootmax += m_iDisplayOffset;
 
diff --git a/Src/DasherCore/DasherModel.h b/Src/DasherCore/DasherModel.h
index 4b273dd..a6215f8 100644
--- a/Src/DasherCore/DasherModel.h
+++ b/Src/DasherCore/DasherModel.h
@@ -231,7 +231,7 @@ class Dasher::CDasherModel:public CFrameRate, private NoClones
 
   // Offset used when presenting the model to the user, specified as
   // Displayed rootmin/max - actual rootmin/rootmax
-  myint m_iDisplayOffset; 
+  myint m_iDisplayOffset;
 
   CDasherNode *m_pLastOutput;
 
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index ed0358d..9100f58 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -43,7 +43,7 @@ enum {
   BP_BUTTONDIRECT, BP_BUTTONFOURDIRECT, BP_BUTTONALTERNATINGDIRECT,
   BP_COMPASSMODE, BP_SOCKET_INPUT_ENABLE, BP_SOCKET_DEBUG, 
   BP_OLD_STYLE_PUSH, BP_CIRCLE_START, BP_GLOBAL_KEYBOARD, 
-  BP_SMOOTH_OFFSET, BP_CONVERSION_MODE, BP_PAUSE_OUTSIDE, BP_BACKOFF_BUTTON, 
+  BP_SMOOTH_OFFSET, BP_CONVERSION_MODE, BP_PAUSE_OUTSIDE, BP_BACKOFF_BUTTON,
   BP_TWOBUTTON_REVERSE, BP_2B_INVERT_DOUBLE, BP_SLOW_START, BP_FIXED_MARKERS, END_OF_BPS
 };
 
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp
index 19beeb8..30efe94 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.cpp
+++ b/Src/DasherCore/TwoButtonDynamicFilter.cpp
@@ -130,7 +130,7 @@ void CTwoButtonDynamicFilter::Event(int iTime, int iButton, int iType, CDasherMo
   }
   CDynamicFilter::Event(iTime, iButton, iType, pModel, pUserLog);
 }
-    
+
 void CTwoButtonDynamicFilter::ApplyOffset(CDasherModel *pModel, long lOffset)
 {
   lOffset *= m_dMulSinceFirstPush; m_dMulSinceFirstPush = 1.0;
diff --git a/Src/DasherCore/TwoPushDynamicFilter.h b/Src/DasherCore/TwoPushDynamicFilter.h
index cd705d6..d79ef75 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.h
+++ b/Src/DasherCore/TwoPushDynamicFilter.h
@@ -57,4 +57,4 @@ class CTwoPushDynamicFilter : public CDynamicFilter /*long push, but do our own
 };
 /// @}
 
-#endif
\ No newline at end of file
+#endif