Fixing missing overrides and adding one missing enum value

PapeCoding · PapeCoding · commit fc3cf1a87169 · 2025-06-05T17:10:59.000+02:00
diff --git a/Src/DasherCore/AlphabetManager.h b/Src/DasherCore/AlphabetManager.h
@@ -120,7 +120,7 @@ namespace Dasher {
       virtual ~CAlphNode();
       ///Have to call this from CAlphabetManager, and from CGroupNode on a _different_ CAlphNode, hence public...
       virtual std::vector<unsigned int> *GetProbInfo();
-      virtual int ExpectedNumChildren();
+      virtual int ExpectedNumChildren() override;
     private:
       std::vector<unsigned int> *m_pProbInfo;
     };
diff --git a/Src/DasherCore/AlternatingDirectMode.h b/Src/DasherCore/AlternatingDirectMode.h
@@ -17,12 +17,12 @@ namespace Dasher {
  public:
   CAlternatingDirectMode(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface);
 
-  bool DecorateView(CDasherView *pView, CDasherInput *pInput);
+  bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
 
-  bool GetSettings(SModuleSettings **pSettings, int *iCount);
+  bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
 
  protected:
-  void SetupBoxes();
+  void SetupBoxes() override;
 
  private:
   void DirectKeyDown(unsigned long iTime, int iId, CDasherView *pView, CDasherModel *pModel);
diff --git a/Src/DasherCore/ButtonMultiPress.h b/Src/DasherCore/ButtonMultiPress.h
@@ -34,14 +34,14 @@ class CButtonMultiPress : public CDynamicButtons {
  public:
   CButtonMultiPress(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate, const char *szName);
 
-  void Timer(unsigned long iTime, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel, CExpansionPolicy **pol);
-  void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
+  void Timer(unsigned long iTime, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel, CExpansionPolicy **pol) override;
+  void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
 
-  void pause();
+  void pause() override;
  protected:
   virtual unsigned int maxClickCount()=0;
-  void reverse(unsigned long iTime);
-  void run(unsigned long iTime);
+  void reverse(unsigned long iTime) override;
+  void run(unsigned long iTime) override;
 
  private:
   virtual void RevertPresses(int iCount) {};
diff --git a/Src/DasherCore/CircleStartHandler.h b/Src/DasherCore/CircleStartHandler.h
@@ -2,7 +2,6 @@
 
 #include "StartHandler.h"
 #include "SettingsStore.h"
-#include "DasherScreen.h"
 
 /// \ingroup Start
 /// @{
@@ -11,11 +10,11 @@ class CCircleStartHandler : public CStartHandler {
 public:
   CCircleStartHandler(CDefaultFilter *pCreator);
   ~CCircleStartHandler();
-  virtual bool DecorateView(CDasherView *pView);
-  virtual void Timer(unsigned long iTime, dasherint iX, dasherint iY, CDasherView *pView);
+  virtual bool DecorateView(CDasherView *pView) override;
+  virtual void Timer(unsigned long iTime, dasherint iX, dasherint iY, CDasherView *pView)override;
   void RegisterView(CDasherView* pView);
-  void onPause();
-  void onRun(unsigned long iTime);
+  void onPause() override;
+  void onRun(unsigned long iTime) override;
 protected:
   ///Time (as unix timestamp) when user entered circle; max() => already acted upon
   long m_iEnterTime;
diff --git a/Src/DasherCore/ClickFilter.h b/Src/DasherCore/ClickFilter.h
@@ -23,9 +23,9 @@ class CClickFilter : public CStaticFilter, private CZoomAdjuster {
   CClickFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface)
     : CStaticFilter(pSettingsStore, pInterface, _("Click Mode")) { };
 
-  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput);
-  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
-  virtual bool GetSettings(SModuleSettings **pSettings, int *iCount);
+  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
+  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
+  virtual bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
   
  private:
   //for mouse lines
diff --git a/Src/DasherCore/CompassMode.h b/Src/DasherCore/CompassMode.h
@@ -16,12 +16,12 @@ class CCompassMode : public CDasherButtons
 
   virtual void HandleEvent(Parameter parameter);
 
-  bool DecorateView(CDasherView *pView, CDasherInput *pInput);
+  bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
 
-  bool GetSettings(SModuleSettings **pSettings, int *iCount);
+  bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
 
  protected:
-  void SetupBoxes();
+  void SetupBoxes() override;
 
  private:
   int iTargetWidth;
diff --git a/Src/DasherCore/ConvertingAlphMgr.h b/Src/DasherCore/ConvertingAlphMgr.h
@@ -23,11 +23,11 @@ namespace Dasher {
   public:
     CConvertingAlphMgr(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, CConversionManager *pConvMgr, const CAlphInfo *pAlphabet);
     ///Override to also tell the ConversionManager that the screen has changed.
-    void MakeLabels(CDasherScreen *pScreen);
+    void MakeLabels(CDasherScreen *pScreen) override;
     virtual ~CConvertingAlphMgr();
   protected:
     ///Override to return a conversion root for iSymbol==(one beyond last alphabet symbol)
-    virtual CDasherNode *CreateSymbolNode(CAlphNode *pParent, symbol iSymbol);
+    virtual CDasherNode *CreateSymbolNode(CAlphNode *pParent, symbol iSymbol) override;
   private:
     CConversionManager *m_pConvMgr;
     
diff --git a/Src/DasherCore/DasherButtons.h b/Src/DasherCore/DasherButtons.h
@@ -15,11 +15,11 @@ class CDasherButtons : public CStaticFilter
   CDasherButtons(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, bool bMenu, const char *szName);
   virtual ~CDasherButtons();
 
-  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput)=0;
+  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput) override =0;
   
-  void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
-  void Timer(unsigned long Time, CDasherView *pView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  void Activate();
+  void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
+  void Timer(unsigned long Time, CDasherView *pView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol) override;
+  void Activate() override;
   
   struct SBoxInfo {
     int iTop;
diff --git a/Src/DasherCore/DefaultFilter.cpp b/Src/DasherCore/DefaultFilter.cpp
@@ -294,7 +294,7 @@ double xmax(double y)
 void CDefaultFilter::ApplyTransform(myint& iDasherX, myint& iDasherY, CDasherView* pView)
 {
     ApplyOffset(iDasherX, iDasherY);
-    if (m_pSettingsStore->GetLongParameter(LP_GEOMETRY) == 1)
+    if (m_pSettingsStore->GetLongParameter(LP_GEOMETRY) == Options::ScreenGeometry::square_no_xhair)
     {
         //crosshair may be offscreen; so do something to allow us to navigate
         // up/down and reverse
diff --git a/Src/DasherCore/DemoFilter.h b/Src/DasherCore/DemoFilter.h
@@ -12,11 +12,11 @@ class CDemoFilter : public CDynamicFilter {
 
   virtual void HandleEvent(Parameter parameter);
 
-  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput);
-  virtual void Timer(unsigned long Time, CDasherView *m_pDasherView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pDasherView, CDasherInput *pInput, CDasherModel *pModel);
-  virtual void Activate();
-  virtual void Deactivate();
+  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
+  virtual void Timer(unsigned long Time, CDasherView *m_pDasherView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol) override;
+  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pDasherView, CDasherInput *pInput, CDasherModel *pModel) override;
+  virtual void Activate() override;
+  virtual void Deactivate() override;
  private:
   double m_dSpring, m_dNoiseNew, m_dNoiseOld;
   double m_dNoiseX, m_dNoiseY;
diff --git a/Src/DasherCore/DynamicButtons.h b/Src/DasherCore/DynamicButtons.h
@@ -33,10 +33,10 @@ class CDynamicButtons : public CDynamicFilter {
   CDynamicButtons(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate, const char *szName);
 
   ///when reversing, backs off; when paused, does nothing; when running, delegates to TimerImpl
-  virtual void Timer(unsigned long Time, CDasherView *pView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
+  virtual void Timer(unsigned long Time, CDasherView *pView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol) override;
 
-  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
-  virtual void KeyUp(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
+  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
+  virtual void KeyUp(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
 
  protected:
   ///Called when a key event is detected - could be a single press (a la KeyDown/KeyUp),
@@ -68,9 +68,9 @@ class CDynamicButtons : public CDynamicFilter {
   bool m_bDecorationChanged;
   bool isReversing() {return !isPaused() && !m_bForwards;}
   bool isRunning() {return !isPaused() && m_bForwards;}
-  virtual void pause();
+  virtual void pause() override;
   virtual void reverse(unsigned long iTime);
-  virtual void run(unsigned long iTime);
+  virtual void run(unsigned long iTime) override;
 
   virtual void TimerImpl(unsigned long Time, CDasherView *m_pDasherView, CDasherModel *m_pDasherModel, CExpansionPolicy **pol) = 0;
 
diff --git a/Src/DasherCore/DynamicFilter.h b/Src/DasherCore/DynamicFilter.h
@@ -36,9 +36,9 @@ class CDynamicFilter : public CInputFilter {
  public:
   CDynamicFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate, const char *szName);
 
-  virtual bool supportsPause() {return true;}
+  virtual bool supportsPause() override {return true;}
   
-  void pause() {m_bPaused = true;}
+  void pause() override {m_bPaused = true;}
   
  protected:
   ///wraps Model's one-step method to compute the number of steps and minsize
diff --git a/Src/DasherCore/FileWordGenerator.h b/Src/DasherCore/FileWordGenerator.h
@@ -29,10 +29,10 @@ class CFileWordGenerator : public CWordGeneratorBase, public AbstractParser {
 
   ///Attempt to read from an arbitrary stream. Returns false, as we
   /// only support reading game mode sentences from files.
-  bool Parse(const std::string &strDesc, std::istream &in, bool bUser);
+  bool Parse(const std::string &strDesc, std::istream &in, bool bUser) override;
   
   ///Attempt to open the specified file. Return true for success, false for failure
-  bool ParseFile(const std::string &strFileName, bool bUser);
+  bool ParseFile(const std::string &strFileName, bool bUser) override;
     
   virtual ~CFileWordGenerator() {
     m_sFileHandle.close();
@@ -42,7 +42,7 @@ class CFileWordGenerator : public CWordGeneratorBase, public AbstractParser {
    * Return the next line from the file
    * @throw  Throws an exception if the file cannot be read.
    */
- virtual std::string GetLine();
+ virtual std::string GetLine() override;
   
   void setAcceptUser(bool bAcceptUser) {m_bAcceptUser = bAcceptUser;}
 
diff --git a/Src/DasherCore/InputFilter.h b/Src/DasherCore/InputFilter.h
@@ -76,7 +76,7 @@ class CInputFilter : public CDasherModule {
     CStaticFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pIntf, const char *szName)
     : CInputFilter(pIntf, szName), m_pSettingsStore(pSettingsStore), m_pModel(NULL) {
     }
-    void pause() {if (m_pModel) m_pModel->ClearScheduledSteps();}
+    void pause() override {if (m_pModel) m_pModel->ClearScheduledSteps();}
   protected:
     void ScheduleZoom(CDasherModel *pModel, myint y1, myint y2) {
       (m_pModel = pModel)->ScheduleZoom(y1,y2,m_pSettingsStore->GetLongParameter(LP_ZOOMSTEPS));
diff --git a/Src/DasherCore/MandarinAlphMgr.h b/Src/DasherCore/MandarinAlphMgr.h
@@ -75,7 +75,7 @@ namespace Dasher {
       CMandarinTrainer(CMessageDisplay *pMsgs, CMandarinAlphMgr *pMgr);
     protected:
       //override...
-      virtual void Train(CAlphabetMap::SymbolStream &syms);
+      virtual void Train(CAlphabetMap::SymbolStream &syms) override;
     private:
       CMandarinAlphMgr * const m_pMgr;
       int m_iStartSym;
@@ -91,7 +91,7 @@ namespace Dasher {
     ~CMandarinAlphMgr();
     
     ///ACL: returns a MandarinTrainer too.
-    CTrainer *GetTrainer();
+    CTrainer *GetTrainer() override;
     
     ///Disable game mode. The target sentence might appear in several places...!!
     CWordGeneratorBase *GetGameWords() {return NULL;}
@@ -105,29 +105,29 @@ namespace Dasher {
     /// the character information methods (GetDisplayText, etc.,
     /// also MakeMap) return information on the target(chinese)-alphabet symbols, which
     /// are rehashed from the original/input alphabet to remove duplicates;
-    void InitMap();
+    void InitMap() override;
     ///WZ: Mandarin Dasher Change. Sets language model to PPMPY.
-    void CreateLanguageModel();
+    void CreateLanguageModel() override;
     
     ///Process SGroupInfo's from the alphabet into form suitable for m_pPYgroups
     /// \param pBase group from alphabet (i.e. containing unhashed CH symbol numbers)
     /// \return new group, in terms of PY sound+tone/group numbers
     SGroupInfo *makePYgroup(const SGroupInfo *in);
     
     ///Override just to cache the screen so we can make (CH) labels lazily
-    void MakeLabels(CDasherScreen *pScreen);
+    void MakeLabels(CDasherScreen *pScreen) override;
 
     ///Override just to create root of tree from m_pPYgroups instead of m_pAlphabet
-    SGroupInfo *copyGroups(const SGroupInfo *pBase, CDasherScreen *pScreen);
+    SGroupInfo *copyGroups(const SGroupInfo *pBase, CDasherScreen *pScreen) override;
 
     //Remove label on the "symbols" i.e. PY sounds; we use the label
     // internally to identify a CH group, but for display purposes the symbol is
     // identified entirely by the PY groups around it.
-    const std::string &GetLabelText(symbol i) const;
+    const std::string &GetLabelText(symbol i) const override;
 
     ///Override to create a CMandSym; context and sym both obtained from the
     // ChineseAlphabet's (hashed) symbols stored in m_map.
-    CAlphNode *CreateSymbolRoot(int iOffset, CLanguageModel::Context ctx, symbol sym);
+    CAlphNode *CreateSymbolRoot(int iOffset, CLanguageModel::Context ctx, symbol sym) override;
 
     class CConvRoot;
     ///Subclass of CSymbolNode for (converted) chinese-alphabet symbols:
@@ -183,7 +183,7 @@ namespace Dasher {
     ///Called to create the node for a pinyin leaf symbol;
     /// Overridden to call either CreateConvRoot or CreateCHSymbol, according to #chinese symbols under specified pinyin
     /// \param iSymbol Symbol number in pinyin alphabet
-    virtual CDasherNode *CreateSymbolNode(CAlphNode *pParent, symbol iSymbol);
+    virtual CDasherNode *CreateSymbolNode(CAlphNode *pParent, symbol iSymbol) override;
 
     ///Creates a CConvRoot, for a Pinyin symbol with multiple possible chinese symbols.
     /// Color is always 9 (opaque), so no need for background colour.
diff --git a/Src/DasherCore/OneButtonDynamicFilter.h b/Src/DasherCore/OneButtonDynamicFilter.h
@@ -30,18 +30,18 @@ class COneButtonDynamicFilter : public CButtonMultiPress {
   COneButtonDynamicFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate);
   virtual ~COneButtonDynamicFilter();
 
-  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput);
+  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
 
-  virtual bool GetSettings(SModuleSettings **pSettings, int *iCount);
+  virtual bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
 
   //override to get mouse clicks / taps back again...
-  virtual void KeyDown(unsigned long Time, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
-  virtual void KeyUp(unsigned long Time, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
+  virtual void KeyDown(unsigned long Time, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
+  virtual void KeyUp(unsigned long Time, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
 
  private:
-  unsigned int maxClickCount() {return 2;} //double-click to reverse
-  virtual void TimerImpl(unsigned long Time, CDasherView *pView, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  virtual void ActionButton(unsigned long iTime, Keys::VirtualKey Key, int iType, CDasherModel* pModel);
+  unsigned int maxClickCount() override {return 2;} //double-click to reverse
+  virtual void TimerImpl(unsigned long Time, CDasherView *pView, CDasherModel *m_pDasherModel, CExpansionPolicy **pol) override;
+  virtual void ActionButton(unsigned long iTime, Keys::VirtualKey Key, int iType, CDasherModel* pModel) override;
   
   int m_iTarget;
 
diff --git a/Src/DasherCore/OneButtonFilter.h b/Src/DasherCore/OneButtonFilter.h
@@ -9,10 +9,10 @@ class COneButtonFilter : public CStaticFilter {
  public:
   COneButtonFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface);
 
-  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput);
-  virtual void Timer(unsigned long Time, CDasherView *pView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol);
-  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel);
-  bool GetSettings(SModuleSettings **pSettings, int *iCount);
+  virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
+  virtual void Timer(unsigned long Time, CDasherView *pView, CDasherInput *pInput, CDasherModel *m_pDasherModel, CExpansionPolicy **pol) override;
+  virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
+  bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
  private:
   ///true iff the scan line is moving down/up, or is in the 'reverse' stage
   bool bStarted;
diff --git a/Src/DasherCore/OneDimensionalFilter.h b/Src/DasherCore/OneDimensionalFilter.h
@@ -17,12 +17,12 @@ class COneDimensionalFilter : public CDefaultFilter {
 //  COneDimensionalFilter(CSettingsStore *pSettingsStore, CDasherInterfaceBase *pInterface, CDasherModel *m_pDasherModel);
   COneDimensionalFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate, const char *szName = _("One Dimensional Mode"));
   ///Override to remove DefaultFilters BP_REMAP_XTREME, BP_AUTOCALIBRATE, LP_OFFSET
-  bool GetSettings(SModuleSettings **pSettings, int *iCount);
+  bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
  protected:
   friend C1DCircleStartHandler;
-  virtual void ApplyTransform(myint &iDasherX, myint &iDasherY, CDasherView *pView);
+  virtual void ApplyTransform(myint &iDasherX, myint &iDasherY, CDasherView *pView) override;
   const myint forwardmax;
-  virtual CStartHandler *MakeStartHandler();
+  virtual CStartHandler *MakeStartHandler() override;
 };
 
 class C1DCircleStartHandler : public CCircleStartHandler {
diff --git a/Src/DasherCore/RoutingAlphMgr.h b/Src/DasherCore/RoutingAlphMgr.h
@@ -42,29 +42,29 @@ namespace Dasher {
     CRoutingAlphMgr(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet);
     
     ///Override to return a CRoutingTrainer
-    CTrainer *GetTrainer();
+    CTrainer *GetTrainer() override;
     
     ///Disable game mode. The target sentence might appear in several places...!!
     CWordGeneratorBase *GetGameWords() {return NULL;}
 
   protected:
     ///Fills map w/ rehashed base symbols, filling m_vBaseSyms, m_vRoutes,
     /// and m_vGroupsByRoute to record which symbols were identified together.
-    void InitMap();
+    void InitMap() override;
     ///Override to create a RoutingPPMLanguageModel
-    void CreateLanguageModel();
+    void CreateLanguageModel() override;
 
     ///Creates a symbol, i.e. including route.
     /// Both ctx and sym were reconstructed from m_map (filled by InitMap), so
     /// are in terms of hashed base symbols; thus, this method identifies the best
     /// route by which that base may have been entered, and creates a symbol node
     /// for that.
-    CAlphNode *CreateSymbolRoot(int iOffset, CLanguageModel::Context ctx, symbol sym);
+    CAlphNode *CreateSymbolRoot(int iOffset, CLanguageModel::Context ctx, symbol sym) override;
     
     /// Override to create a CRoutedSym and enter only base sym into the LM
     ///\param iSymbol symbol number from the alphabet defn, i.e. identifies both
     /// base symbol and route
-    virtual CDasherNode *CreateSymbolNode(CAlphNode *pParent, symbol iSymbol);
+    virtual CDasherNode *CreateSymbolNode(CAlphNode *pParent, symbol iSymbol) override;
 
     ///Subclass to override trainText
     class CRoutedSym : public CSymbolNode {
diff --git a/Src/DasherCore/StylusFilter.h b/Src/DasherCore/StylusFilter.h
diff --git a/Src/DasherCore/Trainer.h b/Src/DasherCore/Trainer.h
diff --git a/Src/DasherCore/TwoBoxStartHandler.h b/Src/DasherCore/TwoBoxStartHandler.h
diff --git a/Src/DasherCore/TwoPushDynamicFilter.h b/Src/DasherCore/TwoPushDynamicFilter.h

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ double xmax(double y)`
`294`	`294`	`void CDefaultFilter::ApplyTransform(myint& iDasherX, myint& iDasherY, CDasherView* pView)`
`295`	`295`	`{`
`296`	`296`	`ApplyOffset(iDasherX, iDasherY);`
`297`		`- if (m_pSettingsStore->GetLongParameter(LP_GEOMETRY) == 1)`
	`297`	`+ if (m_pSettingsStore->GetLongParameter(LP_GEOMETRY) == Options::ScreenGeometry::square_no_xhair)`
`298`	`298`	`{`
`299`	`299`	`//crosshair may be offscreen; so do something to allow us to navigate`
`300`	`300`	`// up/down and reverse`