GNOME.org
 

[dasher] pedantic

commit c4036ae5553f635fcd8c76a2e68655bffbee580a
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Mon Sep 27 16:02:30 2010 +0100

    pedantic

 Src/Common/Types/int.h                             |    2 +-
 Src/DasherCore/ActionButton.h                      |    2 +-
 Src/DasherCore/Alphabet/AlphInfo.cpp               |    2 +-
 Src/DasherCore/AlphabetManager.cpp                 |    8 ++++----
 Src/DasherCore/AlternatingDirectMode.cpp           |    2 +-
 Src/DasherCore/ButtonMode.cpp                      |    2 +-
 Src/DasherCore/ClickFilter.cpp                     |    2 +-
 Src/DasherCore/CompassMode.cpp                     |    2 +-
 Src/DasherCore/DasherComponent.cpp                 |   12 +++++++++---
 Src/DasherCore/DasherComponent.h                   |    2 +-
 Src/DasherCore/DasherInterfaceBase.cpp             |    6 +++---
 Src/DasherCore/DasherNode.h                        |    2 +-
 Src/DasherCore/DelayedDraw.h                       |    2 +-
 Src/DasherCore/EyetrackerFilter.cpp                |    3 +--
 Src/DasherCore/GnomeSettingsStore.cpp              |   17 ++++++++---------
 .../LanguageModelling/CTWLanguageModel.cpp         |    3 +--
 .../LanguageModelling/PPMLanguageModel.cpp         |    8 ++++----
 .../LanguageModelling/PPMPYLanguageModel.cpp       |    8 ++++----
 Src/DasherCore/MandarinAlphMgr.cpp                 |    2 +-
 Src/DasherCore/NodeCreationManager.h               |    2 +-
 Src/DasherCore/OneButtonDynamicFilter.cpp          |    2 +-
 Src/DasherCore/OneButtonFilter.cpp                 |    2 +-
 Src/DasherCore/SettingsStore.cpp                   |   12 ++++++------
 Src/DasherCore/SocketInputBase.cpp                 |    2 +-
 Src/DasherCore/TrainingHelper.h                    |    2 +-
 Src/DasherCore/TwoButtonDynamicFilter.cpp          |    2 +-
 Src/DasherCore/TwoPushDynamicFilter.cpp            |    5 ++---
 27 files changed, 59 insertions(+), 57 deletions(-)
---
diff --git a/Src/Common/Types/int.h b/Src/Common/Types/int.h
index 163fc1a..9cff196 100644
--- a/Src/Common/Types/int.h
+++ b/Src/Common/Types/int.h
@@ -44,6 +44,6 @@ const int64 int64_min = LLONG_MIN;
 
 template < class T > inline bool AreDifferentSigns(T lhs, T rhs) {
   return ((lhs ^ rhs) < 0);
-};
+}
 
 #endif
diff --git a/Src/DasherCore/ActionButton.h b/Src/DasherCore/ActionButton.h
index e700ff9..76bd3b6 100644
--- a/Src/DasherCore/ActionButton.h
+++ b/Src/DasherCore/ActionButton.h
@@ -7,7 +7,7 @@
 
 namespace Dasher {
   class CDasherInterfaceBase;
-};
+}
 
 /// \defgroup ActionButtons Action Buttons
 /// @{
