Rename ConfigItems to ConfigTag::Items.

2 files changed, 7 insertions, 7 deletions

diff --git a/include/configreader.h b/include/configreader.h
index e1ade7ed9..4f93c2c7e 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -42,8 +42,12 @@
 /** Structure representing a single \<tag> in config */
 class CoreExport ConfigTag
 {
+public:
+	/** A mapping of configuration keys to their assigned values. */
+	typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> Items;
+
  private:
-	ConfigItems items;
+	Items items;
 
  public:
 	const std::string tag;
@@ -100,10 +104,10 @@ class CoreExport ConfigTag
 
 	std::string getTagLocation() const;
 
-	inline const ConfigItems& getItems() const { return items; }
+	inline const Items& GetItems() const { return items; }
 
 	/** Create a new ConfigTag, giving access to the private ConfigItems item list */
-	static std::shared_ptr<ConfigTag> create(const std::string& Tag, const std::string& file, int line, ConfigItems*& Items);
+	static std::shared_ptr<ConfigTag> create(const std::string& Tag, const std::string& file, int line, Items*& Items);
  private:
 	ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
diff --git a/include/typedefs.h b/include/typedefs.h
index 518bb4d63..90d2d93db 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -95,10 +95,6 @@ typedef std::vector<Membership*> IncludeChanList;
  */
 typedef std::vector<std::string> file_cache;
 
-/** A mapping of configuration keys to their assigned values.
- */
-typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> ConfigItems;
-
 /** The entire configuration
  */
 typedef std::multimap<std::string, std::shared_ptr<ConfigTag>, irc::insensitive_swo> ConfigDataHash;