1 files changed, 11 insertions, 12 deletions

diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp
index 69fd16b9f..bea4d8d95 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/m_sqlite.cpp
@@ -1,8 +1,8 @@
 /* RequiredLibraries: sqlite3 */
 
 #include "module.h"
+#include "modules/sql.h"
 #include <sqlite3.h>
-#include "sql.h"
 
 using namespace SQL;
 
@@ -64,12 +64,10 @@ class ModuleSQLite : public Module
 	/* SQL connections */
 	std::map<Anope::string, SQLiteService *> SQLiteServices;
  public:
-	ModuleSQLite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, SUPPORTED)
+	ModuleSQLite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, EXTRA | VENDOR)
 	{
 		Implementation i[] = { I_OnReload };
 		ModuleManager::Attach(i, this,  sizeof(i) / sizeof(Implementation));
-
-		OnReload();
 	}
 
 	~ModuleSQLite()
@@ -79,19 +77,19 @@ class ModuleSQLite : public Module
 		SQLiteServices.clear();
 	}
 
-	void OnReload() anope_override
+	void OnReload(Configuration::Conf *conf) anope_override
 	{
-		ConfigReader config;
-		int i, num;
+		Configuration::Block *config = conf->GetModule(this);
 
 		for (std::map<Anope::string, SQLiteService *>::iterator it = this->SQLiteServices.begin(); it != this->SQLiteServices.end();)
 		{
 			const Anope::string &cname = it->first;
 			SQLiteService *s = it->second;
+			int i, num;
 			++it;
 
-			for (i = 0, num = config.Enumerate("sqlite"); i < num; ++i)
-				if (config.ReadValue("sqlite", "name", "sqlite/main", i) == cname)
+			for (i = 0, num = config->CountBlock("sqlite"); i < num; ++i)
+				if (config->GetBlock("sqlite", i)->Get<const Anope::string>("name", "sqlite/main") == cname)
 					break;
 
 			if (i == num)
@@ -103,13 +101,14 @@ class ModuleSQLite : public Module
 			}
 		}
 
-		for (i = 0, num = config.Enumerate("sqlite"); i < num; ++i)
+		for (int i = 0; i < config->CountBlock("sqlite"); ++i)
 		{
-			Anope::string connname = config.ReadValue("sqlite", "name", "sqlite/main", i);
+			Configuration::Block *block = config->GetBlock("sqlite", i);
+			Anope::string connname = block->Get<const Anope::string>("name", "sqlite/main");
 
 			if (this->SQLiteServices.find(connname) == this->SQLiteServices.end())
 			{
-				Anope::string database = Anope::DataDir + "/" + config.ReadValue("sqlite", "database", "anope", i);
+				Anope::string database = Anope::DataDir + "/" + block->Get<const Anope::string>("database", "anope");
 
 				try
 				{