diff --git a/Src/DasherCore/Alphabet/AlphInfo.cpp b/Src/DasherCore/Alphabet/AlphInfo.cpp
index 96c04ed..93fc3f3 100644
--- a/Src/DasherCore/Alphabet/AlphInfo.cpp
+++ b/Src/DasherCore/Alphabet/AlphInfo.cpp
@@ -118,4 +118,4 @@ CAlphInfo::character::character() {
   Text="";
   Colour=-1;
   Foreground="";
-}
\ No newline at end of file
+}
diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index 6018540..793b3a0 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -65,22 +65,22 @@ CAlphabetManager::~CAlphabetManager() {
 
 CAlphabetManager::CAlphNode::CAlphNode(CDasherNode *pParent, int iOffset, unsigned int iLbnd, unsigned int iHbnd, int iColour, const string &strDisplayText, CAlphabetManager *pMgr)
 : CDasherNode(pParent, iOffset, iLbnd, iHbnd, iColour, strDisplayText), m_pProbInfo(NULL), m_pMgr(pMgr) {
-};
+}
 
 CAlphabetManager::CSymbolNode::CSymbolNode(CDasherNode *pParent, int iOffset, unsigned int iLbnd, unsigned int iHbnd, CAlphabetManager *pMgr, symbol _iSymbol)
 : CAlphNode(pParent, iOffset, iLbnd, iHbnd, pMgr->m_pAlphabet->GetColour(_iSymbol, iOffset%2), pMgr->m_pAlphabet->GetDisplayText(_iSymbol), pMgr), iSymbol(_iSymbol) {
-};
+}
 
 CAlphabetManager::CSymbolNode::CSymbolNode(CDasherNode *pParent, int iOffset, unsigned int iLbnd, unsigned int iHbnd, int iColour, const string &strDisplayText, CAlphabetManager *pMgr, symbol _iSymbol)
 : CAlphNode(pParent, iOffset, iLbnd, iHbnd, iColour, strDisplayText, pMgr), iSymbol(_iSymbol) {
-};
+}
 
 CAlphabetManager::CGroupNode::CGroupNode(CDasherNode *pParent, int iOffset, unsigned int iLbnd, unsigned int iHbnd, CAlphabetManager *pMgr, const SGroupInfo *pGroup)
 : CAlphNode(pParent, iOffset, iLbnd, iHbnd,
             pGroup ? (pGroup->bVisible ? pGroup->iColour : pParent->getColour())
             : iOffset%2 == 1 ? 140 : 10, //special case - was AlphInfo::GetColour for symbol _0_
             pGroup ? pGroup->strLabel : "", pMgr), m_pGroup(pGroup) {
-};
+}
 
 CAlphabetManager::CSymbolNode *CAlphabetManager::makeSymbol(CDasherNode *pParent, int iOffset, unsigned int iLbnd, unsigned int iHbnd, symbol iSymbol) {
   return new CSymbolNode(pParent, iOffset, iLbnd, iHbnd, this, iSymbol);
diff --git a/Src/DasherCore/AlternatingDirectMode.cpp b/Src/DasherCore/AlternatingDirectMode.cpp
index 2ee76d4..f251bbf 100644
--- a/Src/DasherCore/AlternatingDirectMode.cpp
+++ b/Src/DasherCore/AlternatingDirectMode.cpp
@@ -120,4 +120,4 @@ bool CAlternatingDirectMode::GetSettings(SModuleSettings **pSettings, int *iCoun
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/ButtonMode.cpp b/Src/DasherCore/ButtonMode.cpp
index 1e48079..176f746 100644
--- a/Src/DasherCore/ButtonMode.cpp
+++ b/Src/DasherCore/ButtonMode.cpp
@@ -234,4 +234,4 @@ bool CButtonMode::GetSettings(SModuleSettings **pSettings, int *iCount) {
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/ClickFilter.cpp b/Src/DasherCore/ClickFilter.cpp
index 61165e3..c403519 100644
--- a/Src/DasherCore/ClickFilter.cpp
+++ b/Src/DasherCore/ClickFilter.cpp
@@ -89,4 +89,4 @@ bool CClickFilter::GetSettings(SModuleSettings **pSettings, int *iCount) {
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/CompassMode.cpp b/Src/DasherCore/CompassMode.cpp
index f40223e..8e70f7c 100644
--- a/Src/DasherCore/CompassMode.cpp
+++ b/Src/DasherCore/CompassMode.cpp
@@ -139,4 +139,4 @@ bool CCompassMode::GetSettings(SModuleSettings **pSettings, int *iCount) {
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/DasherComponent.cpp b/Src/DasherCore/DasherComponent.cpp
index 86ffa84..991d9b7 100644
--- a/Src/DasherCore/DasherComponent.cpp
+++ b/Src/DasherCore/DasherComponent.cpp
@@ -10,32 +10,37 @@ CDasherComponent::CDasherComponent(CEventHandler * pEventHandler, CSettingsStore
   :m_pEventHandler(pEventHandler), m_pSettingsStore(pSettingsStore) {
   if (m_pEventHandler != NULL)
     m_pEventHandler->RegisterListener(this);
+}
 
-};
 CDasherComponent::~CDasherComponent() {
   if (m_pEventHandler != NULL)
     m_pEventHandler->UnregisterListener(this);
-};
+}
 
 void CDasherComponent::InsertEvent(CEvent * pEvent) {
   m_pEventHandler->InsertEvent(pEvent);
-};
+}
 
 bool CDasherComponent::GetBoolParameter(int iParameter) const {
   return m_pSettingsStore->GetBoolParameter(iParameter);
 }
+
 long CDasherComponent::GetLongParameter(int iParameter) const {
   return m_pSettingsStore->GetLongParameter(iParameter);
 }
+
 std::string CDasherComponent::GetStringParameter(int iParameter)const {
   return m_pSettingsStore->GetStringParameter(iParameter);
 }
+
 void CDasherComponent::SetBoolParameter(int iParameter, bool bValue) const {
   m_pSettingsStore->SetBoolParameter(iParameter, bValue);
 }
+
 void CDasherComponent::SetLongParameter(int iParameter, long lValue) const {
   m_pSettingsStore->SetLongParameter(iParameter, lValue);
 }
+
 void CDasherComponent::SetStringParameter(int iParameter, const std::string & sValue) const {
   m_pSettingsStore->SetStringParameter(iParameter, sValue);
 }
@@ -45,6 +50,7 @@ ParameterType CDasherComponent::GetParameterType(int iParameter) const {
     return m_pSettingsStore->GetParameterType(iParameter);
   return ParamInvalid;
 }
+
 std::string CDasherComponent::GetParameterName(int iParameter) const {
   if (m_pSettingsStore != NULL)
     return m_pSettingsStore->GetParameterName(iParameter);
diff --git a/Src/DasherCore/DasherComponent.h b/Src/DasherCore/DasherComponent.h
index 0d8b24b..33c5a37 100644
--- a/Src/DasherCore/DasherComponent.h
+++ b/Src/DasherCore/DasherComponent.h
@@ -6,7 +6,7 @@ namespace Dasher {
   class CEvent;
   class CEventHandler;
   class CDasherComponent;
-};
+}
 
 /// \ingroup Core
 /// @{
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index 7ad448e..ee38ebd 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -803,16 +803,16 @@ void CDasherInterfaceBase::DisconnectNode(int iChild, int iParent) {
 
 void CDasherInterfaceBase::SetBoolParameter(int iParameter, bool bValue) {
   m_pSettingsStore->SetBoolParameter(iParameter, bValue);
-};
+}
 
 void CDasherInterfaceBase::SetLongParameter(int iParameter, long lValue) {
   m_pSettingsStore->SetLongParameter(iParameter, lValue);
-};
+}
 
 void CDasherInterfaceBase::SetStringParameter(int iParameter, const std::string & sValue) {
   PreSetNotify(iParameter, sValue);
   m_pSettingsStore->SetStringParameter(iParameter, sValue);
-};
+}
 
 bool CDasherInterfaceBase::GetBoolParameter(int iParameter) {
   return m_pSettingsStore->GetBoolParameter(iParameter);
diff --git a/Src/DasherCore/DasherNode.h b/Src/DasherCore/DasherNode.h
index 51e2d83..b6f4f4a 100644
--- a/Src/DasherCore/DasherNode.h
+++ b/Src/DasherCore/DasherNode.h
@@ -30,7 +30,7 @@
 namespace Dasher {
   class CDasherNode;
   class CDasherInterfaceBase;
-};
+}
 #include <deque>
 #include <iostream>
 #include <vector>
diff --git a/Src/DasherCore/DelayedDraw.h b/Src/DasherCore/DelayedDraw.h
index 2a9a085..fe9253d 100644
--- a/Src/DasherCore/DelayedDraw.h
+++ b/Src/DasherCore/DelayedDraw.h
@@ -58,6 +58,6 @@ namespace Dasher {
     std::vector < CTextString > m_DrawTextString;
   };
   /// @}
-};
+}
 
 #endif
