add const to newsboat::ConfigActionHandler::dump_config

dennisschagt · Oct 21, 2020 · 450af6f · 450af6f
1 parent e4f2812
commit 450af6f
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ doc/podboat-cmds-linked.asciidoc
 *.sw?
 /target/
 **/*.rs.bk
+.vscode
diff --git a/include/colormanager.h b/include/colormanager.h
@@ -28,7 +28,7 @@ class ColorManager : public ConfigActionHandler {
 	void register_commands(ConfigParser& cfgparser);
 	void handle_action(const std::string& action,
 		const std::vector<std::string>& params) override;
-	void dump_config(std::vector<std::string>& config_output) override;
+	void dump_config(std::vector<std::string>& config_output) const override;
 	void apply_colors(Stfl::Form& form) const;
 	std::map<std::string, TextStyle> get_styles() const
 	{

diff --git a/include/configactionhandler.h b/include/configactionhandler.h
@@ -12,7 +12,7 @@ class ConfigActionHandler {
 	virtual void handle_action(const std::string& action,
 		const std::string& params);
 
-	virtual void dump_config(std::vector<std::string>& config_output) = 0;
+	virtual void dump_config(std::vector<std::string>& config_output) const = 0;
 	ConfigActionHandler() {}
 	virtual ~ConfigActionHandler() {}
 

diff --git a/include/configcontainer.h b/include/configcontainer.h
@@ -62,7 +62,7 @@ class ConfigContainer : public ConfigActionHandler {
 	void register_commands(ConfigParser& cfgparser);
 	void handle_action(const std::string& action,
 		const std::vector<std::string>& params) override;
-	void dump_config(std::vector<std::string>& config_output) override;
+	void dump_config(std::vector<std::string>& config_output) const override;
 
 	bool get_configvalue_as_bool(const std::string& key) const;
 	int get_configvalue_as_int(const std::string& key) const;

diff --git a/include/configparser.h b/include/configparser.h
@@ -24,7 +24,7 @@ class ConfigParser : public ConfigActionHandler {
 		ConfigActionHandler& handler);
 	void handle_action(const std::string& action,
 		const std::vector<std::string>& params) override;
-	void dump_config(std::vector<std::string>&) override
+	void dump_config(std::vector<std::string>&) const override
 	{
 		/* nothing because ConfigParser itself only handles include */
 	}

