From 0ab8d461ef00c1b47d56c6f270673a44246f0c0a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 May 2013 13:38:08 +0000 Subject: another bunch of unused junk git-svn-id: http://svn.miranda-ng.org/main/trunk@4672 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_contactdir.h | 162 --------------------------------- include/m_help.h | 34 ------- src/core/commonheaders.h | 1 - src/core/stdauth/commonheaders.h | 2 - src/core/stdautoaway/commonheaders.h | 1 - src/core/stdaway/commonheaders.h | 1 - src/core/stdcrypt/commonheaders.h | 2 - src/core/stdemail/commonheaders.h | 2 - src/core/stdfile/commonheaders.h | 2 - src/core/stdhelp/commonheaders.h | 2 - src/core/stdhelp/help.cpp | 12 --- src/core/stdidle/commonheaders.h | 2 - src/core/stduihist/commonheaders.h | 2 - src/core/stdurl/commonheaders.h | 2 - src/core/stduserinfo/commonheaders.h | 2 - src/core/stduseronline/commonheaders.h | 2 - 16 files changed, 231 deletions(-) delete mode 100644 include/m_contactdir.h delete mode 100644 include/m_help.h diff --git a/include/m_contactdir.h b/include/m_contactdir.h deleted file mode 100644 index ac7fcb0ed7..0000000000 --- a/include/m_contactdir.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2005 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef M_CONTACTDIR_H__ -#define M_CONTACTDIR_H__ 1 - -/* Contactdir module was created on 2005/05/17, 0.4.0.1 - - -- How you use this module as a protocol -- - - On Load() Register your protocol with the setting name that stores unique IDs, example: - - if ( ContactDir_SupportExists() ) g_Atom=ContactDir_Register("ICQ", "UIN"); - - This will register your protocol and walk the database looking for all contacts on PROTOCOL_NAME which have - a "UIN" setting and store it in memory (converting to a string as needed) You of course have to - provide fallback if the services don't exist, it's an idea to keep existing code for that. - - - - - When you add a new contact via MS_DB_CONTACT_ADD, you must register it with your protocol atom too, via - ContactDir_AddContact(atom, "UIN #", hContact) and when it is deleted ContactDir_RemoveContact(atom, "UIN #") - - - - - To find a contact, use ContactDir_Lookup(atom, "ICQ #") which will return the hContact. - -*/ - -typedef struct { - int cbSize; - char * szProto; - char * szSetting; - HANDLE atom; // out arg -} CONTACTDIRECTORYDESCRIPTOR; - -/* - wParam: 0 - lParam: (LPARAM) &CONTACTDIRECTORYDESCRIPTOR; - Affect: Register a given protocol and it's setting name which contains the unique key entry. e.g. ("ICQ", "UIN") - and return a HANDLE for use with other lookup services. - Returns: 0 on success, non zero on failure -- a returned handle is in .atom - Note: The directory will convert dword values into string representations but will not do this for bytes or words - used as IDs -- the protocol has to convert the IDs itself (: - Note: See ContactDir_Register() for a quicker way. - *** WARNING ***: This service does not expect the given module name to have registered as a protocol module, it - completely bypasses this information. - Version: 0.4.0.1 (2005/05/17+) -*/ -#define MS_CONTACTDIR_REGISTER "ContactDir/Register" - -typedef struct { - int cbSize; - HANDLE atom; // Atom handle from MS_CONTACTDIR_REGISTER - char * szID; // in: value you wish to find (makes its own copy if needed) - HANDLE hContact; // out: hContact associated with szID, if any. -} CONTACTDIRECTORYLOOKUP; - -/* - - wParam: 0 - lParam: (LPARAM) &CONTACTDIRECTORYLOOKUP; - Affect: Given an atom and string ID, will find the associated DB hContact value - Returns: 0 on success, non zero on failure - Version: 0.4.0.1 (2005/05/17+) - Note: ContactDir_Lookup() helper macro might be of use. -*/ - -#define MS_CONTACTDIR_LOOKUP "ContactDir/Lookup" - -/* - wParam: 0 - lParam: (LPARAM)&CONTACTDIRECTORYLOOKUP; - Affect: Add a contact to a protocol atom association. - Returns: 0 on success, non zero on failure - Version: 0.4.0.1 (2005/05/17+) - Note: You must call this when you create a contact with MS_DB_CONTACT_ADD, see ContactDir_AddContact() -*/ -#define MS_CONTACTDIR_ADDCONTACT "ContactDir/AddContact" - -/* - wParam: 0 - lParam: (LPARAM)&CONTACTDIRECTORYLOOKUP; - Affect: Remove a contact to a protocol atom association. - Returns: 0 on success, non zero on failure - Version: 0.4.0.1 (2005/05/17+) - Note: see ContactDir_RemoveContact() -*/ -#define MS_CONTACTDIR_REMOVECONTACT "ContactDir/RemoveContact" - - -/* -- Helper functions -- */ - -static int ContactDir_SupportExists(void) -{ - return ServiceExists(MS_CONTACTDIR_REGISTER); -} - -// Only take as valid if ContactDir_SupportExists() returns true. -static HANDLE ContactDir_Register(char * szProto, char * szSetting) -{ - CONTACTDIRECTORYDESCRIPTOR cd; - cd.cbSize=sizeof(CONTACTDIRECTORYDESCRIPTOR); - cd.szProto=szProto; - cd.szSetting=szSetting; - cd.atom=NULL; - CallService(MS_CONTACTDIR_REGISTER, 0, (LPARAM)&cd); - return cd.atom; -} - -static __inline HANDLE ContactDir_Lookup(HANDLE atom, char * szID) -{ - CONTACTDIRECTORYLOOKUP f; - f.cbSize=sizeof(f); - f.atom=atom; - f.szID=szID; - f.hContact=NULL; - CallService(MS_CONTACTDIR_LOOKUP, 0, (LPARAM)&f); - return f.hContact; -} - -static __inline void ContactDir_AddContact(HANDLE atom, char * szID, HANDLE hContact) -{ - CONTACTDIRECTORYLOOKUP c = {0}; - c.cbSize=sizeof(CONTACTDIRECTORYLOOKUP); - c.atom=atom; - c.szID=szID; - c.hContact=hContact; - CallService(MS_CONTACTDIR_ADDCONTACT, 0, (LPARAM)&c); -} - -static __inline void ContactDir_RemoveContact(HANDLE atom, char * szID) -{ - CONTACTDIRECTORYLOOKUP c = {0}; - c.cbSize=sizeof(CONTACTDIRECTORYLOOKUP); - c.atom=atom; - c.szID=szID; - c.hContact=NULL; - CallService(MS_CONTACTDIR_REMOVECONTACT, 0, (LPARAM)&c); -} - -#endif /* M_CONTACTDIR_H__ */ \ No newline at end of file diff --git a/include/m_help.h b/include/m_help.h deleted file mode 100644 index 70de3e2936..0000000000 --- a/include/m_help.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2008 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef M_HELP_H__ -#define M_HELP_H__ 1 - - -// wParam = 0 -// lParam = (char *)url; -// Sends the bug report url in lParam. Is usually called from -// the Help/Report Bug menu. -#define ME_HELP_BUGREPORT "Help/ReportBug" - -#endif // M_HELP_H__ diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h index 85d7e47fd8..65ce0c653a 100644 --- a/src/core/commonheaders.h +++ b/src/core/commonheaders.h @@ -92,7 +92,6 @@ using namespace std; #include #include #include -#include #include #include #include diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h index 9c8fcb984a..9dcba494c6 100644 --- a/src/core/stdauth/commonheaders.h +++ b/src/core/stdauth/commonheaders.h @@ -73,12 +73,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h index d813cb1c7d..30cddbfe57 100644 --- a/src/core/stdautoaway/commonheaders.h +++ b/src/core/stdautoaway/commonheaders.h @@ -77,7 +77,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h index d813cb1c7d..30cddbfe57 100644 --- a/src/core/stdaway/commonheaders.h +++ b/src/core/stdaway/commonheaders.h @@ -77,7 +77,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h index 405b080cb3..6ed0c1cc54 100644 --- a/src/core/stdcrypt/commonheaders.h +++ b/src/core/stdcrypt/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h index 405b080cb3..6ed0c1cc54 100644 --- a/src/core/stdemail/commonheaders.h +++ b/src/core/stdemail/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h index 5227b185b9..7da238e151 100644 --- a/src/core/stdfile/commonheaders.h +++ b/src/core/stdfile/commonheaders.h @@ -75,12 +75,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h index df2d455fbd..779db1f96c 100644 --- a/src/core/stdhelp/commonheaders.h +++ b/src/core/stdhelp/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdhelp/help.cpp b/src/core/stdhelp/help.cpp index 4440aece1f..654b9fc255 100644 --- a/src/core/stdhelp/help.cpp +++ b/src/core/stdhelp/help.cpp @@ -51,15 +51,6 @@ static INT_PTR WebsiteCommand(WPARAM, LPARAM) return 0; } -static int BugCommandEvent(WPARAM wParam, LPARAM lParam) -{ - char *szUrl = (char*)lParam; - if (szUrl) - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szUrl); - - return 0; -} - static INT_PTR BugCommand(WPARAM, LPARAM) { NotifyEventHooks(hBugEvent, 0, (LPARAM)"http://bugs.miranda-ng.org"); @@ -82,9 +73,6 @@ int LoadHelpModule(void) CreateServiceFunction("Help/WebsiteCommand", WebsiteCommand); CreateServiceFunction("Help/BugCommand", BugCommand); - hBugEvent = CreateHookableEvent(ME_HELP_BUGREPORT); - SetHookDefaultForHookableEvent(hBugEvent, BugCommandEvent); - CLISTMENUITEM mi = { sizeof(mi) }; mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_MIRANDA); mi.pszPopupName = LPGEN("&Help"); diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h index 39f9b681db..d0a817e55c 100644 --- a/src/core/stdidle/commonheaders.h +++ b/src/core/stdidle/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h index df2d455fbd..779db1f96c 100644 --- a/src/core/stduihist/commonheaders.h +++ b/src/core/stduihist/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h index 9c8fcb984a..9dcba494c6 100644 --- a/src/core/stdurl/commonheaders.h +++ b/src/core/stdurl/commonheaders.h @@ -73,12 +73,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h index 57dec6f7c4..6c37a49c36 100644 --- a/src/core/stduserinfo/commonheaders.h +++ b/src/core/stduserinfo/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" diff --git a/src/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h index 405b080cb3..6ed0c1cc54 100644 --- a/src/core/stduseronline/commonheaders.h +++ b/src/core/stduseronline/commonheaders.h @@ -72,12 +72,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -//#include #include #include #include #include -#include #include #include "version.h" -- cgit v1.2.3