From e350142b19d86da2ec6c9f6524c7741989eea93f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 19 Mar 2017 10:00:25 -0400 Subject: [PATCH] Context: Selects Datetime/Duration features to match expectations --- src/Context.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/Context.cpp b/src/Context.cpp index d5470da4c..fd59ae1bc 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1027,19 +1028,23 @@ void Context::getLimits (int& rows, int& lines) // easier, it has been decoupled from Context. void Context::staticInitialization () { - CLI2::minimumMatchLength = config.getInteger ("abbreviation.minimum"); - Lexer::minimumMatchLength = config.getInteger ("abbreviation.minimum"); + CLI2::minimumMatchLength = config.getInteger ("abbreviation.minimum"); + Lexer::minimumMatchLength = config.getInteger ("abbreviation.minimum"); - Task::defaultProject = config.get ("default.project"); - Task::defaultDue = config.get ("default.due"); - Task::defaultScheduled = config.get ("default.scheduled"); + Task::defaultProject = config.get ("default.project"); + Task::defaultDue = config.get ("default.due"); + Task::defaultScheduled = config.get ("default.scheduled"); - Task::searchCaseSensitive = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive"); - Task::regex = Variant::searchUsingRegex = config.getBoolean ("regex"); - Lexer::dateFormat = Variant::dateFormat = config.get ("dateformat"); - Datetime::isoEnabled = config.getBoolean ("date.iso"); + Task::searchCaseSensitive = Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive"); + Task::regex = Variant::searchUsingRegex = config.getBoolean ("regex"); + Lexer::dateFormat = Variant::dateFormat = config.get ("dateformat"); - TDB2::debug_mode = config.getBoolean ("debug"); + Datetime::isoEnabled = config.getBoolean ("date.iso"); + Datetime::standaloneDateEnabled = false; + Datetime::standaloneTimeEnabled = false; + Duration::standaloneSecondsEnabled = false; + + TDB2::debug_mode = config.getBoolean ("debug"); for (auto& rc : config) {