diff --git a/include/controller.h b/include/controller.h
@@ -72,7 +72,7 @@ class Controller {
 
 	void load_configfile(const std::string& filename);
 
-	void dump_config(const std::string& filename);
+	void dump_config(const std::string& filename) const;
 
 	void update_flags(std::shared_ptr<RssItem> item);
 

diff --git a/include/filtercontainer.h b/include/filtercontainer.h
@@ -21,7 +21,7 @@ class FilterContainer : public ConfigActionHandler {
 	~FilterContainer() override;
 	void handle_action(const std::string& action,
 		const std::vector<std::string>& params) override;
-	void dump_config(std::vector<std::string>& config_output) override;
+	void dump_config(std::vector<std::string>& config_output) const override;
 	std::vector<FilterNameExprPair>& get_filters()
 	{
 		return filters;

diff --git a/include/keymap.h b/include/keymap.h
@@ -186,7 +186,7 @@ class KeyMap : public ConfigActionHandler {
 	std::vector<std::string> get_keys(Operation op, const std::string& context);
 	void handle_action(const std::string& action,
 		const std::string& params) override;
-	void dump_config(std::vector<std::string>& config_output) override;
+	void dump_config(std::vector<std::string>& config_output) const override;
 	std::vector<KeyMapDesc> get_keymap_descriptions(std::string context);
 
 	std::vector<MacroCmd> parse_operation_sequence(const std::string& line);
@@ -196,7 +196,7 @@ class KeyMap : public ConfigActionHandler {
 	bool is_valid_context(const std::string& context);
 	unsigned short get_flag_from_context(const std::string& context);
 	std::map<std::string, Operation> get_internal_operations() const;
-	std::string getopname(Operation op);
+	std::string getopname(Operation op) const;
 	std::map<std::string, std::map<std::string, Operation>> keymap_;
 	std::map<std::string, std::vector<MacroCmd>> macros_;
 	std::vector<MacroCmd> startup_operations_sequence;

diff --git a/include/nullconfigactionhandler.h b/include/nullconfigactionhandler.h
@@ -13,7 +13,7 @@ class NullConfigActionHandler : public ConfigActionHandler {
 		const std::vector<std::string>&) override
 	{
 	}
-	void dump_config(std::vector<std::string>&) override {}
+	void dump_config(std::vector<std::string>&) const override {}
 };
 
 } // namespace newsboat

diff --git a/include/regexmanager.h b/include/regexmanager.h
@@ -20,7 +20,7 @@ class RegexManager : public ConfigActionHandler {
 	RegexManager();
 	void handle_action(const std::string& action,
 		const std::vector<std::string>& params) override;
-	void dump_config(std::vector<std::string>& config_output) override;
+	void dump_config(std::vector<std::string>& config_output) const override;
 	void quote_and_highlight(std::string& str, const std::string& location);
 	void remove_last_regex(const std::string& location);
 	int article_matches(Matchable* item);

diff --git a/include/rssignores.h b/include/rssignores.h
@@ -18,7 +18,7 @@ class RssIgnores : public ConfigActionHandler {
 	~RssIgnores() override;
 	void handle_action(const std::string& action,
 		const std::vector<std::string>& params) override;
-	void dump_config(std::vector<std::string>& config_output) override;
+	void dump_config(std::vector<std::string>& config_output) const override;
 	bool matches(RssItem* item);
 	bool matches_lastmodified(const std::string& url);
 	bool matches_resetunread(const std::string& url);

diff --git a/include/view.h b/include/view.h
@@ -52,6 +52,10 @@ class View {
 	{
 		return keys;
 	}
+	const KeyMap* get_keymap() const
+	{
+		return keys;
+	}
 	void set_tags(const std::vector<std::string>& t);
 	void push_empty_formaction();
 	void pop_current_formaction();

diff --git a/src/colormanager.cpp b/src/colormanager.cpp
@@ -84,7 +84,7 @@ void ColorManager::handle_action(const std::string& action,
 			ActionHandlerStatus::INVALID_COMMAND);
 }
 
-void ColorManager::dump_config(std::vector<std::string>& config_output)
+void ColorManager::dump_config(std::vector<std::string>& config_output) const
 {
 	for (const auto& element_style : element_styles) {
 		const std::string& element = element_style.first;

diff --git a/src/configcontainer.cpp b/src/configcontainer.cpp
@@ -457,7 +457,7 @@ void ConfigContainer::toggle(const std::string& key)
 	}
 }
 
-void ConfigContainer::dump_config(std::vector<std::string>& config_output)
+void ConfigContainer::dump_config(std::vector<std::string>& config_output) const
 {
 	std::lock_guard<std::recursive_mutex> guard(config_data_mtx);
 	for (const auto& cfg : config_data) {

diff --git a/src/controller.cpp b/src/controller.cpp
@@ -899,7 +899,7 @@ void Controller::load_configfile(const std::string& filename)
 	}
 }
 
-void Controller::dump_config(const std::string& filename)
+void Controller::dump_config(const std::string& filename) const
 {
 	std::vector<std::string> configlines;
 	cfg.dump_config(configlines);

diff --git a/src/filtercontainer.cpp b/src/filtercontainer.cpp
@@ -44,7 +44,7 @@ void FilterContainer::handle_action(const std::string& action,
 	}
 }
 
-void FilterContainer::dump_config(std::vector<std::string>& config_output)
+void FilterContainer::dump_config(std::vector<std::string>& config_output) const
 {
 	for (const auto& filter : filters) {
 		config_output.push_back(strprintf::fmt("define-filter %s %s",

diff --git a/src/keymap.cpp b/src/keymap.cpp
@@ -632,11 +632,11 @@ Operation KeyMap::get_operation(const std::string& keycode,
 	return keymap_[context][key];
 }
 
-void KeyMap::dump_config(std::vector<std::string>& config_output)
+void KeyMap::dump_config(std::vector<std::string>& config_output) const
 {
 	for (const auto& ctx : contexts) {
 		const std::string& context = ctx.first;
-		std::map<std::string, Operation>& x = keymap_[context];
+		const auto& x = keymap_.at(context);
 		for (const auto& keymap : x) {
 			if (keymap.second < OP_INT_MIN) {
 				std::string configline = "bind-key ";
@@ -668,7 +668,7 @@ void KeyMap::dump_config(std::vector<std::string>& config_output)
 	}
 }
 
-std::string KeyMap::getopname(Operation op)
+std::string KeyMap::getopname(Operation op) const
 {
 	for (const auto& opdesc : opdescs) {
 		if (opdesc.op == op) {

diff --git a/src/regexmanager.cpp b/src/regexmanager.cpp
@@ -21,7 +21,7 @@ RegexManager::RegexManager()
 	locations["feedlist"];
 }
 
-void RegexManager::dump_config(std::vector<std::string>& config_output)
+void RegexManager::dump_config(std::vector<std::string>& config_output) const
 {
 	for (const auto& foo : cheat_store_for_dump_config) {
 		config_output.push_back(foo);

diff --git a/src/rssignores.cpp b/src/rssignores.cpp
@@ -65,7 +65,7 @@ void RssIgnores::handle_action(const std::string& action,
 	}
 }
 
-void RssIgnores::dump_config(std::vector<std::string>& config_output)
+void RssIgnores::dump_config(std::vector<std::string>& config_output) const
 {
 	for (const auto& ign : ignores) {
 		std::string configline = "ignore-article ";

diff --git a/test/configparser.cpp b/test/configparser.cpp
@@ -21,7 +21,7 @@ class ConfigHandlerHistoryDummy : public ConfigActionHandler {
 		history.emplace_back(action, params);
 	};
 
-	void dump_config(std::vector<std::string>&) override {};
+	void dump_config(std::vector<std::string>&) const override {};
 
 	std::vector<std::pair<std::string, std::vector<std::string>>> history;
 };