- useless header removed;

- unused headers removed;

git-svn-id: http://svn.miranda-ng.org/main/trunk@4669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

12 files changed, 5 insertions, 56 deletions

diff --git a/include/m_fuse.h b/include/m_fuse.h
deleted file mode 100644
index 1c00720851..0000000000
--- a/include/m_fuse.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifdef _ALPHA_FUSE_

-#ifndef _M_FUSE_

-#define _M_FUSE_

-

-#define CALLSERVICE_NOTFOUND      ((int)0x80000000)

-#define MAXMODULELABELLENGTH 64

-typedef int (*MIRANDAHOOK)(WPARAM, LPARAM);

-typedef INT_PTR (*MIRANDASERVICE)(WPARAM, LPARAM);

-

-#define FUSE_INIT	0			// core started, Param = **FUSE_LINK

-#define FUSE_DEINIT 1			// core stopped

-#define FUSE_DEFMOD	3			// LoadDefaultModules() return code, Param = *int

-#define FUSE_DEATH  4			// DestroyingModularEngine() just got called

-

-typedef struct {

-	int cbSize;

-	HANDLE (*CreateHookableEvent)(const char *);

-	int (*DestroyHookableEvent)(HANDLE);

-	int (*NotifyEventHooks)(HANDLE, WPARAM, LPARAM);

-	HANDLE (*HookEvent)(const char *, MIRANDAHOOK);

-	HANDLE (*HookEventMessage)(const char *, HWND, UINT);

-	int (*UnhookEvent)(HANDLE);

-	HANDLE (*CreateServiceFunction)(const char *, MIRANDASERVICE);

-	HANDLE (*CreateTransientServiceFunction)(const char *, MIRANDASERVICE);

-	int (*DestroyServiceFunction)(HANDLE);

-	int (*CallService)(const char *, WPARAM, LPARAM);

-	int (*ServiceExists)(const char *);		  //v0.1.0.1+

-	int (*CallServiceSync)(const char*, WPARAM, LPARAM); //v0.1.2.2+

-} FUSE_LINK;

-

-#endif

-#endif
\ No newline at end of file
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp
index db07567c82..9439086211 100644
--- a/plugins/AssocMgr/src/test.cpp
+++ b/plugins/AssocMgr/src/test.cpp
@@ -77,7 +77,6 @@ static __inline HANDLE find_contact(const char *nick) { nick; return NULL; }
 static __inline HANDLE add_contact(const char *nick) { nick; return db_find_first(); }

 static __inline void aim_gchat_joinrequest(const char *room, int exchange) { room; exchange; MessageBoxA(NULL,"Join group chat!",room,MB_OK); return; }

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_message.h>

 

 #include "m_assocmgr.h"

