Did some renaming so that the methods for modes in chanrec and userrec are identical.

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 558056198e8c11c7e9a2973423dc242b875a84c5..11fdb3a54b31cf356d00990558208d88ca41a8fe 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -25,6 +25,7 @@
 #include "channels.h"
 #include "socket.h"
 #include "mode.h"
+#include "helperfuncs.h"
 #include "socketengine.h"
 #include "command_parse.h"
 
@@ -42,7 +43,7 @@
  */
 #define IS_SINGLE(x,y) ( (*x == y) && (*(x+1) == 0) )
 
-#define DELETE(x) { log(DEBUG,"%s:%s: delete()",__FILE__,__LINE__); delete x; }
+#define DELETE(x) { do_log(DEBUG,"%s:%d: delete()",__FILE__,__LINE__); if (x) { delete x; x = NULL; } else log(DEBUG,"Attempt to delete NULL pointer!"); }
 
 template<typename T> inline std::string ConvToStr(const T &in)
 {
@@ -82,10 +83,18 @@ class InspIRCd
        char MODERR[MAXBUF];
        bool expire_run;
  
-       void erase_factory(int j);
-       void erase_module(int j);
+       void EraseFactory(int j);
+       void EraseModule(int j);
        void BuildISupport();
        void MoveTo(std::string modulename,int slot);
+       void Start();
+       void SetSignals();
+       bool DaemonSeed();
+       void MakeLowerMap();
+       void MoveToLast(std::string modulename);
+       void MoveToFirst(std::string modulename);
+       void MoveAfter(std::string modulename, std::string after);
+       void MoveBefore(std::string modulename, std::string before);
 
  public:
        time_t startup_time;
@@ -94,16 +103,12 @@ class InspIRCd
        SocketEngine* SE;
        serverstats* stats;
 
-       void MakeLowerMap();
        std::string GetRevision();
        std::string GetVersionString();
+       void WritePID(const std::string &filename);
        char* ModuleError();
        bool LoadModule(const char* filename);
        bool UnloadModule(const char* filename);
-       void MoveToLast(std::string modulename);
-       void MoveToFirst(std::string modulename);
-       void MoveAfter(std::string modulename, std::string after);
-       void MoveBefore(std::string modulename, std::string before);
        InspIRCd(int argc, char** argv);
        void DoOneIteration(bool process_module_sockets);
        int Run();
@@ -111,11 +116,7 @@ class InspIRCd
 };
 
 /* Miscellaneous stuff here, moved from inspircd_io.h */
-void Exit(int status); 
-void Start(); 
-void SetSignals();
-bool DaemonSeed();
-void WritePID(const std::string &filename);
+void Exit(int status);
 
 /* userrec optimization stuff */
 void AddServerName(const std::string &servername);