Change the SQLutils and SQL providers to also use interfaces for proper unload order...

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

diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 512095f60479ae318dbf34d9e043bdb96131eace..bec8a4450bfee013e6523647b98e903afd643cb8 100644 (file)
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -2,13 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *                <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -39,8 +35,6 @@ typedef std::list<unsigned long> AssocIdList;
 class ModuleSQLutils : public Module
 {
 private:
-       
-
        IdUserMap iduser;
        IdChanMap idchan;
 
@@ -48,9 +42,14 @@ public:
        ModuleSQLutils(InspIRCd* Me)
        : Module::Module(Me)
        {
-               ServerInstance->Log(DEBUG, "%s 'SQLutils' feature", ServerInstance->PublishFeature("SQLutils", this) ? "Published" : "Couldn't publish");
+               ServerInstance->PublishInterface("SQLutils", this);
        }
 
+       virtual ~ModuleSQLutils()
+       {
+               ServerInstance->UnpublishInterface("SQLutils", this);
+       }       
+
        void Implements(char* List)
        {
                List[I_OnChannelDelete] = List[I_OnUnloadModule] = List[I_OnRequest] =  List[I_OnUserDisconnect] = 1;
@@ -267,12 +266,9 @@ public:
                        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+               return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
        }
        
-       virtual ~ModuleSQLutils()
-       {
-       }       
 };
 
 class ModuleSQLutilsFactory : public ModuleFactory