OnUserPre* api fixes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@409 e03df62e-2008-0410-955e-edbf42e46eb7

4 files changed, 44 insertions, 20 deletions

diff --git a/include/modules.h b/include/modules.h
index d0195bd1b..75581b98f 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -217,7 +217,7 @@ class Module : public classbase
 	 * you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details
 	 * of where the message is destined to be sent.
 	 */
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::String text);
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text);
 
 	/** Called whenever a user is about to NOTICE A user or a channel, before any processing is done.
 	 * Returning any nonzero value from this function stops the process immediately, causing no
@@ -227,7 +227,7 @@ class Module : public classbase
 	 * you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details
 	 * of where the message is destined to be sent.
 	 */
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::String text);
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text);
 };
 
 
diff --git a/src/InspIRCd.dev b/src/InspIRCd.dev
index 8c9d498c4..2848d0ba7 100644
--- a/src/InspIRCd.dev
+++ b/src/InspIRCd.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=InspIRCd.dev
 Name=InspIRCd
-UnitCount=32
+UnitCount=34
 Type=1
 Ver=1
 ObjFiles=
@@ -19,7 +19,7 @@ ObjectOutput=
 OverrideOutput=0
 OverrideOutputName=InspIRCd.exe
 HostApplication=
-Folders=Headers,Modules,Source
+Folders=Headers,Modules,"Shell Scripts etc",Source
 CommandLine=
 IncludeVersionInfo=0
 SupportXPThemes=0
@@ -365,3 +365,21 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit33]
+FileName=..\makeconf
+Folder=Shell Scripts etc
+Compile=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=..\configure
+Folder=Shell Scripts etc
+Compile=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index b738fed45..df2b4d31f 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
 [Editors]
-Focused=1
+Focused=4
 Order=7,3,2,6,25,24,4,5,0,-1,1
 
 [Editor_0]
@@ -12,10 +12,10 @@ LeftChar=1
 
 [Editor_1]
 Open=1
-Top=1
-CursorCol=2
-CursorRow=4745
-TopLine=4708
+Top=0
+CursorCol=1
+CursorRow=123
+TopLine=79
 LeftChar=1
 
 [Editor_2]
@@ -36,9 +36,9 @@ LeftChar=1
 
 [Editor_4]
 Open=1
-Top=0
-CursorCol=63
-CursorRow=117
+Top=1
+CursorCol=13
+CursorRow=124
 TopLine=90
 LeftChar=1
 
@@ -141,9 +141,9 @@ LeftChar=1
 [Editor_17]
 Open=1
 Top=0
-CursorCol=43
-CursorRow=108
-TopLine=54
+CursorCol=23
+CursorRow=70
+TopLine=48
 LeftChar=1
 
 [Editor_18]
@@ -165,9 +165,9 @@ LeftChar=1
 [Editor_20]
 Open=1
 Top=0
-CursorCol=64
-CursorRow=187
-TopLine=146
+CursorCol=78
+CursorRow=230
+TopLine=189
 LeftChar=1
 
 [Editor_21]
@@ -250,3 +250,9 @@ CursorCol=32
 CursorRow=33
 TopLine=1
 LeftChar=1
+[Editor_32]
+Open=0
+Top=0
+[Editor_33]
+Open=0
+Top=0
diff --git a/src/modules.cpp b/src/modules.cpp
index 2065f4c6c..5ef0ed7f7 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -120,8 +120,8 @@ Version Module::GetVersion() { return Version(1,0,0,0); }
 void Module::OnOper(userrec* user) { };
 void Module::OnInfo(userrec* user) { };
 void Module::OnWhois(userrec* source, userrec* dest) { };
-int OnUserPreMessage(userrec* user,void* dest,int target_type, std::String text) { return 0; };
-int OnUserPreNotice(userrec* user,void* dest,int target_type, std::String text) { return 0; };
+int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::String text) { return 0; };
+int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::String text) { return 0; };
 
 // server is a wrapper class that provides methods to all of the C-style
 // exports in the core