Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / include / dynamic.h

diff --git a/include/dynamic.h b/include/dynamic.h
index 4b8c7a4562ab39cbc9b3c9e597c18ee1dd0e362c..19ff7bdaf67f56008258a926b2efa1c62e05b8bb 100644 (file)
--- a/include/dynamic.h
+++ b/include/dynamic.h
@@ -27,11 +27,10 @@ class CoreExport DLLManager
 
  public:
        /** This constructor loads the module using dlopen()
-        * @param ServerInstance The creator class of this object
         * @param fname The filename to load. This should be within
         * the modules dir.
         */
-       DLLManager(InspIRCd* ServerInstance, const char *fname);
+       DLLManager(const char *fname);
        virtual ~DLLManager();
 
        /** Get a symbol using dynamic linking.
@@ -102,16 +101,12 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
         * The init_module function is the only exported extern "C" declaration
         * in any module file. In a cmd_*.cpp file the equivilant is init_command
         */
-       typedef ReturnType * (initfunctype) (InspIRCd*);
+       typedef ReturnType * (initfunctype) ();
 
        /** Pointer to the init function.
         */
        initfunctype* init_func;
 
-       /** Instance pointer to be passed to init_*() when it is called.
-        */
-       InspIRCd* ServerInstance;
-
  public:
        /** Default constructor.
         * This constructor passes its paramerers down through DLLFactoryBase and then DLLManager
@@ -119,8 +114,8 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
         * class. It is then down to the core to call the ModuleFactory::CreateModule() method and
         * receive a Module* which it can insert into its module lists.
         */
-       DLLFactory(InspIRCd* Instance, const char *fname, const char *func_name)
-       : DLLManager(Instance, fname), init_func(NULL), ServerInstance(Instance)
+       DLLFactory(const char *fname, const char *func_name)
+       : DLLManager(fname), init_func(NULL)
        {
                const char* error = LastError();
 
@@ -144,7 +139,7 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
        {
                if(init_func)
                {
-                       return init_func(ServerInstance);
+                       return init_func();
                }
                else
                {