1 files changed, 4 insertions, 4 deletions

diff --git a/inputmethods/dasher/DasherModel.cpp b/inputmethods/dasher/DasherModel.cpp
index 0450d66..f15fa49 100644
--- a/inputmethods/dasher/DasherModel.cpp
+++ b/inputmethods/dasher/DasherModel.cpp
@@ -8,25 +8,25 @@
 
 #include <iostream>
 #include "DasherModel.h"
 
 using namespace Dasher;
 using namespace std;
 
 //////////////////////////////////////////////////////////////////////
 // CDasherModel
 //////////////////////////////////////////////////////////////////////
 
 CDasherModel::CDasherModel(CDashEditbox* Editbox, CLanguageModel* LanguageModel, bool Dimensions)
-  : m_editbox(Editbox), m_languagemodel(LanguageModel), m_Root(0), m_Dimensions(Dimensions)
+  : m_Dimensions(Dimensions), m_editbox(Editbox), m_languagemodel(LanguageModel), m_Root(0)
 {
         LearnContext = m_languagemodel->GetRootNodeContext();
         
         // various settings
         int iShift = 12;
         m_DasherY = 1<<iShift;
         m_DasherOY = m_DasherY/2;
         m_DasherOX = m_DasherY/2;
         m_dAddProb = 0.003;
 }
 
 
@@ -96,25 +96,25 @@ CDasherNode * CDasherModel::Get_node_under_mouse(myint Mousex,myint Mousey)
 /////////////////////////////////////////////////////////////////////////////
 
 
 void CDasherModel::Get_string_under_mouse(const myint Mousex,const myint Mousey, vector<symbol> &str)
 {
         m_Root->Get_string_under(Normalization(),m_Rootmin,m_Rootmax,Mousex,Mousey,str);
         return;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 
-void CDasherModel::Flush(const myint Mousex,const myint Mousey)
+void CDasherModel::Flush(const myint ,const myint )
 {
         vector<symbol> vtUnder;
         Get_string_under_mouse(m_DasherOX,m_DasherOY,vtUnder);
         unsigned int i;
         for (i=0;i<vtUnder.size();i++) {
           if (vtUnder[i]==0)
             continue;
           m_editbox->flush(vtUnder[i]);
         }
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -175,25 +175,25 @@ void CDasherModel::Start()
         m_Root->Push_Node(therootcontext);
         
         m_languagemodel->ReleaseNodeContext(therootcontext);
         //ppmmodel->dump();
         //dump();
         
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 void CDasherModel::Get_new_root_coords(myint Mousex,myint Mousey)
 {
-        int cappedrate=0;
+        // int cappedrate=0;
         double dRx=1.0,dRxnew=1.0;
         double dRxnew2;
 
         int iSteps=m_fr.Steps();
 
         if (Mousex<m_DasherOX) {
                 //rx=1.0001*Ixmap[mx]/Ixmap[cx];
                 if (Mousex<=0)
                         Mousex=1;
                 dRx=1.0*m_DasherOX/Mousex;
                 dRxnew=pow(dRx,1.0/iSteps);  // or exp(log(rx)/steps) - i think the replacement is faster   
         
@@ -234,25 +234,25 @@ void CDasherModel::Get_new_root_coords(myint Mousex,myint Mousey)
 
         myint newRootmax=miNewrootzoom+myint(below*dRxnew);
         myint newRootmin=miNewrootzoom-myint(above*dRxnew);
         if (newRootmin<m_DasherY/2 && newRootmax>m_DasherY/2 && newRootmax<LLONG_MAX && newRootmin>LLONG_MIN) {
                 m_Rootmax=newRootmax;
                         m_Rootmin=newRootmin;
         }
 
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
-void CDasherModel::Tap_on_display(myint miMousex,myint miMousey, unsigned long Time) 
+void CDasherModel::Tap_on_display(myint miMousex,myint miMousey, unsigned long ) 
         // work out the next viewpoint, opens some new nodes
 {
         // works out next viewpoint
         Get_new_root_coords(miMousex,miMousey);
 
         // opens up new nodes
 
         // push node under mouse
         CDasherNode *under_mouse=Get_node_under_mouse(miMousex,miMousey);
         under_mouse->Push_Node();