diff --git a/Src/DasherCore/EyetrackerFilter.cpp b/Src/DasherCore/EyetrackerFilter.cpp
index 43018ff..1b9e6c6 100644
--- a/Src/DasherCore/EyetrackerFilter.cpp
+++ b/Src/DasherCore/EyetrackerFilter.cpp
@@ -27,11 +27,10 @@ bool CEyetrackerFilter::GetSettings(SModuleSettings **pSettings, int *iCount) {
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
 
 void CEyetrackerFilter::ApplyTransform(myint &iDasherX, myint &iDasherY) {
   
-  
   // Y co-ordinate...
   myint dasherOY=(myint)GetLongParameter(LP_OY); 
   double double_y = ((iDasherY-dasherOY)/(double)(dasherOY) ); // Fraction above the crosshair
diff --git a/Src/DasherCore/GnomeSettingsStore.cpp b/Src/DasherCore/GnomeSettingsStore.cpp
index 841a8fe..a9ea54d 100644
--- a/Src/DasherCore/GnomeSettingsStore.cpp
+++ b/Src/DasherCore/GnomeSettingsStore.cpp
@@ -26,14 +26,13 @@ CGnomeSettingsStore::CGnomeSettingsStore(Dasher::CEventHandler *pEventHandler):C
 #endif
 
   LoadPersistent();
-};
+}
 
 CGnomeSettingsStore::~CGnomeSettingsStore() {
 #ifdef WITH_GCONF
   g_object_unref(the_gconf_client);
 #endif
-
-};
+}
 
 bool CGnomeSettingsStore::LoadSetting(const std::string &Key, bool *Value) {
 #ifdef WITH_GCONF
@@ -56,7 +55,7 @@ bool CGnomeSettingsStore::LoadSetting(const std::string &Key, bool *Value) {
 #else
   return false;
 #endif
-};
+}
 
 bool CGnomeSettingsStore::LoadSetting(const std::string &Key, long *Value) {
 #ifdef WITH_GCONF
@@ -79,7 +78,7 @@ bool CGnomeSettingsStore::LoadSetting(const std::string &Key, long *Value) {
 #else
   return false;
 #endif
-};
+}
 
 bool CGnomeSettingsStore::LoadSetting(const std::string &Key, std::string *Value) {
 #ifdef WITH_GCONF
@@ -102,7 +101,7 @@ bool CGnomeSettingsStore::LoadSetting(const std::string &Key, std::string *Value
 #else
   return false;
 #endif
-};
+}
 
 void CGnomeSettingsStore::SaveSetting(const std::string &Key, bool Value) {
 #ifdef WITH_GCONF
@@ -114,7 +113,7 @@ void CGnomeSettingsStore::SaveSetting(const std::string &Key, bool Value) {
 
   gconf_client_set_bool(the_gconf_client, keypath, Value, &the_error);
 #endif
-};
+}
 
 void CGnomeSettingsStore::SaveSetting(const std::string &Key, long Value) {
 #ifdef WITH_GCONF
@@ -126,7 +125,7 @@ void CGnomeSettingsStore::SaveSetting(const std::string &Key, long Value) {
 
   gconf_client_set_int(the_gconf_client, keypath, Value, &the_error);
 #endif
-};
+}
 
 void CGnomeSettingsStore::SaveSetting(const std::string &Key, const std::string &Value) {
 #ifdef WITH_GCONF
@@ -138,7 +137,7 @@ void CGnomeSettingsStore::SaveSetting(const std::string &Key, const std::string
 
   gconf_client_set_string(the_gconf_client, keypath, Value.c_str(), &the_error);
 #endif
-};
+}
 
 #ifdef WITH_GCONF
 void CGnomeSettingsStore::NotificationCallback(GConfClient *pClient, guint iCNXN_ID, GConfEntry *pEntry) {
diff --git a/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp b/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
index 62e1989..93911cd 100644
--- a/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
+++ b/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
@@ -576,5 +576,4 @@ inline CLanguageModel::Context CCTWLanguageModel::CloneContext(Context Copy) {
 
 inline void CCTWLanguageModel::ReleaseContext(Context release) {
 	  delete (CCTWContext *) release;
-};
-
+}
diff --git a/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp b/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp
index 07c3fc4..1b88416 100644
--- a/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp
+++ b/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp
@@ -484,7 +484,7 @@ bool CPPMLanguageModel::WriteToFile(std::string strFilename) {
   oOutputFile.close();
 
   return false;
-};
+}
 
 bool CPPMLanguageModel::RecursiveWrite(CPPMnode *pNode, CPPMnode *pNextSibling, std::map<CPPMnode *, int> *pmapIdx, int *pNextIdx, std::ofstream *pOutputFile) {
 
@@ -513,7 +513,7 @@ bool CPPMLanguageModel::RecursiveWrite(CPPMnode *pNode, CPPMnode *pNextSibling,
   }
 
   return true;
-};
+}
 
 int CPPMLanguageModel::GetIndex(CPPMnode *pAddr, std::map<CPPMnode *, int> *pmapIdx, int *pNextIdx) {
 
@@ -533,7 +533,7 @@ int CPPMLanguageModel::GetIndex(CPPMnode *pAddr, std::map<CPPMnode *, int> *pmap
     }
   }
   return iIndex;
