From ec8115634d389d7373d237db41d5c0228c9b2c8c Mon Sep 17 00:00:00 2001 From: pixl Date: Mon, 23 Nov 2020 15:42:29 -0500 Subject: [PATCH] Revert "Enable compatibility with libconfig older than v1.5" --- src/logid/Configuration.cpp | 4 ++-- src/logid/actions/Action.cpp | 4 ++-- src/logid/actions/ChangeDPI.cpp | 6 +++--- src/logid/actions/ChangeHostAction.cpp | 4 ++-- src/logid/actions/CycleDPI.cpp | 6 +++--- src/logid/actions/GestureAction.cpp | 12 ++++++------ src/logid/actions/KeypressAction.cpp | 4 ++-- src/logid/actions/gesture/AxisGesture.cpp | 6 +++--- src/logid/actions/gesture/Gesture.cpp | 8 ++++---- src/logid/actions/gesture/IntervalGesture.cpp | 6 +++--- src/logid/features/HiresScroll.cpp | 12 ++++++------ src/logid/features/RemapButton.cpp | 6 +++--- src/logid/features/ThumbWheel.cpp | 10 +++++----- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/logid/Configuration.cpp b/src/logid/Configuration.cpp index 675cd04..a5fad09 100644 --- a/src/logid/Configuration.cpp +++ b/src/logid/Configuration.cpp @@ -98,7 +98,7 @@ Configuration::Configuration(const std::string& config_file) } try { - auto& ignore = root["ignore"]; + auto& ignore = root.lookup("ignore"); if(ignore.getType() == libconfig::Setting::TypeInt) { _ignore_list.insert((int)ignore); } else if(ignore.isList() || ignore.isArray()) { @@ -116,7 +116,7 @@ Configuration::Configuration(const std::string& config_file) } catch(const SettingNotFoundException& e) { // May be called blacklist try { - auto& ignore = root["blacklist"]; + auto& ignore = root.lookup("blacklist"); if(ignore.getType() == libconfig::Setting::TypeInt) { _ignore_list.insert((int)ignore); } else if(ignore.isList() || ignore.isArray()) { diff --git a/src/logid/actions/Action.cpp b/src/logid/actions/Action.cpp index eec051f..ecac552 100644 --- a/src/logid/actions/Action.cpp +++ b/src/logid/actions/Action.cpp @@ -41,7 +41,7 @@ std::shared_ptr Action::makeAction(Device *device, libconfig::Setting } try { - auto& action_type = setting["type"]; + auto& action_type = setting.lookup("type"); if(action_type.getType() != libconfig::Setting::TypeString) { logPrintf(WARN, "Line %d: Action type must be a string", @@ -76,4 +76,4 @@ std::shared_ptr Action::makeAction(Device *device, libconfig::Setting setting.getSourceLine()); throw InvalidAction(); } -} +} \ No newline at end of file diff --git a/src/logid/actions/ChangeDPI.cpp b/src/logid/actions/ChangeDPI.cpp index 98d1406..faab6b9 100644 --- a/src/logid/actions/ChangeDPI.cpp +++ b/src/logid/actions/ChangeDPI.cpp @@ -77,7 +77,7 @@ ChangeDPI::Config::Config(Device *device, libconfig::Setting &config) : } try { - auto& inc = config["inc"]; + auto& inc = config.lookup("inc"); if(inc.getType() != libconfig::Setting::TypeInt) logPrintf(WARN, "Line %d: inc must be an integer", inc.getSourceLine()); @@ -88,7 +88,7 @@ ChangeDPI::Config::Config(Device *device, libconfig::Setting &config) : } try { - auto& sensor = config["sensor"]; + auto& sensor = config.lookup("sensor"); if(sensor.getType() != libconfig::Setting::TypeInt) logPrintf(WARN, "Line %d: sensor must be an integer", sensor.getSourceLine()); @@ -106,4 +106,4 @@ uint16_t ChangeDPI::Config::interval() const uint8_t ChangeDPI::Config::sensor() const { return _sensor; -} +} \ No newline at end of file diff --git a/src/logid/actions/ChangeHostAction.cpp b/src/logid/actions/ChangeHostAction.cpp index 7f6e2aa..411b8ac 100644 --- a/src/logid/actions/ChangeHostAction.cpp +++ b/src/logid/actions/ChangeHostAction.cpp @@ -62,7 +62,7 @@ ChangeHostAction::Config::Config(Device *device, libconfig::Setting& config) : Action::Config(device) { try { - auto& host = config["host"]; + auto& host = config.lookup("host"); if(host.getType() == libconfig::Setting::TypeInt) { _offset = false; _host = host; @@ -116,4 +116,4 @@ uint8_t ChangeHostAction::Config::nextHost(hidpp20::ChangeHost::HostInfo info) } else return _host; } -} +} \ No newline at end of file diff --git a/src/logid/actions/CycleDPI.cpp b/src/logid/actions/CycleDPI.cpp index fe633e3..19b729c 100644 --- a/src/logid/actions/CycleDPI.cpp +++ b/src/logid/actions/CycleDPI.cpp @@ -77,7 +77,7 @@ CycleDPI::Config::Config(Device *device, libconfig::Setting &config) : } try { - auto& sensor = config["sensor"]; + auto& sensor = config.lookup("sensor"); if(sensor.getType() != Setting::TypeInt) logPrintf(WARN, "Line %d: sensor must be an integer", sensor.getSourceLine()); @@ -87,7 +87,7 @@ CycleDPI::Config::Config(Device *device, libconfig::Setting &config) : } try { - auto& dpis = config["dpis"]; + auto& dpis = config.lookup("dpis"); if(!dpis.isList() && !dpis.isArray()) { logPrintf(WARN, "Line %d: dpis must be a list or array, skipping.", dpis.getSourceLine()); @@ -130,4 +130,4 @@ bool CycleDPI::Config::empty() const uint8_t CycleDPI::Config::sensor() const { return _sensor; -} +} \ No newline at end of file diff --git a/src/logid/actions/GestureAction.cpp b/src/logid/actions/GestureAction.cpp index 67d2352..f364a32 100644 --- a/src/logid/actions/GestureAction.cpp +++ b/src/logid/actions/GestureAction.cpp @@ -180,7 +180,7 @@ GestureAction::Config::Config(Device* device, libconfig::Setting &root) : Action::Config(device) { try { - auto& gestures = root["gestures"]; + auto& gestures = root.lookup("gestures"); if(!gestures.isList()) { logPrintf(WARN, "Line %d: gestures must be a list, ignoring.", @@ -199,7 +199,7 @@ GestureAction::Config::Config(Device* device, libconfig::Setting &root) : Direction d; try { - auto& direction = gestures[i]["direction"]; + auto& direction = gestures[i].lookup("direction"); if(direction.getType() != libconfig::Setting::TypeString) { logPrintf(WARN, "Line %d: direction must be a string, " "skipping.", direction.getSourceLine()); @@ -228,7 +228,7 @@ GestureAction::Config::Config(Device* device, libconfig::Setting &root) : if(d == None) { try { - auto& mode = gestures[i]["mode"]; + auto& mode = gestures[i].lookup("mode"); if(mode.getType() == libconfig::Setting::TypeString) { std::string mode_str = mode; std::transform(mode_str.begin(), mode_str.end(), @@ -251,10 +251,10 @@ GestureAction::Config::Config(Device* device, libconfig::Setting &root) : try { _none_action = Action::makeAction(_device, - gestures[i]["action"]); + gestures[i].lookup("action")); } catch (InvalidAction& e) { logPrintf(WARN, "Line %d: %s is not a valid action, " - "skipping.", gestures[i]["action"] + "skipping.", gestures[i].lookup("action") .getSourceLine(), e.what()); } catch (libconfig::SettingNotFoundException& e) { logPrintf(WARN, "Line %d: action is a required field, " @@ -288,4 +288,4 @@ std::map>& std::shared_ptr GestureAction::Config::noneAction() { return _none_action; -} +} \ No newline at end of file diff --git a/src/logid/actions/KeypressAction.cpp b/src/logid/actions/KeypressAction.cpp index fe799f7..da097cc 100644 --- a/src/logid/actions/KeypressAction.cpp +++ b/src/logid/actions/KeypressAction.cpp @@ -57,7 +57,7 @@ KeypressAction::Config::Config(Device* device, libconfig::Setting& config) : } try { - auto &keys = config["keys"]; + auto &keys = config.lookup("keys"); if(keys.isArray() || keys.isList()) { int key_count = keys.getLength(); for(int i = 0; i < key_count; i++) { @@ -86,4 +86,4 @@ KeypressAction::Config::Config(Device* device, libconfig::Setting& config) : std::vector& KeypressAction::Config::keys() { return _keys; -} +} \ No newline at end of file diff --git a/src/logid/actions/gesture/AxisGesture.cpp b/src/logid/actions/gesture/AxisGesture.cpp index 8ff1caa..9325e8c 100644 --- a/src/logid/actions/gesture/AxisGesture.cpp +++ b/src/logid/actions/gesture/AxisGesture.cpp @@ -101,7 +101,7 @@ AxisGesture::Config::Config(Device *device, libconfig::Setting &setting) : Gesture::Config(device, setting, false) { try { - auto& axis = setting["axis"]; + auto& axis = setting.lookup("axis"); if(axis.isNumber()) { _axis = axis; } else if(axis.getType() == libconfig::Setting::TypeString) { @@ -123,7 +123,7 @@ AxisGesture::Config::Config(Device *device, libconfig::Setting &setting) : } try { - auto& multiplier = setting["axis_multiplier"]; + auto& multiplier = setting.lookup("axis_multiplier"); if(multiplier.isNumber()) { if(multiplier.getType() == libconfig::Setting::TypeFloat) _multiplier = multiplier; @@ -168,4 +168,4 @@ void AxisGesture::Config::setHiresMultiplier(double multiplier) } _hires_multiplier = multiplier; -} +} \ No newline at end of file diff --git a/src/logid/actions/gesture/Gesture.cpp b/src/logid/actions/gesture/Gesture.cpp index 99624a5..eb3bcfe 100644 --- a/src/logid/actions/gesture/Gesture.cpp +++ b/src/logid/actions/gesture/Gesture.cpp @@ -38,7 +38,7 @@ Gesture::Config::Config(Device* device, libconfig::Setting& root, if(action_required) { try { _action = Action::makeAction(_device, - root["action"]); + root.lookup("action")); } catch (libconfig::SettingNotFoundException &e) { throw InvalidGesture("action is missing"); } @@ -49,7 +49,7 @@ Gesture::Config::Config(Device* device, libconfig::Setting& root, _threshold = LOGID_GESTURE_DEFAULT_THRESHOLD; try { - auto& threshold = root["threshold"]; + auto& threshold = root.lookup("threshold"); if(threshold.getType() == libconfig::Setting::TypeInt) { _threshold = (int)threshold; if(_threshold <= 0) { @@ -76,7 +76,7 @@ std::shared_ptr Gesture::makeGesture(Device *device, } try { - auto& gesture_mode = setting["mode"]; + auto& gesture_mode = setting.lookup("mode"); if(gesture_mode.getType() != libconfig::Setting::TypeString) { logPrintf(WARN, "Line %d: Gesture mode must be a string," @@ -118,4 +118,4 @@ int16_t Gesture::Config::threshold() const std::shared_ptr Gesture::Config::action() { return _action; -} +} \ No newline at end of file diff --git a/src/logid/actions/gesture/IntervalGesture.cpp b/src/logid/actions/gesture/IntervalGesture.cpp index 9da7b88..a3d8438 100644 --- a/src/logid/actions/gesture/IntervalGesture.cpp +++ b/src/logid/actions/gesture/IntervalGesture.cpp @@ -66,7 +66,7 @@ IntervalGesture::Config::Config(Device *device, libconfig::Setting &setting) : Gesture::Config(device, setting) { try { - auto& interval = setting["interval"]; + auto& interval = setting.lookup("interval"); if(interval.getType() != libconfig::Setting::TypeInt) { logPrintf(WARN, "Line %d: interval must be an integer, skipping.", interval.getSourceLine()); @@ -76,7 +76,7 @@ IntervalGesture::Config::Config(Device *device, libconfig::Setting &setting) : } catch(libconfig::SettingNotFoundException& e) { try { // pixels is an alias for interval - auto& interval = setting["pixels"]; + auto& interval = setting.lookup("pixels"); if(interval.getType() != libconfig::Setting::TypeInt) { logPrintf(WARN, "Line %d: pixels must be an integer, skipping.", interval.getSourceLine()); @@ -93,4 +93,4 @@ IntervalGesture::Config::Config(Device *device, libconfig::Setting &setting) : int16_t IntervalGesture::Config::interval() const { return _interval; -} +} \ No newline at end of file diff --git a/src/logid/features/HiresScroll.cpp b/src/logid/features/HiresScroll.cpp index b3b1019..720f994 100644 --- a/src/logid/features/HiresScroll.cpp +++ b/src/logid/features/HiresScroll.cpp @@ -157,7 +157,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev) _mode = 0; _mask = 0; try { - auto& hires = config_root["hires"]; + auto& hires = config_root.lookup("hires"); if(hires.getType() == libconfig::Setting::TypeBoolean) { _mask |= hidpp20::HiresScroll::Mode::HiRes; if(hires) @@ -169,7 +169,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev) } catch(libconfig::SettingNotFoundException& e) { } try { - auto& invert = config_root["invert"]; + auto& invert = config_root.lookup("invert"); if(invert.getType() == libconfig::Setting::TypeBoolean) { _mask |= hidpp20::HiresScroll::Mode::Inverted; if(invert) @@ -181,7 +181,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev) } catch(libconfig::SettingNotFoundException& e) { } try { - auto& target = config_root["target"]; + auto& target = config_root.lookup("target"); if(target.getType() == libconfig::Setting::TypeBoolean) { _mask |= hidpp20::HiresScroll::Mode::Target; if(target) @@ -194,7 +194,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev) if(_mode & hidpp20::HiresScroll::Mode::Target) { try { - auto& up = config_root["up"]; + auto& up = config_root.lookup("up"); try { auto g = actions::Gesture::makeGesture(dev, up); if(g->wheelCompatibility()) { @@ -214,7 +214,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev) } try { - auto& down = config_root["down"]; + auto& down = config_root.lookup("down"); try { auto g = actions::Gesture::makeGesture(dev, down); if(g->wheelCompatibility()) { @@ -258,4 +258,4 @@ const std::shared_ptr& HiresScroll::Config::downAction() const { return _down_action; -} +} \ No newline at end of file diff --git a/src/logid/features/RemapButton.cpp b/src/logid/features/RemapButton.cpp index 1130a4c..a72fb4f 100644 --- a/src/logid/features/RemapButton.cpp +++ b/src/logid/features/RemapButton.cpp @@ -178,7 +178,7 @@ void RemapButton::Config::_parseButton(libconfig::Setting &setting) uint16_t cid; try { - auto& cid_setting = setting["cid"]; + auto& cid_setting = setting.lookup("cid"); if(!cid_setting.isNumber()) { logPrintf(WARN, "Line %d: cid must be a number, ignoring.", cid_setting.getSourceLine()); @@ -193,7 +193,7 @@ void RemapButton::Config::_parseButton(libconfig::Setting &setting) try { _buttons.emplace(cid, Action::makeAction(_device, - setting["action"])); + setting.lookup("action"))); } catch(libconfig::SettingNotFoundException& e) { logPrintf(WARN, "Line %d: action is required, ignoring.", setting.getSourceLine()); @@ -206,4 +206,4 @@ void RemapButton::Config::_parseButton(libconfig::Setting &setting) const std::map>& RemapButton::Config::buttons() { return _buttons; -} +} \ No newline at end of file diff --git a/src/logid/features/ThumbWheel.cpp b/src/logid/features/ThumbWheel.cpp index 5e00926..57bb055 100644 --- a/src/logid/features/ThumbWheel.cpp +++ b/src/logid/features/ThumbWheel.cpp @@ -184,7 +184,7 @@ ThumbWheel::Config::Config(Device* dev) : DeviceFeature::Config(dev) } try { - auto& divert = config_root["divert"]; + auto& divert = config_root.lookup("divert"); if(divert.getType() == libconfig::Setting::TypeBoolean) { _divert = divert; } else { @@ -194,7 +194,7 @@ ThumbWheel::Config::Config(Device* dev) : DeviceFeature::Config(dev) } catch(libconfig::SettingNotFoundException& e) { } try { - auto& invert = config_root["invert"]; + auto& invert = config_root.lookup("invert"); if(invert.getType() == libconfig::Setting::TypeBoolean) { _invert = invert; } else { @@ -227,7 +227,7 @@ std::shared_ptr ThumbWheel::Config::_genAction(Device* dev, libconfig::Setting& config_root, const std::string& name) { try { - auto& a_group = config_root[name]; + auto& a_group = config_root.lookup(name); try { return actions::Action::makeAction(dev, a_group); } catch(actions::InvalidAction& e) { @@ -244,7 +244,7 @@ std::shared_ptr ThumbWheel::Config::_genGesture(Device* dev, libconfig::Setting& config_root, const std::string& name) { try { - auto& g_group = config_root[name]; + auto& g_group = config_root.lookup(name); try { auto g = actions::Gesture::makeGesture(dev, g_group); if(g->wheelCompatibility()) { @@ -297,4 +297,4 @@ const std::shared_ptr& ThumbWheel::Config::tapAction() const const std::shared_ptr& ThumbWheel::Config::touchAction() const { return _touch_action; -} +} \ No newline at end of file