Cleaning up the build system and the library structure at bit

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.12)
 
 project("DasherCore")
 
@@ -23,109 +23,31 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Thirdparty/pugixml" EXCLUDE_FROM_ALL
 # Building Core Dasher Library
 ###############################
 
-file(GLOB_RECURSE HEADER_FILES
-    ${CMAKE_CURRENT_LIST_DIR}/Src/*.h
+file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_LIST_DIR}/Src/**/*.h
 )
 
-set(SOURCE_FILES
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Actions.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/PressFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Parameters.cpp 
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SettingsStore.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/XmlSettingsStore.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/AbstractXMLParser.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Alphabet/AlphIO.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Alphabet/AlphInfo.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Alphabet/AlphabetMap.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/AlternatingDirectMode.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/AlphabetManager.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/AutoSpeedControl.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/BasicLog.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/FileLogger.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/FileUtils.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ButtonMode.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ButtonMultiPress.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/CircleStartHandler.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ClickFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ColorIO.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ColorPalette.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/CompassMode.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ConversionManager.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ConvertingAlphMgr.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherButtons.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherInterfaceBase.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DashIntfSettings.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DashIntfScreenMsgs.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherModel.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherModule.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherNode.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherTypes.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherView.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherViewSquare.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DefaultFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DemoFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DynamicButtons.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DynamicFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/FileWordGenerator.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/FrameRate.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/GameModule.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/MandarinAlphMgr.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Messages.cpp 
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ModuleManager.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/NodeCreationManager.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ExpansionPolicy.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/OneButtonDynamicFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/OneButtonFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/OneDimensionalFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/PressFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SmoothingFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/RoutingAlphMgr.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SCENode.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/ScreenGameModule.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SimpleTimer.cpp
-	# ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInput.cpp
-	# ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInputBase.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/StaticFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/StylusFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/TimeSpan.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Trainer.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/TwoBoxStartHandler.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/TwoButtonDynamicFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/TwoPushDynamicFilter.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/UserButton.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/UserLocation.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/UserLog.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/UserLogBase.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/UserLogParam.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/UserLogTrial.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/WordGeneratorBase.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/XMLUtil.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/HashTable.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/RoutingPPMLanguageModel.cpp
-	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp
+file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_LIST_DIR}/Src/**/*.cpp
 )
 
+# Still in the library but not actively used anymore. Also not supported on all platforms
+list(REMOVE_ITEM HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/CannaConversionHelper.h")
+list(REMOVE_ITEM HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInputBase.h")
+list(REMOVE_ITEM HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInput.h")
+list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/CannaConversionHelper.cpp")
+list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInputBase.cpp")
+list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInput.cpp")
+
 ADD_library(DasherCore STATIC
 	${HEADER_FILES}
 	${SOURCE_FILES}
 )
 
-source_group(TREE ${CMAKE_CURRENT_LIST_DIR}/Src/ FILES ${HEADER_FILES} ${SOURCE_FILES})
-
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Alphabet/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/LanguageModelling/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/Common/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/Common/Allocators/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/Common/Platform/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/Common/Types/)
-target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/Common/Unicode/)
+target_include_directories(DasherCore PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Src/)
 
 add_dependencies(DasherCore pugixml)
 target_link_libraries(DasherCore pugixml)
 
+source_group(TREE ${CMAKE_CURRENT_LIST_DIR}/Src/ FILES ${HEADER_FILES} ${SOURCE_FILES})
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT DasherCore)

Src/DasherCore/Alphabet/AlphIO.h

@@ -20,10 +20,10 @@
 
 #pragma once
 
-#include "../AbstractXMLParser.h"
+#include "DasherCore/AbstractXMLParser.h"
 
-#include "../DasherTypes.h"
-#include "AlphInfo.h"
+#include "DasherCore/DasherTypes.h"
+#include "DasherCore/Alphabet/AlphInfo.h"
 
 #include <map>
 #include <pugixml.hpp>

Src/DasherCore/Alphabet/AlphInfo.h

@@ -21,13 +21,13 @@
 #pragma once
 
 
-#include "../DasherTypes.h"
+#include "DasherCore/DasherTypes.h"
 #include "GroupInfo.h"
 
 #include <string>
 #include <vector>
 