-};
+}
 
 bool CPPMLanguageModel::ReadFromFile(std::string strFilename) {
   
@@ -580,7 +580,7 @@ bool CPPMLanguageModel::ReadFromFile(std::string strFilename) {
   oInputFile.close();
 
   return false;
-};
+}
 
 CPPMLanguageModel::CPPMnode *CPPMLanguageModel::GetAddress(int iIndex, std::map<int, CPPMnode*> *pMap) {
   if (iIndex==0) return NULL;
diff --git a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
index 1dae797..6115fc9 100644
--- a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
+++ b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
@@ -865,7 +865,7 @@ bool CPPMPYLanguageModel::WriteToFile(std::string strFilename) {
   oOutputFile.close();
 
   return false;
-};
+}
 
 //Mandarin - PY not enabled for these read-write functions
 bool CPPMPYLanguageModel::RecursiveWrite(CPPMPYnode *pNode, std::map<CPPMPYnode *, int> *pmapIdx, int *pNextIdx, std::ofstream *pOutputFile) {
@@ -892,7 +892,7 @@ bool CPPMPYLanguageModel::RecursiveWrite(CPPMPYnode *pNode, std::map<CPPMPYnode
   }
 
   return true;
-};
+}
 
 int CPPMPYLanguageModel::GetIndex(CPPMPYnode *pAddr, std::map<CPPMPYnode *, int> *pmapIdx, int *pNextIdx) {
   std::cout<<"GetIndex gets called?"<<std::endl;
@@ -912,7 +912,7 @@ int CPPMPYLanguageModel::GetIndex(CPPMPYnode *pAddr, std::map<CPPMPYnode *, int>
     }
   }
   return iIndex;