@@ -212,7 +211,6 @@ static __inline void AddToCache(HANDLE hContact,DWORD dwUin) { hContact; dwUin;
 static __inline DWORD ICQGetContactSettingUIN(HANDLE hContact) { hContact; return 0; }

 static __inline HANDLE HandleFromCacheByUin(DWORD dwUin) { dwUin; return NULL; }

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_message.h>

 typedef struct {

   PROTOSEARCHRESULT hdr;

@@ -404,7 +402,6 @@ void UninitIcqFiles(void)
 static __inline HANDLE getbuddyH(const char *yahoo_id) { yahoo_id; return NULL; }

 static __inline HANDLE add_buddy(const char *yahoo_id,const char *yahoo_name,DWORD flags) { yahoo_id; yahoo_name; flags; return db_find_first(); }

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_message.h>

 

 #include "m_assocmgr.h"

@@ -515,7 +512,6 @@ void YmsgrLinksUninit(void)
 static __inline HANDLE MSN_HContactFromEmailT(const char *msnEmail) { msnEmail; return NULL; }

 static __inline HANDLE MSN_HContactFromEmail(const char *msnEmail,const char *msnNick,int addIfNeeded,int temporary) { msnEmail; msnNick; addIfNeeded; temporary; return db_find_first(); }

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_message.h>

 

 #include "m_assocmgr.h"

@@ -624,7 +620,6 @@ void UnloadMsnLinks(void)
 typedef DWORD uin_t;

 static __inline HANDLE gg_getcontact(uin_t uin,int create,int inlist,char *szNick) { uin; create; inlist; szNick; return db_find_first(); }

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_message.h>

 

 #include "m_assocmgr.h"

@@ -689,7 +684,6 @@ void gg_unregisterlinks(void)
 static __inline HANDLE JabberHContactFromJID(const char *jid) { jid; return NULL; }

 static __inline HANDLE JabberDBCreateContact(char *jid,char *nick,BOOL temporary,BOOL stripResource) { jid; nick; temporary; stripResource; return db_find_first(); }

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_message.h>

 

 #include "m_assocmgr.h"

diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index 52989a59bc..75bfc5a271 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clui.h"

-#include <m_file.h>

-#include <m_addcontact.h>

 #include "hdr/modern_clist.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_sync.h"

diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp
index 22f4e4ea75..91684e024f 100644
--- a/plugins/Clist_nicer/src/clistmenus.cpp
+++ b/plugins/Clist_nicer/src/clistmenus.cpp
@@ -188,7 +188,6 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 		case IDC_IGN_ADDPERMANENTLY:

 			{

 				ADDCONTACTSTRUCT acs = {0};

-

 				acs.handle = hContact;

 				acs.handleType = HANDLE_CONTACT;

 				acs.szProto = 0;

diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h
index 64e0abc1b2..23084b8d35 100644
--- a/protocols/FacebookRM/src/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -75,7 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_skin.h>

 #include <statusmodes.h>

 #include <m_userinfo.h>

-#include <m_addcontact.h>

 #include <m_icolib.h>

 #include <m_utils.h>

 #include <m_hotkeys.h>

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index b0ab9625d2..442b979b09 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_iq.h"

 #include "jabber_caps.h"

 #include "m_file.h"

-#include "m_addcontact.h"

 #include "jabber_disco.h"

 #include "m_proto_listeningto.h"

 

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index fd5dd54ec1..f229f2c69f 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/types.h>

 #include <sys/stat.h>

 

-#include <m_addcontact.h>

 #include <m_file.h>

 #include <m_genmenu.h>

 #include <m_icolib.h>

diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp
index 57f84e2e06..6d170ca7c2 100644
--- a/protocols/MSN/src/msn_links.cpp
+++ b/protocols/MSN/src/msn_links.cpp
@@ -102,17 +102,15 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 		/* does not yet check if email is current user */

 		if (hContact == NULL)

 		{

-			ADDCONTACTSTRUCT acs = {0};

-			PROTOSEARCHRESULT psr = {0};

+			PROTOSEARCHRESULT psr = { sizeof(psr) };

+			psr.flags = PSR_TCHAR;

+			psr.nick = email;

+			psr.email = email;

 

+			ADDCONTACTSTRUCT acs = {0};

 			acs.handleType = HANDLE_SEARCHRESULT;

 			acs.szProto = proto->m_szModuleName;

 			acs.psr = &psr;

-

-			psr.cbSize = sizeof(psr);

-			psr.flags = PSR_TCHAR;

-			psr.nick = email;

-			psr.email = email;

 			CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);

 		}

 		return 0;

diff --git a/protocols/Twitter/src/common.h b/protocols/Twitter/src/common.h
index a400bb84aa..20719673d0 100644
--- a/protocols/Twitter/src/common.h
+++ b/protocols/Twitter/src/common.h
@@ -62,7 +62,6 @@ using std::min;
 #include <statusmodes.h>

 #include <m_system.h>

 #include <m_userinfo.h>

-#include <m_addcontact.h>

 #include <m_icolib.h>

 #include <m_utils.h>

 #include <m_system_cpp.h>

diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index 0aee3295ba..8881e1e112 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_button.h>

 #include <m_protomod.h>

 #include <m_protosvc.h>

-#include <m_addcontact.h>

 #include <m_clist.h>

 #include <m_clui.h>

 #include <m_message.h>

diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h
index b1aabc39e0..e68da0be82 100644
--- a/src/core/stdclist/src/commonheaders.h
+++ b/src/core/stdclist/src/commonheaders.h
@@ -55,7 +55,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_skin.h>

 #include <m_contacts.h>

 #include <m_file.h>

-#include <m_addcontact.h>

 #include <m_icolib.h>

 #include <m_extraicons.h>

 

diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h
index 205a18193b..d813cb1c7d 100644
--- a/src/core/stdcrypt/commonheaders.h
+++ b/src/core/stdcrypt/commonheaders.h
@@ -69,7 +69,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>