diff --git a/CMakeLists.txt b/CMakeLists.txt index ad4d3c855..d7920f4c3 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Src/Common/Globber.cpp b/Src/Common/Globber.cpp deleted file mode 100644 index a71868254..000000000 --- a/Src/Common/Globber.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// -// Globber.cpp -// Dasher -// -// Created by Alan Lawrence on 21/9/11. -// Copyright 2011 Cambridge University. All rights reserved. -// - -#include "Globber.h" -#include -#include - -void globScan(AbstractParser *parser, const char **usrPaths, const char **sysPaths, int(*error_callback)(const char *,int)) { - int flags = GLOB_MARK | GLOB_NOSORT; - glob_t info; - size_t numUser = 0; - memset(&info, 0, sizeof(info)); - while (*usrPaths) { - glob(*usrPaths++, flags, error_callback, &info); //NULL error function - flags |= GLOB_APPEND; - } - numUser = info.gl_pathc; - while (*sysPaths) { - glob(*sysPaths++, flags, error_callback, &info); - flags |= GLOB_APPEND; - } - - if (info.gl_pathc) { - //user paths first - for (char **fname = info.gl_pathv; *fname; fname++, numUser=(numUser>0 ? numUser-1 : 0)) { - if ((*fname)[strlen(*fname)-1]=='/') continue; //directories were marked by GLOB_MARK - parser->ParseFile(*fname, numUser>0); - } - } - globfree(&info); -} - -void globScan(AbstractParser *parser, const char **usrPaths, const char **sysPaths) { - globScan(parser, usrPaths, sysPaths, NULL); -} diff --git a/Src/Common/Globber.h b/Src/Common/Globber.h deleted file mode 100644 index 41b54eb4a..000000000 --- a/Src/Common/Globber.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// Globber.h -// Dasher -// -// Created by Alan Lawrence on 21/9/11. -// Copyright 2011 Cambridge University. All rights reserved. -// - -#pragma once - -#include "../DasherCore/AbstractXMLParser.h" - -void globScan(AbstractParser *parser, - const char **userPaths, - const char **systemPaths); -void globScan(AbstractParser *parser, - const char **usrPaths, - const char **sysPaths, - int(*error_callback)(const char *,int)); - diff --git a/Src/DasherCore/Alphabet/AlphIO.h b/Src/DasherCore/Alphabet/AlphIO.h index e42f3ed3d..9f7597ad1 100644 --- a/Src/DasherCore/Alphabet/AlphIO.h +++ b/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 #include diff --git a/Src/DasherCore/Alphabet/AlphInfo.h b/Src/DasherCore/Alphabet/AlphInfo.h index 9fcc0142d..614140b7f 100644 --- a/Src/DasherCore/Alphabet/AlphInfo.h +++ b/Src/DasherCore/Alphabet/AlphInfo.h @@ -21,13 +21,13 @@ #pragma once -#include "../DasherTypes.h" +#include "DasherCore/DasherTypes.h" #include "GroupInfo.h" #include #include -#include "Actions.h" +#include "DasherCore/Actions.h" namespace Dasher { class CAlphInfo; diff --git a/Src/DasherCore/Alphabet/AlphabetMap.cpp b/Src/DasherCore/Alphabet/AlphabetMap.cpp index 4e85d12f7..69e2674ff 100644 --- a/Src/DasherCore/Alphabet/AlphabetMap.cpp +++ b/Src/DasherCore/Alphabet/AlphabetMap.cpp @@ -12,8 +12,7 @@ #include #include #include -#include -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/Alphabet/AlphabetMap.h b/Src/DasherCore/Alphabet/AlphabetMap.h index 555104252..882931ef3 100644 --- a/Src/DasherCore/Alphabet/AlphabetMap.h +++ b/Src/DasherCore/Alphabet/AlphabetMap.h @@ -13,7 +13,7 @@ #include #endif -#include "../DasherTypes.h" +#include "DasherCore/DasherTypes.h" #include #include @@ -71,7 +71,7 @@ namespace Dasher { /// /// IAM 08/2002 -#include "../Messages.h" +#include "DasherCore/Messages.h" class Dasher::CAlphabetMap { diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp index 941f0496f..1511c39ac 100644 --- a/Src/DasherCore/AlphabetManager.cpp +++ b/Src/DasherCore/AlphabetManager.cpp @@ -20,8 +20,6 @@ #include "AlphabetManager.h" -#include - #include "ConversionManager.h" #include "DasherInterfaceBase.h" #include "DasherNode.h" diff --git a/Src/DasherCore/AlternatingDirectMode.cpp b/Src/DasherCore/AlternatingDirectMode.cpp index 38019c594..6c18fd005 100644 --- a/Src/DasherCore/AlternatingDirectMode.cpp +++ b/Src/DasherCore/AlternatingDirectMode.cpp @@ -6,7 +6,7 @@ #include "AlternatingDirectMode.h" -#include +#include "DasherCore/Common/I18n.h" #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/ButtonMode.cpp b/Src/DasherCore/ButtonMode.cpp index 18387534d..bd33a55b1 100644 --- a/Src/DasherCore/ButtonMode.cpp +++ b/Src/DasherCore/ButtonMode.cpp @@ -4,7 +4,7 @@ #include "ButtonMode.h" -#include +#include "DasherCore/Common/I18n.h" #include #include "DasherButtons.h" diff --git a/Src/DasherCore/ClickFilter.h b/Src/DasherCore/ClickFilter.h index ebb62883e..5ab9a08ca 100644 --- a/Src/DasherCore/ClickFilter.h +++ b/Src/DasherCore/ClickFilter.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "DasherCore/Common/I18n.h" #include "SettingsStore.h" #include "StaticFilter.h" diff --git a/Src/Common/Allocators/PooledAlloc.h b/Src/DasherCore/Common/Allocators/PooledAlloc.h similarity index 100% rename from Src/Common/Allocators/PooledAlloc.h rename to Src/DasherCore/Common/Allocators/PooledAlloc.h diff --git a/Src/Common/Allocators/SimplePooledAlloc.h b/Src/DasherCore/Common/Allocators/SimplePooledAlloc.h similarity index 100% rename from Src/Common/Allocators/SimplePooledAlloc.h rename to Src/DasherCore/Common/Allocators/SimplePooledAlloc.h diff --git a/Src/Common/AppSettingsData.h b/Src/DasherCore/Common/AppSettingsData.h similarity index 97% rename from Src/Common/AppSettingsData.h rename to Src/DasherCore/Common/AppSettingsData.h index acc1ceb06..91496ebc8 100644 --- a/Src/Common/AppSettingsData.h +++ b/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 diff --git a/Src/Common/AppSettingsHeader.h b/Src/DasherCore/Common/AppSettingsHeader.h similarity index 94% rename from Src/Common/AppSettingsHeader.h rename to Src/DasherCore/Common/AppSettingsHeader.h index b77079f70..a394b0ea6 100644 --- a/Src/Common/AppSettingsHeader.h +++ b/Src/DasherCore/Common/AppSettingsHeader.h @@ -1,6 +1,6 @@ #pragma once -#include "../DasherCore/Parameters.h" +#include "DasherCore/Parameters.h" #ifdef HAVE_CONFIG_H #include #endif diff --git a/Src/Common/I18n.h b/Src/DasherCore/Common/I18n.h similarity index 100% rename from Src/Common/I18n.h rename to Src/DasherCore/Common/I18n.h diff --git a/Src/Common/MSVC_Unannoy.h b/Src/DasherCore/Common/MSVC_Unannoy.h similarity index 100% rename from Src/Common/MSVC_Unannoy.h rename to Src/DasherCore/Common/MSVC_Unannoy.h diff --git a/Src/Common/ModuleSettings.h b/Src/DasherCore/Common/ModuleSettings.h similarity index 100% rename from Src/Common/ModuleSettings.h rename to Src/DasherCore/Common/ModuleSettings.h diff --git a/Src/Common/NoClones.h b/Src/DasherCore/Common/NoClones.h similarity index 100% rename from Src/Common/NoClones.h rename to Src/DasherCore/Common/NoClones.h diff --git a/Src/Common/OpenGLScreen.h b/Src/DasherCore/Common/OpenGLScreen.h similarity index 100% rename from Src/Common/OpenGLScreen.h rename to Src/DasherCore/Common/OpenGLScreen.h diff --git a/Src/Common/Platform/stdminmax.h b/Src/DasherCore/Common/Platform/stdminmax.h similarity index 100% rename from Src/Common/Platform/stdminmax.h rename to Src/DasherCore/Common/Platform/stdminmax.h diff --git a/Src/Common/SBTree.cpp b/Src/DasherCore/Common/SBTree.cpp similarity index 93% rename from Src/Common/SBTree.cpp rename to Src/DasherCore/Common/SBTree.cpp index 0f45b9c78..7502d982f 100644 --- a/Src/Common/SBTree.cpp +++ b/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; } diff --git a/Src/Common/SBTree.h b/Src/DasherCore/Common/SBTree.h similarity index 100% rename from Src/Common/SBTree.h rename to Src/DasherCore/Common/SBTree.h diff --git a/Src/Common/Trace.cpp b/Src/DasherCore/Common/Trace.cpp similarity index 50% rename from Src/Common/Trace.cpp rename to Src/DasherCore/Common/Trace.cpp index 3024693ba..d83f139cd 100644 --- a/Src/Common/Trace.cpp +++ b/Src/DasherCore/Common/Trace.cpp @@ -2,9 +2,9 @@ // // Copyright (c) 2005 David Ward -#include "Common.h" - #include "Trace.h" +#include +#include // 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 diff --git a/Src/Common/Trace.h b/Src/DasherCore/Common/Trace.h similarity index 100% rename from Src/Common/Trace.h rename to Src/DasherCore/Common/Trace.h diff --git a/Src/Common/Unicode/ConvertUTF.c b/Src/DasherCore/Common/Unicode/ConvertUTF.c similarity index 100% rename from Src/Common/Unicode/ConvertUTF.c rename to Src/DasherCore/Common/Unicode/ConvertUTF.c diff --git a/Src/Common/Unicode/ConvertUTF.h b/Src/DasherCore/Common/Unicode/ConvertUTF.h similarity index 100% rename from Src/Common/Unicode/ConvertUTF.h rename to Src/DasherCore/Common/Unicode/ConvertUTF.h diff --git a/Src/Common/Unicode/harness.c b/Src/DasherCore/Common/Unicode/harness.c similarity index 100% rename from Src/Common/Unicode/harness.c rename to Src/DasherCore/Common/Unicode/harness.c diff --git a/Src/Common/Unicode/original_harness.c b/Src/DasherCore/Common/Unicode/original_harness.c similarity index 100% rename from Src/Common/Unicode/original_harness.c rename to Src/DasherCore/Common/Unicode/original_harness.c diff --git a/Src/Common/myassert.h b/Src/DasherCore/Common/myassert.h similarity index 100% rename from Src/Common/myassert.h rename to Src/DasherCore/Common/myassert.h diff --git a/Src/Common/mydebug.h b/Src/DasherCore/Common/mydebug.h similarity index 100% rename from Src/Common/mydebug.h rename to Src/DasherCore/Common/mydebug.h diff --git a/Src/Common/round.c b/Src/DasherCore/Common/round.c similarity index 100% rename from Src/Common/round.c rename to Src/DasherCore/Common/round.c diff --git a/Src/Common/round.h b/Src/DasherCore/Common/round.h similarity index 100% rename from Src/Common/round.h rename to Src/DasherCore/Common/round.h diff --git a/Src/DasherCore/CompassMode.cpp b/Src/DasherCore/CompassMode.cpp index 0465fe9c1..7f04cc8d6 100644 --- a/Src/DasherCore/CompassMode.cpp +++ b/Src/DasherCore/CompassMode.cpp @@ -5,7 +5,7 @@ #include "CompassMode.h" -#include +#include "DasherCore/Common/I18n.h" #include "DasherScreen.h" #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp index 4bbf45fd9..161178634 100644 --- a/Src/DasherCore/DasherInterfaceBase.cpp +++ b/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; diff --git a/Src/DasherCore/DasherInterfaceBase.h b/Src/DasherCore/DasherInterfaceBase.h index 393bb22b8..2c302306e 100644 --- a/Src/DasherCore/DasherInterfaceBase.h +++ b/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" diff --git a/Src/DasherCore/DasherModel.h b/Src/DasherCore/DasherModel.h index 7b90ca92a..174b81528 100644 --- a/Src/DasherCore/DasherModel.h +++ b/Src/DasherCore/DasherModel.h @@ -22,7 +22,7 @@ #include -#include "../Common/NoClones.h" +#include "DasherCore/Common/NoClones.h" #include "DasherNode.h" #include "DasherTypes.h" #include "Event.h" diff --git a/Src/DasherCore/DasherModule.h b/Src/DasherCore/DasherModule.h index b5e3b1299..38a0c48e3 100644 --- a/Src/DasherCore/DasherModule.h +++ b/Src/DasherCore/DasherModule.h @@ -20,7 +20,7 @@ #pragma once -#include "../Common/ModuleSettings.h" +#include "DasherCore/Common/ModuleSettings.h" #include "Parameters.h" #include #include diff --git a/Src/DasherCore/DasherNode.h b/Src/DasherCore/DasherNode.h index 9b7626763..15ead9b0f 100644 --- a/Src/DasherCore/DasherNode.h +++ b/Src/DasherCore/DasherNode.h @@ -20,7 +20,7 @@ #pragma once -#include "../Common/NoClones.h" +#include "DasherCore/Common/NoClones.h" //Includes needed for used classes #include "NodeManager.h" #include "Alphabet/AlphabetMap.h" diff --git a/Src/DasherCore/DasherScreen.h b/Src/DasherCore/DasherScreen.h index c7e813bad..37e7d7c6c 100644 --- a/Src/DasherCore/DasherScreen.h +++ b/Src/DasherCore/DasherScreen.h @@ -6,7 +6,7 @@ #include "DasherTypes.h" #include "ColorPalette.h" -#include "myassert.h" +#include "DasherCore/Common/myassert.h" #include // DJW20050505 - renamed DrawText to DrawString - windows defines DrawText as a macro and it's diff --git a/Src/DasherCore/DefaultFilter.cpp b/Src/DasherCore/DefaultFilter.cpp index eeb34996c..d0a85de29 100644 --- a/Src/DasherCore/DefaultFilter.cpp +++ b/Src/DasherCore/DefaultFilter.cpp @@ -1,6 +1,6 @@ #include "DefaultFilter.h" -#include +#include "DasherCore/Common/I18n.h" #include #include @@ -8,7 +8,7 @@ #include "CircleStartHandler.h" #include "DasherTypes.h" -#include "ModuleSettings.h" +#include "DasherCore/Common/ModuleSettings.h" #include "Parameters.h" #include "TwoBoxStartHandler.h" diff --git a/Src/DasherCore/DefaultFilter.h b/Src/DasherCore/DefaultFilter.h index 226c78c0e..198205a66 100644 --- a/Src/DasherCore/DefaultFilter.h +++ b/Src/DasherCore/DefaultFilter.h @@ -2,7 +2,7 @@ #include "DynamicFilter.h" #include "AutoSpeedControl.h" -#include "ModuleSettings.h" +#include "DasherCore/Common/ModuleSettings.h" #include "StartHandler.h" namespace Dasher { diff --git a/Src/DasherCore/DemoFilter.cpp b/Src/DasherCore/DemoFilter.cpp index 9c34771e8..ee68beea2 100644 --- a/Src/DasherCore/DemoFilter.cpp +++ b/Src/DasherCore/DemoFilter.cpp @@ -1,6 +1,6 @@ #include "DemoFilter.h" -#include +#include "DasherCore/Common/I18n.h" #include #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/FileUtils.h b/Src/DasherCore/FileUtils.h index 12c311ada..63df2e357 100644 --- a/Src/DasherCore/FileUtils.h +++ b/Src/DasherCore/FileUtils.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "DasherCore/AbstractXMLParser.h" +#include "DasherCore/Messages.h" #include namespace Dasher { diff --git a/Src/DasherCore/FileWordGenerator.cpp b/Src/DasherCore/FileWordGenerator.cpp index 8c2ddf591..3a1b9ef2d 100644 --- a/Src/DasherCore/FileWordGenerator.cpp +++ b/Src/DasherCore/FileWordGenerator.cpp @@ -1,6 +1,6 @@ #include "FileWordGenerator.h" -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/GameModule.cpp b/Src/DasherCore/GameModule.cpp index 3bd9a5ec3..765549c28 100644 --- a/Src/DasherCore/GameModule.cpp +++ b/Src/DasherCore/GameModule.cpp @@ -1,6 +1,6 @@ #include "GameModule.h" -#include +#include "DasherCore/Common/I18n.h" #include "GameStatistics.h" #include diff --git a/Src/DasherCore/GameModule.h b/Src/DasherCore/GameModule.h index fafda4650..2d98c78c5 100644 --- a/Src/DasherCore/GameModule.h +++ b/Src/DasherCore/GameModule.h @@ -6,7 +6,7 @@ #include "DasherScreen.h" #include "DasherModel.h" -#include "../Common/ModuleSettings.h" +#include "DasherCore/Common/ModuleSettings.h" #include "DasherNode.h" #include "DasherView.h" #include "DasherTypes.h" diff --git a/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp b/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp index f5e24f37b..27e836657 100644 --- a/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp +++ b/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp @@ -7,11 +7,11 @@ ///////////////////////////////////////////////////////////////////////////// #include "DictLanguageModel.h" -#include "../Alphabet/AlphabetMap.h" +#include "DasherCore/Alphabet/AlphabetMap.h" #include #include -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; // static TCHAR debug[256]; diff --git a/Src/DasherCore/LanguageModelling/DictLanguageModel.h b/Src/DasherCore/LanguageModelling/DictLanguageModel.h index 04c8920eb..46d944b71 100644 --- a/Src/DasherCore/LanguageModelling/DictLanguageModel.h +++ b/Src/DasherCore/LanguageModelling/DictLanguageModel.h @@ -8,11 +8,11 @@ #pragma once -#include "../../Common/Allocators/PooledAlloc.h" -#include "../Alphabet/AlphInfo.h" -#include "../Alphabet/AlphabetMap.h" +#include "DasherCore/Common/Allocators/PooledAlloc.h" +#include "DasherCore/Alphabet/AlphInfo.h" +#include "DasherCore/Alphabet/AlphabetMap.h" #include "LanguageModel.h" -#include "../SettingsStore.h" +#include "DasherCore/SettingsStore.h" #include #include #include diff --git a/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp b/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp index 798ebdcb1..97e3d2bde 100644 --- a/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp +++ b/Src/DasherCore/LanguageModelling/PPMLanguageModel.cpp @@ -9,7 +9,7 @@ #include "PPMLanguageModel.h" #include -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/LanguageModelling/PPMLanguageModel.h b/Src/DasherCore/LanguageModelling/PPMLanguageModel.h index d96192eab..fa9050743 100644 --- a/Src/DasherCore/LanguageModelling/PPMLanguageModel.h +++ b/Src/DasherCore/LanguageModelling/PPMLanguageModel.h @@ -8,12 +8,12 @@ #pragma once -#include "../../Common/NoClones.h" -#include "../../Common/Allocators/PooledAlloc.h" +#include "DasherCore/Common/NoClones.h" +#include "DasherCore/Common/Allocators/PooledAlloc.h" -#include "DasherTypes.h" +#include "DasherCore/DasherTypes.h" #include "LanguageModel.h" -#include "../SettingsStore.h" +#include "DasherCore/SettingsStore.h" #include "stdlib.h" #include #include diff --git a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp index 6cbb49642..ff72ab2ae 100644 --- a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp +++ b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.cpp @@ -13,8 +13,8 @@ #include "PPMPYLanguageModel.h" #include "LanguageModel.h" #include "PPMLanguageModel.h" -#include "DasherTypes.h" -#include +#include "DasherCore/DasherTypes.h" +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.h b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.h index 0d03baafd..c49f0b39e 100644 --- a/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.h +++ b/Src/DasherCore/LanguageModelling/PPMPYLanguageModel.h @@ -13,7 +13,7 @@ #pragma once #include "PPMLanguageModel.h" -#include "DasherTypes.h" +#include "DasherCore/DasherTypes.h" #include #include diff --git a/Src/DasherCore/LanguageModelling/RoutingPPMLanguageModel.cpp b/Src/DasherCore/LanguageModelling/RoutingPPMLanguageModel.cpp index 20b8e252e..687a25725 100644 --- a/Src/DasherCore/LanguageModelling/RoutingPPMLanguageModel.cpp +++ b/Src/DasherCore/LanguageModelling/RoutingPPMLanguageModel.cpp @@ -8,7 +8,7 @@ #include "RoutingPPMLanguageModel.h" -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp b/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp index 9e3451eeb..8adba570c 100644 --- a/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp +++ b/Src/DasherCore/LanguageModelling/WordLanguageModel.cpp @@ -8,13 +8,13 @@ #include "WordLanguageModel.h" #include "PPMLanguageModel.h" -#include "../Alphabet/AlphabetMap.h" +#include "DasherCore/Alphabet/AlphabetMap.h" #include #include #include -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/LanguageModelling/WordLanguageModel.h b/Src/DasherCore/LanguageModelling/WordLanguageModel.h index 9736374f7..09a733176 100644 --- a/Src/DasherCore/LanguageModelling/WordLanguageModel.h +++ b/Src/DasherCore/LanguageModelling/WordLanguageModel.h @@ -8,11 +8,11 @@ #pragma once -#include "../../Common/Allocators/PooledAlloc.h" +#include "DasherCore/Common/Allocators/PooledAlloc.h" #include "PPMLanguageModel.h" -#include "../SettingsStore.h" -#include "../Alphabet/AlphInfo.h" -#include "../Alphabet/AlphabetMap.h" +#include "DasherCore/SettingsStore.h" +#include "DasherCore/Alphabet/AlphInfo.h" +#include "DasherCore/Alphabet/AlphabetMap.h" #include #include diff --git a/Src/DasherCore/MandarinAlphMgr.cpp b/Src/DasherCore/MandarinAlphMgr.cpp index 614d42c10..38af49663 100644 --- a/Src/DasherCore/MandarinAlphMgr.cpp +++ b/Src/DasherCore/MandarinAlphMgr.cpp @@ -21,7 +21,7 @@ #include "MandarinAlphMgr.h" #include -#include +#include "DasherCore/Common/I18n.h" #include "LanguageModelling/PPMPYLanguageModel.h" #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/NodeCreationManager.cpp b/Src/DasherCore/NodeCreationManager.cpp index e63828d48..cb9ed358a 100644 --- a/Src/DasherCore/NodeCreationManager.cpp +++ b/Src/DasherCore/NodeCreationManager.cpp @@ -2,8 +2,6 @@ #include "DasherInterfaceBase.h" #include "NodeCreationManager.h" -#include - #include "FileUtils.h" #include "MandarinAlphMgr.h" #include "RoutingAlphMgr.h" diff --git a/Src/DasherCore/OneButtonDynamicFilter.cpp b/Src/DasherCore/OneButtonDynamicFilter.cpp index 053c83ae6..21336cf21 100644 --- a/Src/DasherCore/OneButtonDynamicFilter.cpp +++ b/Src/DasherCore/OneButtonDynamicFilter.cpp @@ -20,7 +20,7 @@ #include "OneButtonDynamicFilter.h" -#include +#include "DasherCore/Common/I18n.h" #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/OneButtonFilter.cpp b/Src/DasherCore/OneButtonFilter.cpp index 50519bdcf..da25e4acb 100644 --- a/Src/DasherCore/OneButtonFilter.cpp +++ b/Src/DasherCore/OneButtonFilter.cpp @@ -1,7 +1,7 @@ #include "OneButtonFilter.h" -#include +#include "DasherCore/Common/I18n.h" #include #include "DasherScreen.h" diff --git a/Src/DasherCore/OneDimensionalFilter.h b/Src/DasherCore/OneDimensionalFilter.h index b019703b3..de19bce81 100644 --- a/Src/DasherCore/OneDimensionalFilter.h +++ b/Src/DasherCore/OneDimensionalFilter.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "DasherCore/Common/I18n.h" #include "CircleStartHandler.h" #include "DefaultFilter.h" diff --git a/Src/DasherCore/RoutingAlphMgr.cpp b/Src/DasherCore/RoutingAlphMgr.cpp index d67bf0300..5249201b2 100644 --- a/Src/DasherCore/RoutingAlphMgr.cpp +++ b/Src/DasherCore/RoutingAlphMgr.cpp @@ -8,7 +8,6 @@ #include "RoutingAlphMgr.h" -#include #include "DasherInterfaceBase.h" #include "LanguageModelling/RoutingPPMLanguageModel.h" diff --git a/Src/DasherCore/SettingsStore.cpp b/Src/DasherCore/SettingsStore.cpp index ec9e1a0b9..cdeccf20d 100644 --- a/Src/DasherCore/SettingsStore.cpp +++ b/Src/DasherCore/SettingsStore.cpp @@ -9,7 +9,7 @@ #include "SettingsStore.h" #include -#include +#include "DasherCore/Common/myassert.h" using namespace Dasher; diff --git a/Src/DasherCore/SocketInput.cpp b/Src/DasherCore/SocketInput.cpp index 5141fcc6b..27d63025b 100644 --- a/Src/DasherCore/SocketInput.cpp +++ b/Src/DasherCore/SocketInput.cpp @@ -5,7 +5,7 @@ // Linux-specific subclass of SocketInputBase: provides network socket control of Dasher cursor #ifndef _WIN32 -#include "../Common/Common.h" +#include "DasherCore/Common/Common.h" #include "SocketInput.h" #include "SocketInputBase.h" diff --git a/Src/DasherCore/SocketInputBase.cpp b/Src/DasherCore/SocketInputBase.cpp index 5fb71ca46..f9d79d8f4 100644 --- a/Src/DasherCore/SocketInputBase.cpp +++ b/Src/DasherCore/SocketInputBase.cpp @@ -3,7 +3,7 @@ // (C) Copyright Seb Wills 2005 #ifndef _WIN32 -#include "../Common/Common.h" +#include "DasherCore/Common/Common.h" #include "SocketInputBase.h" diff --git a/Src/DasherCore/StylusFilter.h b/Src/DasherCore/StylusFilter.h index 62b745bcb..579479e31 100644 --- a/Src/DasherCore/StylusFilter.h +++ b/Src/DasherCore/StylusFilter.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "DasherCore/Common/I18n.h" #include "DefaultFilter.h" #include "ClickFilter.h" diff --git a/Src/DasherCore/Trainer.cpp b/Src/DasherCore/Trainer.cpp index 00e8ad181..60958b33e 100644 --- a/Src/DasherCore/Trainer.cpp +++ b/Src/DasherCore/Trainer.cpp @@ -1,8 +1,6 @@ #include "Trainer.h" -#include - #include #include #include diff --git a/Src/DasherCore/Trainer.h b/Src/DasherCore/Trainer.h index cab502c5d..a027d2279 100644 --- a/Src/DasherCore/Trainer.h +++ b/Src/DasherCore/Trainer.h @@ -2,8 +2,8 @@ #include "Alphabet/AlphInfo.h" #include "AbstractXMLParser.h" -#include "AlphabetMap.h" -#include "LanguageModel.h" +#include "DasherCore/Alphabet/AlphabetMap.h" +#include "DasherCore/LanguageModelling/LanguageModel.h" namespace Dasher { class CTrainer : public AbstractParser { diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp index 6fe982bfa..140f57381 100644 --- a/Src/DasherCore/TwoButtonDynamicFilter.cpp +++ b/Src/DasherCore/TwoButtonDynamicFilter.cpp @@ -20,7 +20,7 @@ #include "TwoButtonDynamicFilter.h" -#include +#include "DasherCore/Common/I18n.h" #include #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/TwoPushDynamicFilter.cpp b/Src/DasherCore/TwoPushDynamicFilter.cpp index 9e13f2722..20a3fe9dd 100644 --- a/Src/DasherCore/TwoPushDynamicFilter.cpp +++ b/Src/DasherCore/TwoPushDynamicFilter.cpp @@ -20,7 +20,7 @@ #include "TwoPushDynamicFilter.h" -#include +#include "DasherCore/Common/I18n.h" #include #include "DasherInterfaceBase.h" diff --git a/Src/DasherCore/UserLog.h b/Src/DasherCore/UserLog.h index e2c9ab942..c85a05a6f 100644 --- a/Src/DasherCore/UserLog.h +++ b/Src/DasherCore/UserLog.h @@ -35,6 +35,7 @@ #include "UserLogBase.h" #include "XMLUtil.h" #include "SettingsStore.h" +#include "DasherInterfaceBase.h" const int USER_LOG_DEFAULT_SIZE_TRIAL_XML = 65536; // How big we think the XML string representing a single trial will be const int LOG_MOUSE_EVERY_MS = 200; // How often to log the mouse position (-1 for never), the frequency is also depends on how often the WM_TIMER event fires in dasher diff --git a/Src/DasherCore/WordGeneratorBase.h b/Src/DasherCore/WordGeneratorBase.h index c3714f56f..a23e5ae0c 100644 --- a/Src/DasherCore/WordGeneratorBase.h +++ b/Src/DasherCore/WordGeneratorBase.h @@ -2,7 +2,7 @@ #include #include "Alphabet/AlphabetMap.h" -#include "AlphInfo.h" +#include "DasherCore/Alphabet/AlphInfo.h" namespace Dasher { /**