-};
+}
 
 
 //Mandarin - PY not enabled for these read-write functions
@@ -943,7 +943,7 @@ bool CPPMPYLanguageModel::ReadFromFile(std::string strFilename) {
   oInputFile.close();
 
   return false;
-};
+}
 
 CPPMPYLanguageModel::CPPMPYnode *CPPMPYLanguageModel::GetAddress(int iIndex, std::map<int, CPPMPYnode*> *pMap) {
 
diff --git a/Src/DasherCore/MandarinAlphMgr.cpp b/Src/DasherCore/MandarinAlphMgr.cpp
index 5819ff2..ab1dd34 100644
--- a/Src/DasherCore/MandarinAlphMgr.cpp
+++ b/Src/DasherCore/MandarinAlphMgr.cpp
@@ -258,7 +258,7 @@ int CMandarinAlphMgr::AssignColour(int parentClr, int childIndex) {
     return colourStore[1][childIndex%3];
   else 
     return colourStore[0][childIndex%3]; 
-};
+}
 
 
 CLanguageModel::Context CMandarinAlphMgr::CreateSymbolContext(CAlphNode *pParent, symbol iSymbol)
diff --git a/Src/DasherCore/NodeCreationManager.h b/Src/DasherCore/NodeCreationManager.h
index 274f2cc..7f2157b 100644
--- a/Src/DasherCore/NodeCreationManager.h
+++ b/Src/DasherCore/NodeCreationManager.h
@@ -18,7 +18,7 @@ namespace Dasher {
   class CDasherNode;
   class CDasherInterfaceBase;
   class CControlManager;
-};
+}
 //TODO why is CNodeCreationManager _not_ in namespace Dasher?!?!
 /// \ingroup Model
 /// @{