-#include "Actions.h"
+#include "DasherCore/Actions.h"
 
 namespace Dasher {
   class CAlphInfo;

Src/DasherCore/Alphabet/AlphabetMap.cpp

@@ -12,8 +12,7 @@
 #include <iostream>
 #include <sstream>
 #include <cstring>
-#include <I18n.h>
-#include <myassert.h>
+#include "DasherCore/Common/myassert.h"
 
 using namespace Dasher;
 

Src/DasherCore/Alphabet/AlphabetMap.h

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #endif
 
-#include "../DasherTypes.h"
+#include "DasherCore/DasherTypes.h"
 
 #include <vector>
 #include <string>
@@ -71,7 +71,7 @@ namespace Dasher {
 /// 
 /// IAM 08/2002
 
-#include "../Messages.h"
+#include "DasherCore/Messages.h"
 
 class Dasher::CAlphabetMap {
 

Src/DasherCore/AlphabetManager.cpp

@@ -20,8 +20,6 @@
 
 #include "AlphabetManager.h"
 
-#include <I18n.h>
-
 #include "ConversionManager.h"
 #include "DasherInterfaceBase.h"
 #include "DasherNode.h"

Src/DasherCore/AlternatingDirectMode.cpp

@@ -6,7 +6,7 @@
 
 #include "AlternatingDirectMode.h"
 
-#include <I18n.h>
+#include "DasherCore/Common/I18n.h"
 
 #include "DasherInterfaceBase.h"
 

Src/DasherCore/ButtonMode.cpp

@@ -4,7 +4,7 @@
 
 #include "ButtonMode.h"
 
-#include <I18n.h>
+#include "DasherCore/Common/I18n.h"
 #include <cmath>
 
 #include "DasherButtons.h"

Src/DasherCore/ClickFilter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <I18n.h>
+#include "DasherCore/Common/I18n.h"
 
 #include "SettingsStore.h"
 #include "StaticFilter.h"

Src/Common/AppSettingsData.h → Src/DasherCore/Common/AppSettingsData.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "AppSettingsHeader.h"
-#include "../DasherCore/Parameters.h"
+#include "DasherCore/Parameters.h"
 
 // This file is an include file purely for the purposes of
 // cross-platform consistency. IT WILL NOT LINK IF INCLUDED IN MORE

Src/Common/AppSettingsHeader.h → Src/DasherCore/Common/AppSettingsHeader.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../DasherCore/Parameters.h"
+#include "DasherCore/Parameters.h"
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Src/Common/SBTree.cpp → Src/DasherCore/Common/SBTree.cpp

@@ -11,8 +11,8 @@
 
 SBTree::SBTree(int iValue) {
 	m_iValue = iValue;
-	m_pLeft = NULL;
-	m_pRight = NULL;
+	m_pLeft = nullptr;
+	m_pRight = nullptr;
 	m_iCount = 1;
 }
 
@@ -47,15 +47,15 @@ SBTree* SBTree::Delete(int iValue) {
 	if(iValue == m_iValue) {
 		if(!m_pLeft) {
 			SBTree *pOldRight = m_pRight;
-			m_pRight = NULL;
+			m_pRight = nullptr;
 			delete this;
 			return pOldRight;
 		}
 		else {
 			SBTree *pOldLeft = m_pLeft;
 			pOldLeft->SetRightMost(m_pRight);
-			m_pLeft = NULL;
-			m_pRight = NULL;
+			m_pLeft = nullptr;
+			m_pRight = nullptr;
 			delete this;
 			return pOldLeft;
 		}

Src/Common/Trace.cpp → Src/DasherCore/Common/Trace.cpp

@@ -2,9 +2,9 @@
 //
 // Copyright (c) 2005 David Ward
 
-#include "Common.h"
-
 #include "Trace.h"
+#include <cstdio>
+#include <iostream>
 
 // Track memory leaks on Windows to the line that new'd the memory
 #ifdef _WIN32
@@ -18,26 +18,7 @@ static char THIS_FILE[] = __FILE__;
 
 // Customize behaviour of Trace here
 
-#ifdef _WIN32
-
-        // On Windows, send Trace to the Debug window in DevStudio
-        // The ATL/MFC Trace application also picks up Trace when running
-
-#include "Windows.h"
-
-void DasherTraceOutputImpl(const char *pszFormat, va_list vargs) {
-	// TODO: Reimplement
-//  char buffer[2048];
-//  _vsnprintf(buffer, 2048,pszFormat, vargs);
-//  OutputDebugStringA(buffer);
-}
-
-#else
-
-        // Send Trace to stdout
-
+// Send Trace to stdout
 void DasherTraceOutputImpl(const char *pszFormat, va_list vargs) {
   vfprintf(stdout, pszFormat, vargs);
 }
-
-#endif

Src/DasherCore/CompassMode.cpp

@@ -5,7 +5,7 @@
 
 #include "CompassMode.h"
 
-#include <I18n.h>
+#include "DasherCore/Common/I18n.h"
 
 #include "DasherScreen.h"
 #include "DasherInterfaceBase.h"

Src/DasherCore/DasherInterfaceBase.cpp

@@ -55,7 +55,7 @@
 #include "ActionManager.h"
 #include "FileUtils.h"
 #include "SmoothingFilter.h"
-#include "../DasherCore/FileLogger.h"
+#include "DasherCore/FileLogger.h"
 #ifndef NDEBUG
 const eLogLevel g_iLogLevel   = eLogLevel::logDEBUG;
 const int       g_iLogOptions = logTimeStamp | logDateStamp | logDeleteOldFile;

Src/DasherCore/DasherInterfaceBase.h

@@ -31,7 +31,7 @@
 // Check that everything that is not self-contained within the GUI is covered.
 
 #include "Messages.h"
-#include "../Common/NoClones.h"
+#include "DasherCore/Common/NoClones.h"
 #include "Alphabet/AlphIO.h"
 #include "ColorIO.h"
 #include "InputFilter.h"