CLI2: Static initialization of global settings.

This commit is contained in:
Paul Beckingham 2015-06-13 13:38:19 -04:00
parent 708ddd3804
commit ca90893216
3 changed files with 3 additions and 3 deletions

View file

@ -38,10 +38,10 @@
extern Context context; extern Context context;
/*
// Overridden by rc.abbreviation.minimum. // Overridden by rc.abbreviation.minimum.
int CLI2::minimumMatchLength = 3; int CLI2::minimumMatchLength = 3;
/*
// Alias expansion limit. Any more indicates some kind of error. // Alias expansion limit. Any more indicates some kind of error.
static int safetyValveDefault = 10; static int safetyValveDefault = 10;

View file

@ -68,9 +68,8 @@ public:
class CLI2 class CLI2
{ {
public: public:
/*
static int minimumMatchLength; static int minimumMatchLength;
*/
static void getOverride (int, const char**, std::string&, File&); static void getOverride (int, const char**, std::string&, File&);
static void getDataLocation (int, const char**, Path&); static void getDataLocation (int, const char**, Path&);
static void applyOverrides (int, const char**); static void applyOverrides (int, const char**);

View file

@ -624,6 +624,7 @@ void Context::getLimits (int& rows, int& lines)
void Context::staticInitialization () void Context::staticInitialization ()
{ {
CLI::minimumMatchLength = config.getInteger ("abbreviation.minimum"); CLI::minimumMatchLength = config.getInteger ("abbreviation.minimum");
CLI2::minimumMatchLength = config.getInteger ("abbreviation.minimum");
Task::defaultProject = config.get ("default.project"); Task::defaultProject = config.get ("default.project");
Task::defaultDue = config.get ("default.due"); Task::defaultDue = config.get ("default.due");