InspTimer -> Timer

[user/henk/code/inspircd.git] / src / modules / extra / m_mysql.cpp

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 5d8eeef7ddf008353ab8eaed2e3827a2cc650e34..53d852f72994a5646d07279b91ec413282339375 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -713,7 +713,7 @@ class ModuleSQL : public Module
        ModuleSQL(InspIRCd* Me)
        : Module::Module(Me), rehashing(false)
        {
-               ServerInstance->UseInterface("SQLutils");
+               ServerInstance->Modules->UseInterface("SQLutils");
 
                Conf = new ConfigReader(ServerInstance);
                PublicServerInstance = ServerInstance;
@@ -730,24 +730,24 @@ class ModuleSQL : public Module
                        throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
                }
 
-               if (!ServerInstance->PublishFeature("SQL", this))
+               if (!ServerInstance->Modules->PublishFeature("SQL", this))
                {
                        /* Tell worker thread to exit NOW */
                        giveup = true;
                        throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
                }
 
-               ServerInstance->PublishInterface("SQL", this);
+               ServerInstance->Modules->PublishInterface("SQL", this);
        }
 
        virtual ~ModuleSQL()
        {
                giveup = true;
                ClearAllConnections();
-               DELETE(Conf);
-               ServerInstance->UnpublishInterface("SQL", this);
-               ServerInstance->UnpublishFeature("SQL");
-               ServerInstance->DoneWithInterface("SQLutils");
+               delete Conf;
+               ServerInstance->Modules->UnpublishInterface("SQL", this);
+               ServerInstance->Modules->UnpublishFeature("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
 
@@ -796,7 +796,7 @@ class ModuleSQL : public Module
                return NULL;
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                rehashing = true;
        }
@@ -886,4 +886,3 @@ void* DispatcherThread(void* arg)
 }
 
 MODULE_INIT(ModuleSQL);
-