remove unused includes to reduce interdependencies

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/AutoSpeedControl.cpp

@@ -1,6 +1,7 @@
 
 #include "AutoSpeedControl.h"
 
+#include <algorithm>
 #include <cmath>
 
 using namespace Dasher;

Src/DasherCore/ButtonMode.cpp

@@ -5,10 +5,10 @@
 #include "ButtonMode.h"
 
 #include <I18n.h>
+#include <cmath>
 
 #include "DasherScreen.h"
 #include "DasherInterfaceBase.h"
-#include <valarray>
 
 
 using namespace Dasher;
@@ -113,7 +113,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)

Src/DasherCore/ButtonMode.h

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

Src/DasherCore/CannaConversionHelper.cpp

@@ -7,6 +7,7 @@
 #include <canna/jrkanji.h>
 #include <canna/RK.h>
 #include <iconv.h>
+#include "SCENode.h"
 
 #define BUFSIZE 10240
 

Src/DasherCore/CannaConversionHelper.h

@@ -6,12 +6,11 @@
 #include "ConversionManager.h"
 #include <iconv.h>
 
-#include <iostream> 
 /// \ingroup Model
 /// @{
 class CCannaConversionHelper : public Dasher::CConversionManager {
  public:
-  CCannaConversionHelper(CNodeCreationManager *pNCManager, Dasher::const CAlphInfo *pAlphabet, int Type, int Order);
+  CCannaConversionHelper(CNodeCreationManager *pNCManager, const Dasher::CAlphInfo *pAlphabet, int Type, int Order);
   ~CCannaConversionHelper();
 
   virtual bool Convert(const std::string &strSource, SCENode ** pRoot);

Src/DasherCore/ClickFilter.cpp

@@ -1,5 +1,6 @@
 #include "ClickFilter.h"
 #include "DasherInterfaceBase.h"
+#include <algorithm>
 
 using namespace Dasher;
 

Src/DasherCore/ColorPalette.h

@@ -8,11 +8,9 @@
 
 #pragma once
 
-#include "AbstractXMLParser.h"
-
-#include <map>
 #include <unordered_map>
 #include <vector>
+#include <string>
 
 namespace Dasher {
 	namespace NamedColor

Src/DasherCore/CompassMode.cpp

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

Src/DasherCore/CompassMode.h

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

Src/DasherCore/ConversionManager.cpp

@@ -27,7 +27,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
-#include <stdlib.h>
+#include <ostream>
 
 //Note the new implementation in Mandarin Dasher may not be compatible with the previous implementation of Japanese Dasher
 //Need to reconcile (a small project)

Src/DasherCore/ConversionManager.h

@@ -21,6 +21,8 @@
 #ifndef __conversion_manager_h__
 #define __conversion_manager_h__
 
+#include <map>
+
 #include "DasherTypes.h"
 #include "LanguageModelling/LanguageModel.h" // Urgh - we really shouldn't need to know about language models here
 #include "DasherNode.h"

Src/DasherCore/DasherButtons.h

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

Src/DasherCore/DasherInterfaceBase.cpp

@@ -47,6 +47,7 @@
 
 // STL headers
 #include <sstream>
+#include <algorithm>
 
 // Declare our global file logging object
 

Src/DasherCore/DasherInterfaceBase.h

@@ -33,14 +33,11 @@
 
 #include "Messages.h"
 #include "../Common/NoClones.h"
-#include "../Common/ModuleSettings.h"
 #include "Alphabet/AlphIO.h"
-#include "AutoSpeedControl.h"
 #include "ColorIO.h"
 #include "InputFilter.h"
 #include "ModuleManager.h"
 #include "FrameRate.h"
-#include <set>
 
 namespace Dasher {
   class CDasherScreen;

Src/DasherCore/DasherModel.cpp

@@ -24,6 +24,7 @@
 #include "NodeCreationManager.h"
 #include <cmath>
 #include <cstdint>
+#include <algorithm>
 
 using namespace Dasher;
 
@@ -371,7 +372,7 @@ void CDasherModel::ScheduleOneStep(dasherint y1, dasherint y2, int nSteps, int l
     // = (MAX_Y-(2*limX)) / (2*limX) * targetRange / (MAX_Y-targetRange)
     {
       const dasherint n=targetRange*(MAX_Y-2*limX), d=(MAX_Y-targetRange)*2*limX;
-      bool bOver=std::max(abs(m1),abs(m2))>std::numeric_limits<dasherint>::max()/n;
+      bool bOver=std::max(llabs(m1),llabs(m2))>std::numeric_limits<dasherint>::max()/n;
       if (bOver) {
         //std::cout << "Overflow in max-speed-limit " << m1 << "," << m2 << " =wd> " << ((m1*n)/d) << "," << ((m2*n)/d);
         //so do it a harder way, but which uses smaller intermediates:

Src/DasherCore/DasherNode.h

@@ -22,7 +22,6 @@
 #define __DasherNode_h__
 
 #include "../Common/NoClones.h"
-#include "LanguageModelling/LanguageModel.h"
 //Includes needed for used classes
 #include "NodeManager.h"
 #include "Alphabet/AlphabetMap.h"
@@ -35,7 +34,6 @@ namespace Dasher {
   class CDasherInterfaceBase;
 }
 #include <deque>
-#include <iostream>
 #include <vector>
 
 /// \ingroup Model

Src/DasherCore/DasherScreen.h

@@ -6,7 +6,7 @@
 #define __DasherScreen_h_
 
 #include "DasherTypes.h"
-#include "../DasherCore/ColorIO.h"
+#include "ColorPalette.h"
 #include "myassert.h"
 #include <set>
 

Src/DasherCore/DasherView.cpp

@@ -18,9 +18,8 @@
 // along with Dasher; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include "DasherInput.h"
 #include "DasherView.h"
-
+#include <algorithm>
 
 using namespace Dasher;
 

Src/DasherCore/DefaultFilter.cpp

@@ -1,6 +1,8 @@
 #include "DefaultFilter.h"
 
 #include <I18n.h>
+#include <algorithm>
+#include <cmath>
 
 #include "DasherInterfaceBase.h"
 

Src/DasherCore/DemoFilter.cpp

@@ -1,6 +1,7 @@
 #include "DemoFilter.h"
 
 #include <I18n.h>
+#include <cmath>
 
 #include "DasherInterfaceBase.h"
 

Src/DasherCore/DynamicFilter.cpp

@@ -20,6 +20,7 @@
 
 #include "DasherInterfaceBase.h"
 #include "DynamicFilter.h"
+#include <algorithm>
 
 using namespace Dasher;
 

Src/DasherCore/Event.h

@@ -4,8 +4,6 @@
 
 #include <string>
 #include <functional>
-#include "DasherTypes.h"
-
 
 namespace Dasher {
   class CEditEvent;

Src/DasherCore/FileWordGenerator.h

@@ -5,6 +5,7 @@
 #include <fstream>
 
 #include "WordGeneratorBase.h"
+#include "AbstractXMLParser.h"
 
 namespace Dasher {