Removing some unused includes

Author: PapeCoding

Src/Common/SBTree.h

@@ -7,8 +7,6 @@
  *
  */
 
-#include <stdlib.h>
-
 class SBTree {
 public:
     SBTree(int iValue);

Src/Common/Trace.h

@@ -25,7 +25,6 @@
 // removed by the compiler
 
 #include <stdarg.h>
-#include <stdio.h>
 
 void DasherTraceOutput(const char *pszFormat, ...);
 void DasherTraceOutputImpl(const char *pszFormat, va_list vargs);

Src/DasherCore/AbstractXMLParser.cpp

@@ -11,8 +11,6 @@
 
 #include <fstream>
 
-#include "FileUtils.h"
-
 bool AbstractParser::ParseFile(const std::string& strPath, bool bUser)
 {
 	std::ifstream in(strPath.c_str(), std::ios::binary);

Src/DasherCore/Alphabet/AlphIO.cpp

@@ -25,8 +25,6 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../ColorIO.h"
-
 using namespace Dasher;
 
 CAlphIO::CAlphIO(CMessageDisplay *pMsgs) : AbstractXMLParser(pMsgs) {

Src/DasherCore/Alphabet/AlphIO.h

@@ -28,7 +28,6 @@
 #include <map>
 #include <pugixml.hpp>
 #include <vector>
-#include <utility>
 
 namespace Dasher {
   class CAlphIO;

Src/DasherCore/Alphabet/AlphInfo.h

@@ -21,16 +21,12 @@
 #ifndef __ALPHINFO_H__
 #define __ALPHINFO_H__
 
-#include <locale>
 
 #include "../DasherTypes.h"
-#include "AlphabetMap.h"
 #include "GroupInfo.h"
 
 #include <string>
-#include <unordered_map>
 #include <vector>
-#include <utility>              // for std::pair
 
 #include "Actions.h"
 

Src/DasherCore/AlphabetManager.h

@@ -21,6 +21,8 @@
 #ifndef __alphabetmanager_h__
 #define __alphabetmanager_h__
 
+#include <map>
+
 #include "LanguageModelling/LanguageModel.h"
 #include "DasherNode.h"
 #include "NodeManager.h"

Src/DasherCore/AlternatingDirectMode.cpp

@@ -9,7 +9,6 @@
 #include <I18n.h>
 
 #include "DasherInterfaceBase.h"
-#include <valarray>
 
 
 using namespace Dasher;

Src/DasherCore/AlternatingDirectMode.h

@@ -5,7 +5,6 @@
 #ifndef __ALTERNATING_DIRECT_MODE_H__
 #define __ALTERNATING_DIRECT_MODE_H__
 
-#include "Event.h"
 #include "DasherButtons.h"
 
 namespace Dasher {

Src/DasherCore/ButtonMode.cpp

@@ -8,7 +8,6 @@
 
 #include "DasherScreen.h"
 #include "DasherInterfaceBase.h"
-#include <valarray>
 
 
 using namespace Dasher;
@@ -113,7 +112,7 @@ void CButtonMode::SetupBoxes()
       double dMaxSize;
 
       if(dRatio == 1.0) {
-        dMaxSize = iDasherY / iForwardBoxes;
+        dMaxSize = static_cast<double>(iDasherY) / static_cast<double>(iForwardBoxes);
       }
       else {
         if(bEven)