From d49b1cacd36ffee75345fe407d54cbce99a3f421 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Thu, 12 Jan 2017 17:55:55 +0100 Subject: [PATCH] fix(config): Rename parameter for individual border size Rename `border-{left,top,right,bottom}` to `border-{left,top,right,bottom}-size` to follow the naming scheme used for other size parameters --- src/components/bar.cpp | 8 ++++---- src/components/config.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/bar.cpp b/src/components/bar.cpp index 8b0dade3..fd970b73 100644 --- a/src/components/bar.cpp +++ b/src/components/bar.cpp @@ -200,16 +200,16 @@ bar::bar(connection& conn, signal_emitter& emitter, const config& config, const auto bcolor = m_conf.get(bs, "border-color", "#00000000"s); m_opts.borders.emplace(edge::TOP, border_settings{}); - m_opts.borders[edge::TOP].size = m_conf.get(bs, "border-top", bsize); + m_opts.borders[edge::TOP].size = m_conf.deprecated(bs, "border-top", "border-top-size", bsize); m_opts.borders[edge::TOP].color = color::parse(m_conf.get(bs, "border-top-color", bcolor)); m_opts.borders.emplace(edge::BOTTOM, border_settings{}); - m_opts.borders[edge::BOTTOM].size = m_conf.get(bs, "border-bottom", bsize); + m_opts.borders[edge::BOTTOM].size = m_conf.deprecated(bs, "border-bottom", "border-bottom-size", bsize); m_opts.borders[edge::BOTTOM].color = color::parse(m_conf.get(bs, "border-bottom-color", bcolor)); m_opts.borders.emplace(edge::LEFT, border_settings{}); - m_opts.borders[edge::LEFT].size = m_conf.get(bs, "border-left", bsize); + m_opts.borders[edge::LEFT].size = m_conf.deprecated(bs, "border-left", "border-left-size", bsize); m_opts.borders[edge::LEFT].color = color::parse(m_conf.get(bs, "border-left-color", bcolor)); m_opts.borders.emplace(edge::RIGHT, border_settings{}); - m_opts.borders[edge::RIGHT].size = m_conf.get(bs, "border-right", bsize); + m_opts.borders[edge::RIGHT].size = m_conf.deprecated(bs, "border-right", "border-right-size", bsize); m_opts.borders[edge::RIGHT].color = color::parse(m_conf.get(bs, "border-right-color", bcolor)); // Load geometry values diff --git a/src/components/config.cpp b/src/components/config.cpp index b066ead7..c65463c1 100644 --- a/src/components/config.cpp +++ b/src/components/config.cpp @@ -67,7 +67,7 @@ string config::section() const { void config::warn_deprecated(const string& section, const string& key, string replacement) const { try { auto value = get(section, key); - m_log.warn("The config parameter `%s.%s` is deprecated, use `%s` instead.", section, key, move(replacement)); + m_log.warn("The config parameter `%s.%s` is deprecated, use `%s.%s` instead.", section, key, section, move(replacement)); } catch (const key_error& err) { } }