Removing a whole lot of warnings from clang on Windows

Author: PapeCoding

Src/DasherCore/AlphabetManager.cpp

@@ -33,7 +33,6 @@
 #include "FileWordGenerator.h"
 
 #include <vector>
-#include <sstream>
 
 using namespace Dasher;
 
@@ -51,32 +50,30 @@ CAlphabetManager::CAlphabetManager(CSettingsStore *pSettingsStore, CDasherInterf
 {
     m_pSettingsStore->OnPreParameterChange.Subscribe(this, [this](Parameter parameter, const std::variant<bool, long, std::string>& newValue)
     {
-        switch(parameter) {
-          case SP_ALPHABET_ID:
-              const std::string value = std::get<std::string>(newValue);
-            // Cycle the alphabet history
-            std::vector<std::string> newHistory;
-            newHistory.push_back(m_pSettingsStore->GetStringParameter(SP_ALPHABET_ID));
-            std::string v;
-            if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_1)) != value)
-              newHistory.push_back(v);
-            if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_2)) != value)
-              newHistory.push_back(v);
-            if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_3)) != value)
-              newHistory.push_back(v);
-            if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_4)) != value)
-              newHistory.push_back(v);
-
-            // Fill empty slots. 
-            while (newHistory.size() < 4)
-              newHistory.push_back("");
-
-            m_pSettingsStore->SetStringParameter(SP_ALPHABET_1, newHistory[0]);
-            m_pSettingsStore->SetStringParameter(SP_ALPHABET_2, newHistory[1]);
-            m_pSettingsStore->SetStringParameter(SP_ALPHABET_3, newHistory[2]);
-            m_pSettingsStore->SetStringParameter(SP_ALPHABET_4, newHistory[3]);
-            break;
-          }
+      if(parameter == SP_ALPHABET_ID){
+          const std::string value = std::get<std::string>(newValue);
+          // Cycle the alphabet history
+          std::vector<std::string> newHistory;
+          newHistory.push_back(m_pSettingsStore->GetStringParameter(SP_ALPHABET_ID));
+          std::string v;
+          if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_1)) != value)
+            newHistory.push_back(v);
+          if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_2)) != value)
+            newHistory.push_back(v);
+          if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_3)) != value)
+            newHistory.push_back(v);
+          if ((v = m_pSettingsStore->GetStringParameter(SP_ALPHABET_4)) != value)
+            newHistory.push_back(v);
+
+          // Fill empty slots. 
+          while (newHistory.size() < 4)
+            newHistory.push_back("");
+
+          m_pSettingsStore->SetStringParameter(SP_ALPHABET_1, newHistory[0]);
+          m_pSettingsStore->SetStringParameter(SP_ALPHABET_2, newHistory[1]);
+          m_pSettingsStore->SetStringParameter(SP_ALPHABET_3, newHistory[2]);
+          m_pSettingsStore->SetStringParameter(SP_ALPHABET_4, newHistory[3]);
+      }
     });
 }
 

Src/DasherCore/AlphabetManager.h

