[dasher] whitespace / formatting

[Patrick Welche <pwelche src gnome org>]

commit bf5484e1a7d8fba1c003a67c6da8d8aa50313215
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Mon Feb 25 13:14:20 2013 +0000

    whitespace / formatting

 Src/DasherCore/DasherInterfaceBase.cpp |   24 +++++++++++-------------
 Src/DasherCore/DasherModel.cpp         |    2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index 15cb781..7509347 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -206,7 +206,6 @@ CDasherInterfaceBase::~CDasherInterfaceBase() {
 }
 
 void CDasherInterfaceBase::PreSetNotify(int iParameter, const std::string &sNewValue) {
-
   // FIXME - make this a more general 'pre-set' event in the message
   // infrastructure
 
@@ -215,17 +214,14 @@ void CDasherInterfaceBase::PreSetNotify(int iParameter, const std::string &sNewV
     // Cycle the alphabet history
     if(GetStringParameter(SP_ALPHABET_ID) != sNewValue) {
       if(GetStringParameter(SP_ALPHABET_1) != sNewValue) {
-       if(GetStringParameter(SP_ALPHABET_2) != sNewValue) {
-         if(GetStringParameter(SP_ALPHABET_3) != sNewValue)
-           SetStringParameter(SP_ALPHABET_4, GetStringParameter(SP_ALPHABET_3));
-
-         SetStringParameter(SP_ALPHABET_3, GetStringParameter(SP_ALPHABET_2));
-       }
-
-       SetStringParameter(SP_ALPHABET_2, GetStringParameter(SP_ALPHABET_1));
+        if(GetStringParameter(SP_ALPHABET_2) != sNewValue) {
+          if(GetStringParameter(SP_ALPHABET_3) != sNewValue)
+            SetStringParameter(SP_ALPHABET_4, GetStringParameter(SP_ALPHABET_3));
+          SetStringParameter(SP_ALPHABET_3, GetStringParameter(SP_ALPHABET_2));
+        }
+        SetStringParameter(SP_ALPHABET_2, GetStringParameter(SP_ALPHABET_1));
       }
-
-      SetStringParameter(SP_ALPHABET_1, GetStringParameter(SP_ALPHABET_ID));
+         SetStringParameter(SP_ALPHABET_1, GetStringParameter(SP_ALPHABET_ID));
     }
 
     break;
@@ -571,8 +567,10 @@ bool CDasherInterfaceBase::Redraw(unsigned long ulTime, bool bRedrawNodes, CExpa
     m_pDasherView->Screen()->SendMarker(0);
     if (m_pDasherModel) {
       m_pDasherModel->RenderToView(m_pDasherView,policy);
-      if (policy.apply()) //if anything was expanded or collapsed
-        ScheduleRedraw(); //render at least one more frame after this
+      // if anything was expanded or collapsed render at least one more
+      // frame after this
+      if (policy.apply())
+        ScheduleRedraw();
     }
     if(m_pGameModule) {
       m_pGameModule->DecorateView(ulTime, m_pDasherView, m_pDasherModel);
diff --git a/Src/DasherCore/DasherModel.cpp b/Src/DasherCore/DasherModel.cpp
index 174f48a..be9dbaa 100644
--- a/Src/DasherCore/DasherModel.cpp
+++ b/Src/DasherCore/DasherModel.cpp
@@ -226,7 +226,7 @@ void CDasherModel::SetNode(CDasherNode *pNewRoot) {
 
 int CDasherModel::GetOffset() {
   return m_pLastOutput ? m_pLastOutput->offset()+1 : m_Root ? m_Root->offset()+1 : 0;
-};
+}
 
 CDasherNode *CDasherModel::Get_node_under_crosshair() {
   return m_pLastOutput;