diff --git a/Src/DasherCore/OneButtonDynamicFilter.cpp b/Src/DasherCore/OneButtonDynamicFilter.cpp
index ed452ca..d78f0e7 100644
--- a/Src/DasherCore/OneButtonDynamicFilter.cpp
+++ b/Src/DasherCore/OneButtonDynamicFilter.cpp
@@ -145,4 +145,4 @@ bool COneButtonDynamicFilter::GetSettings(SModuleSettings **pSettings, int *iCou
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/OneButtonFilter.cpp b/Src/DasherCore/OneButtonFilter.cpp
index 4eb72bb..f8b83d8 100644
--- a/Src/DasherCore/OneButtonFilter.cpp
+++ b/Src/DasherCore/OneButtonFilter.cpp
@@ -92,4 +92,4 @@ bool COneButtonFilter::GetSettings(SModuleSettings **pSettings, int *iCount) {
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/SettingsStore.cpp b/Src/DasherCore/SettingsStore.cpp
index 4d88a0b..59c3f95 100644
--- a/Src/DasherCore/SettingsStore.cpp
+++ b/Src/DasherCore/SettingsStore.cpp
@@ -33,7 +33,7 @@ Dasher::CParamTables CSettingsStore::s_oParamTables;
 // TODO: Don't propagate changes which don't affect anything.
 
 CSettingsStore::CSettingsStore(Dasher::CEventHandler *pEventHandler):m_pEventHandler(pEventHandler) {
-};
+}
 
 void CSettingsStore::LoadPersistent() {
 
@@ -127,7 +127,7 @@ void CSettingsStore::SetBoolParameter(int iParameter, bool bValue) {
   // Write out to permanent storage
   if(s_oParamTables.BoolParamTable[iParameter - FIRST_BP].persistent)
     SaveSetting(s_oParamTables.BoolParamTable[iParameter - FIRST_BP].regName, bValue);
-};
+}
 
 void CSettingsStore::SetLongParameter(int iParameter, long lValue) {
 
@@ -147,7 +147,7 @@ void CSettingsStore::SetLongParameter(int iParameter, long lValue) {
   // Write out to permanent storage
   if(s_oParamTables.LongParamTable[iParameter - FIRST_LP].persistent)
     SaveSetting(s_oParamTables.LongParamTable[iParameter - FIRST_LP].regName, lValue);
-};
+}
 
 void CSettingsStore::SetStringParameter(int iParameter, const std::string sValue) {
 
@@ -167,7 +167,7 @@ void CSettingsStore::SetStringParameter(int iParameter, const std::string sValue
   // Write out to permanent storage
   if(s_oParamTables.StringParamTable[iParameter - FIRST_SP].persistent)
     SaveSetting(s_oParamTables.StringParamTable[iParameter - FIRST_SP].regName, sValue);
-};
+}
 
 bool CSettingsStore::GetBoolParameter(int iParameter) {
   // Check that the parameter is in fact in the right spot in the table
@@ -175,7 +175,7 @@ bool CSettingsStore::GetBoolParameter(int iParameter) {
 
   // Return the value
   return s_oParamTables.BoolParamTable[iParameter - FIRST_BP].value;
-};
+}
 
 long CSettingsStore::GetLongParameter(int iParameter) {
   // Check that the parameter is in fact in the right spot in the table
@@ -183,7 +183,7 @@ long CSettingsStore::GetLongParameter(int iParameter) {
 
   // Return the value
   return s_oParamTables.LongParamTable[iParameter - FIRST_LP].value;
-};
+}
 
 std::string CSettingsStore::GetStringParameter(int iParameter) {
   // Check that the parameter is in fact in the right spot in the table
diff --git a/Src/DasherCore/SocketInputBase.cpp b/Src/DasherCore/SocketInputBase.cpp
index 3692d0f..e318f34 100644
--- a/Src/DasherCore/SocketInputBase.cpp
+++ b/Src/DasherCore/SocketInputBase.cpp
@@ -315,4 +315,4 @@ bool CSocketInputBase::GetSettings(SModuleSettings **pSettings, int *iCount) {
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
diff --git a/Src/DasherCore/TrainingHelper.h b/Src/DasherCore/TrainingHelper.h
index a259603..cac41ac 100644
--- a/Src/DasherCore/TrainingHelper.h
+++ b/Src/DasherCore/TrainingHelper.h
@@ -54,6 +54,6 @@ namespace Dasher {
     bool m_bInSegment;
     std::string m_strCurrentText;
   };
-};
+}
 
 #endif
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp
index 4e51914..89a7f0c 100644
--- a/Src/DasherCore/TwoButtonDynamicFilter.cpp
+++ b/Src/DasherCore/TwoButtonDynamicFilter.cpp
@@ -185,7 +185,7 @@ bool CTwoButtonDynamicFilter::GetSettings(SModuleSettings **pSettings, int *iCou
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
 
 bool CTwoButtonDynamicFilter::GetMinWidth(int &iMinWidth) {
   iMinWidth = 1024;
diff --git a/Src/DasherCore/TwoPushDynamicFilter.cpp b/Src/DasherCore/TwoPushDynamicFilter.cpp
index 5faef32..4569271 100644
--- a/Src/DasherCore/TwoPushDynamicFilter.cpp
+++ b/Src/DasherCore/TwoPushDynamicFilter.cpp
@@ -153,8 +153,7 @@ void CTwoPushDynamicFilter::HandleEvent(Dasher::CEvent * pEvent)
      }
     }
   }
-
-};
+}
 
 void CTwoPushDynamicFilter::KeyDown(int Time, int iId, CDasherView *pDasherView, CDasherModel *pModel, CUserLogBase *pUserLog, bool bPos, int iX, int iY) {
   if (iId == 100 && !GetBoolParameter(BP_BACKOFF_BUTTON))
@@ -282,7 +281,7 @@ bool CTwoPushDynamicFilter::GetSettings(SModuleSettings **pSettings, int *iCount
   *iCount = sizeof(sSettings) / sizeof(SModuleSettings);
 
   return true;
-};
+}
 
 bool CTwoPushDynamicFilter::GetMinWidth(int &iMinWidth) {
   iMinWidth = 1024;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]