@@ -66,7 +66,7 @@ namespace Dasher {
       CNodeManager* mgr() const override;
       ///Rebuilds this node's parent by recreating the previous 'root' node,
       /// then calling RebuildForwardsFromAncestor
-      CDasherNode *RebuildParent();
+      CDasherNode *RebuildParent() override;
       ///Called to build a symbol (leaf) node which is a descendant of the symbol or root node preceding this.
       /// Default implementation just calls the manager's CreateSymbolNode method to create a new node,
       /// but subclasses can override to graft themselves into the appropriate point beneath the previous node.
@@ -164,11 +164,11 @@ namespace Dasher {
       /// Uniquely, a paragraph symbol can enter two distinct unicode characters
       /// (i.e. '\r' and '\n'); every other symbol enters only a single
       /// unicode char, even if that might take >1 octet.
-      int numChars();
+      int numChars() override;
       void TrainSymbol();
       void UntrainSymbol();
       ///Override: true iff pGroup encloses this symbol (according to its start/end symbol#)
-      bool isInGroup(const SGroupInfo *pGroup);
+      bool isInGroup(const SGroupInfo *pGroup) override;
 
   public:
       double SpeedMul() override;
@@ -182,20 +182,20 @@ namespace Dasher {
       CGroupNode(int iOffset, CDasherScreen::Label* pLabel, CAlphabetManager* pMgr, const SGroupInfo* pGroup);
 
       ///Override: if m_pGroup==NULL, i.e. whole/root-of alphabet, cannot rebuild.
-      virtual CDasherNode *RebuildParent();
+      virtual CDasherNode *RebuildParent() override;
 
       ///Create children of this group node, by traversing the section of the alphabet
       /// indicated by m_pGroup.
-      virtual void PopulateChildren();
-      virtual int ExpectedNumChildren();
+      virtual void PopulateChildren() override;
+      virtual int ExpectedNumChildren() override;
 
-      virtual bool GameSearchNode(symbol sym);
-      std::vector<unsigned int> *GetProbInfo();
+      virtual bool GameSearchNode(symbol sym) override;
+      std::vector<unsigned int> *GetProbInfo() override;
       ///Override: if the group to create is the same as this node's group, return this node instead of creating a new one
-      virtual CDasherNode *RebuildGroup(CAlphNode* pParent, const SGroupInfo* pInfo);
+      virtual CDasherNode *RebuildGroup(CAlphNode* pParent, const SGroupInfo* pInfo) override;
     protected:
       ///Override: true if pGroup encloses this one (by start/end symbol#)
-      bool isInGroup(const SGroupInfo *pGroup);
+      bool isInGroup(const SGroupInfo *pGroup) override;
 
   public:
       const ColorPalette::Color& getLabelColor(const ColorPalette* colorPalette) override;

Src/DasherCore/ConversionManager.h

@@ -81,33 +81,33 @@ namespace Dasher {
 
     class CConvNode : public CDasherNode {
     public:
-      CConversionManager *mgr() const {return m_pMgr;}
+      CConversionManager *mgr() const override {return m_pMgr;}
       CConvNode(int iOffset, CDasherScreen::Label *pLabel, CConversionManager *pMgr);
     ///
     /// Provide children for the supplied node
     ///
 
-    virtual void PopulateChildren();
-    virtual int ExpectedNumChildren();
-      virtual void SetFlag(int iFlag, bool bValue);
+    virtual void PopulateChildren() override;
+    virtual int ExpectedNumChildren() override;
+      virtual void SetFlag(int iFlag, bool bValue) override;
 
     virtual ~CConvNode();
 
     ///Attempts to fill vContextSymbols with the context that would exist _after_ this node has been entered
-    void GetContext(CDasherInterfaceBase *pInterface, const CAlphabetMap *pAlphabetMap, std::vector<symbol> &vContextSymbols, int iOffset, int iLength);
+    void GetContext(CDasherInterfaceBase *pInterface, const CAlphabetMap *pAlphabetMap, std::vector<symbol> &vContextSymbols, int iOffset, int iLength) override;
 
     ///
     /// Called whenever a node belonging to this manager first
     /// moves under the crosshair
     ///
 
-    virtual void Do();
+    virtual void Do() override;
 
     ///
     /// Called when a node is left backwards
     ///
 
-    virtual void Undo();
+    virtual void Undo() override;
       const ColorPalette::Color& getLabelColor(const ColorPalette* colorPalette) override;
       const ColorPalette::Color& getOutlineColor(const ColorPalette* colorPalette) override;
       const ColorPalette::Color& getNodeColor(const ColorPalette* colorPalette) override;

Src/DasherCore/DasherButtons.cpp

@@ -6,7 +6,6 @@
 #include "DasherButtons.h"
 #include "DasherScreen.h"
 #include "DasherInterfaceBase.h"
-#include <valarray>
 
 
 using namespace Dasher;
@@ -31,21 +30,22 @@ void CDasherButtons::KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherV
 
   if(m_bMenu) {
     switch(Key) {
-    case Keys::Button_1:
-    case Keys::Button_4:
-      m_bDecorationChanged = true;
-      ++iActiveBox;
-      if(iActiveBox == m_iNumBoxes)
-        iActiveBox = 0;
-       break;
-    case Keys::Button_2:
-    case Keys::Button_3:
-    case Keys::Primary_Input:
-      m_bDecorationChanged = true;
-      ScheduleZoom(pModel, m_pBoxes[iActiveBox].iTop, m_pBoxes[iActiveBox].iBottom);
-      if(iActiveBox != m_iNumBoxes-1)
-        iActiveBox = 0;
-      break;
+      case Keys::Button_1:
+      case Keys::Button_4:
+        m_bDecorationChanged = true;
+        ++iActiveBox;
+        if(iActiveBox == m_iNumBoxes)
+          iActiveBox = 0;
+        break;
+      case Keys::Button_2:
+      case Keys::Button_3:
+      case Keys::Primary_Input:
+        m_bDecorationChanged = true;
+        ScheduleZoom(pModel, m_pBoxes[iActiveBox].iTop, m_pBoxes[iActiveBox].iBottom);
+        if(iActiveBox != m_iNumBoxes-1)
+          iActiveBox = 0;
+        break;
+      default: break;
     }
   }
   else {
@@ -55,14 +55,15 @@ void CDasherButtons::KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherV
 }
 
 void CDasherButtons::DirectKeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherModel *pModel) {
-  if(Key == Keys::Primary_Input) // Ignore mouse events
-  return;
-  if(Key == Keys::Button_1)
-  iActiveBox = m_iNumBoxes - 1;
-  else if(Key <= m_iNumBoxes) 
-  iActiveBox = Key-2;
-  else
-  iActiveBox = m_iNumBoxes-2;
+  if(Key == Keys::Primary_Input) return; // Ignore mouse events
+    
+  if(Key == Keys::Button_1) {
+    iActiveBox = m_iNumBoxes - 1;
+  } else if(Key <= m_iNumBoxes) {
+    iActiveBox = Key-2;
+  } else {
+    iActiveBox = m_iNumBoxes-2;
+  }
 
   ScheduleZoom(pModel, m_pBoxes[iActiveBox].iTop,m_pBoxes[iActiveBox].iBottom);
 }

Src/DasherCore/DasherInterfaceBase.cpp

@@ -55,7 +55,7 @@
 #include "SmoothingFilter.h"
 #include "../DasherCore/FileLogger.h"
 #ifdef _DEBUG
-const eLogLevel g_iLogLevel   = logDEBUG;
+const eLogLevel g_iLogLevel   = eLogLevel::logDEBUG;
 const int       g_iLogOptions = logTimeStamp | logDateStamp | logDeleteOldFile;
 #else
 const eLogLevel g_iLogLevel   = logNORMAL;
@@ -775,20 +775,21 @@ void CDasherInterfaceBase::CreateModules() {
 void CDasherInterfaceBase::GetPermittedValues(Parameter parameter, std::vector<std::string> &vList) {
   // TODO: Deprecate direct calls to these functions
   switch (parameter) {
-  case SP_ALPHABET_ID:
-    DASHER_ASSERT(m_AlphIO != NULL);
-    m_AlphIO->GetAlphabets(&vList);
-    break;
-  case SP_COLOUR_ID:
-    DASHER_ASSERT(m_ColourIO != NULL);
-    m_ColorIO->GetKnownPalettes(&vList);
-    break;
-  case SP_INPUT_FILTER:
-    m_pModuleManager->ListInputMethodModules(vList);
-    break;
-  case SP_INPUT_DEVICE:
-    m_pModuleManager->ListInputDeviceModules(vList);
-    break;
+    case SP_ALPHABET_ID:
+      DASHER_ASSERT(m_AlphIO != NULL);
+      m_AlphIO->GetAlphabets(&vList);
+      break;
+    case SP_COLOUR_ID:
+      DASHER_ASSERT(m_ColourIO != NULL);
+      m_ColorIO->GetKnownPalettes(&vList);
+      break;
+    case SP_INPUT_FILTER:
+      m_pModuleManager->ListInputMethodModules(vList);
+      break;
+    case SP_INPUT_DEVICE:
+      m_pModuleManager->ListInputDeviceModules(vList);
+      break;
+    default: break;
   }
 }
 

Src/DasherCore/DemoFilter.cpp

@@ -4,7 +4,6 @@
 
 #include "DasherInterfaceBase.h"
 
-#include "CircleStartHandler.h"
 #include "GameModule.h"
 
 using namespace Dasher;
@@ -116,7 +115,7 @@ void CDemoFilter::HandleEvent(Parameter parameter) {
       case LP_DEMO_SPRING:
       case LP_DEMO_NOISE_MEM:
       case LP_MAX_BITRATE:
-      case LP_FRAMERATE:
+      case LP_FRAMERATE: {
         // Recalculates the parameters used in the demo following a change in framerate or speed.
         double spring = m_pSettingsStore->GetLongParameter(LP_DEMO_SPRING)/100.0;
         double noisemem = m_pSettingsStore->GetLongParameter(LP_DEMO_NOISE_MEM)/100.0;
@@ -125,5 +124,8 @@ void CDemoFilter::HandleEvent(Parameter parameter) {
         m_dSpring = (1-exp(-spring*lambda));
         m_dNoiseNew = noisemem*(1-exp(-lambda));
         m_dNoiseOld = sqrt(1.0-m_dNoiseNew*m_dNoiseNew);
+        break;
+      }
+      default: break;
     }
 }

Src/DasherCore/ExpansionPolicy.h

@@ -7,8 +7,7 @@
  *
  */
 
-#ifndef __ExpansionPolicy_h__
-#define __ExpansionPolicy_h__
+#pragma once
 
 #include <vector>
 #include "DasherNode.h"
@@ -20,7 +19,8 @@ namespace Dasher {
 class CExpansionPolicy
 {
 public:
-    virtual ~CExpansionPolicy() { };
+  CExpansionPolicy() = default;
+  virtual ~CExpansionPolicy() = default;
   ///dMaxCost should be the value returned by pushNode from the call for the node most closely enclosing pNode (that was pushed!)
   ///for the first (outermost) node, i.e. when no enclosing node has been passed, (+ive) INFINITY should be passed in.
 	virtual double pushNode(CDasherNode *pNode, int iDasherMinY, int iDasherMaxY, bool bExpand, double dMaxCost)=0;
@@ -40,6 +40,7 @@ class NoExpansions : public CExpansionPolicy
 {
 public:
   NoExpansions() = default;
+  virtual ~NoExpansions() = default;
 	double pushNode(CDasherNode *pNode, int iMin, int iMax, bool bExpand, double dMaxCost) override {return dMaxCost;}
   bool apply() override {return false;}
 };
@@ -50,6 +51,7 @@ class BudgettingPolicy : public CExpansionPolicy
 {
 public:
   BudgettingPolicy(CDasherModel *pModel, unsigned int iNodeBudget);
+  virtual ~BudgettingPolicy() = default;
   ///sets cost according to getCost(pNode,iMin,iMax);
   ///then assures node is cheaper (less important) than its parent;
   ///then adds to relevant queue
@@ -68,14 +70,14 @@ class BudgettingPolicy : public CExpansionPolicy
 class AmortizedPolicy : public BudgettingPolicy
 {
 public:
+  AmortizedPolicy() = delete;
   AmortizedPolicy(CDasherModel *pModel, unsigned int iNodeBudget);
 	AmortizedPolicy(CDasherModel *pModel, unsigned int iNodeBudget, unsigned int iMaxExpands);
-  ~AmortizedPolicy() override = default;
+  ~AmortizedPolicy() = default;
   bool apply() override;
   double pushNode(CDasherNode *pNode, int iMin, int iMax, bool bExpand, double dParentCost) override;
 private:
 	unsigned int m_iMaxExpands;
   void trim();
 };
 }
-#endif /*defined __ExpansionPolicy_h__*/

Src/DasherCore/FileLogger.cpp

@@ -1,7 +1,6 @@
 #include "FileUtils.h"
 
 #include <string>
-#include <filesystem>
 #include <chrono>
 #include "FileLogger.h"
 
@@ -43,8 +42,8 @@ CFileLogger::~CFileLogger()
 	if (!m_bFunctionTiming) return;
 
 	// Dump the results of our function timing logging
-	Log("%-60s%20s%10s", logNORMAL, "Function","Ticks", "Percent");
-	Log("%-60s%20s%10s", logNORMAL, "--------","-----", "-------");
+	Log("%-60s%20s%10s", eLogLevel::logNORMAL, "Function","Ticks", "Percent");
+	Log("%-60s%20s%10s", eLogLevel::logNORMAL, "--------","-----", "-------");
 
 	// First pass to count the max ticks 
 	// We assume that there was a function logger on the outer most (main) program.
@@ -58,7 +57,7 @@ CFileLogger::~CFileLogger()
 
 	for(const auto &[function_name, duration] : m_mapFunctionDuration)
 	{
-		Log("%-60s%20I64Ld%10.2f", logNORMAL, function_name.c_str(), duration, static_cast<double>(duration) / max_duration  * 100.0);
+		Log("%-60s%20I64Ld%10.2f", eLogLevel::logNORMAL, function_name.c_str(), duration, static_cast<double>(duration) / max_duration  * 100.0);
 	}
 }
 
@@ -127,7 +126,7 @@ void CFileLogger::Log(const std::string strText, eLogLevel iLogLevel, ...)
 // Version that assume log level is logDEBUG
 void CFileLogger::LogDebug(const char* szText, ...)
 {
-	if(m_iLogLevel > logDEBUG) return;
+	if(m_iLogLevel > eLogLevel::logDEBUG) return;
 
     va_list args;  
 
@@ -139,7 +138,7 @@ void CFileLogger::LogDebug(const char* szText, ...)
 // Version that assume log level is logNormal
 void CFileLogger::LogNormal(const char* szText, ...)
 {
-    if(m_iLogLevel > logNORMAL) return;
+    if(m_iLogLevel > eLogLevel::logNORMAL) return;
 
     va_list args;