From d82596d1f1bf7f374e706117416e51199825ca9d Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Thu, 24 Jul 2014 20:39:07 +0000 Subject: event codes cleaning. try 1 git-svn-id: http://svn.miranda-ng.org/main/trunk@9936 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/Options.cpp | 1 - plugins/BasicHistory/src/stdafx.h | 2 -- plugins/HistoryStats/src/statistic.h | 22 +--------------------- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 3 --- plugins/Scriver/src/msgs.cpp | 1 - plugins/TabSRMM/src/msgdlgutils.cpp | 4 ---- plugins/TabSRMM/src/msgs.h | 1 - protocols/JabberG/src/jabber.h | 4 ++-- protocols/JabberG/src/jabber_misc.cpp | 2 +- protocols/JabberG/src/jabber_proto.cpp | 4 ++-- protocols/JabberG/src/jabber_thread.cpp | 2 +- protocols/MRA/src/MraConstans.h | 1 - 12 files changed, 7 insertions(+), 40 deletions(-) diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index b162d004d2..b7456985a6 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -41,7 +41,6 @@ EventNames[] = EVENTTYPE_AUTHREQUEST, LPGENT("Authorization request"), EVENTTYPE_ADDED, LPGENT("You were added"), EVENTTYPE_CONTACTS, LPGENT("Contacts received"), - EVENTTYPE_SMTPSIMPLE, LPGENT("SMTP Simple Email"), ICQEVENTTYPE_SMS, LPGENT("SMS message") }; diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h index 510afd1c08..e6879721e0 100644 --- a/plugins/BasicHistory/src/stdafx.h +++ b/plugins/BasicHistory/src/stdafx.h @@ -89,6 +89,4 @@ #define HISTORY_HK_IMPDAT 116 #define HISTORY_HK_ALLCONTACTS 117 -#define EVENTTYPE_SMTPSIMPLE 2350 - HICON LoadIconEx(int iconId, int big = 0); diff --git a/plugins/HistoryStats/src/statistic.h b/plugins/HistoryStats/src/statistic.h index 530ba57439..10b649e4eb 100644 --- a/plugins/HistoryStats/src/statistic.h +++ b/plugins/HistoryStats/src/statistic.h @@ -26,21 +26,11 @@ public: }; enum DBEventTypeRaw { - ICQEVENTTYPE_AUTH_GRANTED = 2004, // from ICQ - ICQEVENTTYPE_AUTH_DENIED = 2005, // from ICQ - ICQEVENTTYPE_BROADCAST = 2006, // from ICQ - ICQEVENTTYPE_SELF_REMOVE = 2007, // from ICQ - ICQEVENTTYPE_FUTURE_AUTH = 2008, // from ICQ - EVENTTYPE_SMTPSIMPLE = 2350, // from SMTP Simple - EVENTTYPE_VOICE_CALL = 8739, // from pescuma - EVENTTYPE_NICKNAMECHANGE = 9001, // from pescuma - EVENTTYPE_STATUSMESSAGECHANGE = 9002, // from pescuma EVENTTYPE_AVATARCHANGE = 9003, // from pescuma - EVENTTYPE_CONTACTLEFTCHANNEL = 9004, // from pescuma EVENTTYPE_WAT_REQUEST = 9601, // from WATrack EVENTTYPE_WAT_ANSWER = 9602, // from WATrack EVENTTYPE_WAT_ERROR = 9603, // from WATrack - EVENTTYPE_STATUSCHANGE = 25368, // from SRMMs + EVENTTYPE_STATUSCHANGE = 25368, // from NewXStatusNotify }; enum DBEventType { @@ -52,23 +42,13 @@ public: etICQSMS = ICQEVENTTYPE_SMS, etICQWebPager = ICQEVENTTYPE_WEBPAGER, etICQEMailExpress = ICQEVENTTYPE_EMAILEXPRESS, - etSMTPSimple = EVENTTYPE_SMTPSIMPLE, - etICQBroadcast = ICQEVENTTYPE_BROADCAST, - etVoiceCall = EVENTTYPE_VOICE_CALL, // authorization and contacts etAuthRequest = EVENTTYPE_AUTHREQUEST, etAdded = EVENTTYPE_ADDED, etContacts = EVENTTYPE_CONTACTS, - etICQAuthGranted = ICQEVENTTYPE_AUTH_GRANTED, - etICQAuthDenied = ICQEVENTTYPE_AUTH_DENIED, - etICQSelfRemove = ICQEVENTTYPE_SELF_REMOVE, - etICQFutureAuth = ICQEVENTTYPE_FUTURE_AUTH, // status/avatar/nick/... changes etStatusChange = EVENTTYPE_STATUSCHANGE, - etNickNameChange = EVENTTYPE_NICKNAMECHANGE, - etStatusMessageChange = EVENTTYPE_STATUSMESSAGECHANGE, etAvatarChange = EVENTTYPE_AVATARCHANGE, - etContactLeftChannel = EVENTTYPE_CONTACTLEFTCHANNEL, // WaTrack events etWATRequest = EVENTTYPE_WAT_REQUEST, etWATAnswer = EVENTTYPE_WAT_ANSWER, diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index c83abc7969..da11d66568 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -56,9 +56,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SRMSGMOD_T "Tab_SRMsg" #define TABSRMM_FONTMODULE "TabSRMM_Fonts" -#define EVENTTYPE_DIVIDER 25367 -#define EVENTTYPE_ERRMSG 25366 - #define SRMSGSET_SHOWURLS "ShowURLs" #define SRMSGSET_SHOWFILES "ShowFiles" #define SRMSGSET_SHOWSTATUSCHANGES "ShowFiles" diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 0ebb48f1f2..c40d510315 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -29,7 +29,6 @@ HGENMENU hMsgMenuItem; extern HWND GetParentWindow(MCONTACT hContact, BOOL bChat); -#define EVENTTYPE_SCRIVER 2010 #define SCRIVER_DB_GETEVENTTEXT "Scriver/GetText" static int SRMMStatusToPf2(int status) diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 1a57ec482b..42af46825d 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -33,16 +33,12 @@ #define SHVIEW_THUMBNAIL 0x702D #endif -#define EVENTTYPE_NICKNAME_CHANGE 9001 -#define EVENTTYPE_STATUSMESSAGE_CHANGE 9002 -#define EVENTTYPE_CONTACTLEFTCHANNEL 9004 #define EVENTTYPE_WAT_ANSWER 9602 #define EVENTTYPE_JABBER_CHATSTATES 2000 #define EVENTTYPE_JABBER_PRESENCE 2001 static int g_status_events[] = { EVENTTYPE_STATUSCHANGE, - EVENTTYPE_CONTACTLEFTCHANNEL, EVENTTYPE_WAT_ANSWER, EVENTTYPE_JABBER_CHATSTATES, EVENTTYPE_JABBER_PRESENCE diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 053d098c03..d5ef3a7a5a 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -766,7 +766,6 @@ private: #define IDM_CONTAINERMENU 50500 #define EVENTTYPE_STATUSCHANGE 25368 -#define EVENTTYPE_DIVIDER 25367 #define EVENTTYPE_ERRMSG 25366 // hotkey modifiers... diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index 6787f0eca4..f633157494 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -159,10 +159,10 @@ protected: #define JABBER_GC_MSG_SLAP LPGENT("/me slaps %s around a bit with a large trout") // registered db event types -#define JABBER_DB_EVENT_TYPE_CHATSTATES 2000 +#define EVENTTYPE_JABBER_CHATSTATES 2000 #define JS_DB_GETEVENTTEXT_CHATSTATES "/GetEventText2000" #define JABBER_DB_EVENT_CHATSTATES_GONE 1 -#define JABBER_DB_EVENT_TYPE_PRESENCE 2001 +#define EVENTTYPE_JABBER_PRESENCE 2001 #define JS_DB_GETEVENTTEXT_PRESENCE "/GetEventText2001" #define JABBER_DB_EVENT_PRESENCE_SUBSCRIBE 1 #define JABBER_DB_EVENT_PRESENCE_SUBSCRIBED 2 diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp index adb34e8061..c72e46f4d2 100644 --- a/protocols/JabberG/src/jabber_misc.cpp +++ b/protocols/JabberG/src/jabber_misc.cpp @@ -167,7 +167,7 @@ BOOL CJabberProto::AddDbPresenceEvent(MCONTACT hContact, BYTE btEventType) DBEVENTINFO dbei = { sizeof(dbei) }; dbei.pBlob = &btEventType; dbei.cbBlob = sizeof(btEventType); - dbei.eventType = JABBER_DB_EVENT_TYPE_PRESENCE; + dbei.eventType = EVENTTYPE_JABBER_PRESENCE; dbei.flags = DBEF_READ; dbei.timestamp = time(NULL); dbei.szModule = m_szModuleName; diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index c0f111eb1e..c14aeda740 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -243,11 +243,11 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM) DBEVENTTYPEDESCR dbEventType = { sizeof(dbEventType) }; dbEventType.module = m_szModuleName; - dbEventType.eventType = JABBER_DB_EVENT_TYPE_CHATSTATES; + dbEventType.eventType = EVENTTYPE_JABBER_CHATSTATES; dbEventType.descr = "Chat state notifications"; CallService(MS_DB_EVENT_REGISTERTYPE, 0, (LPARAM)&dbEventType); - dbEventType.eventType = JABBER_DB_EVENT_TYPE_PRESENCE; + dbEventType.eventType = EVENTTYPE_JABBER_PRESENCE; dbEventType.descr = "Presence notifications"; CallService(MS_DB_EVENT_REGISTERTYPE, 0, (LPARAM)&dbEventType); diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index ba9373f5ec..67992d8192 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1204,7 +1204,7 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData* info) DBEVENTINFO dbei = { sizeof(dbei) }; dbei.pBlob = &bEventType; dbei.cbBlob = 1; - dbei.eventType = JABBER_DB_EVENT_TYPE_CHATSTATES; + dbei.eventType = EVENTTYPE_JABBER_CHATSTATES; dbei.flags = DBEF_READ; dbei.timestamp = time(NULL); dbei.szModule = m_szModuleName; diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index e7dcc166c6..96b7447022 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -214,7 +214,6 @@ static const LPSTR lpcszMailRuDomains[] = //return = 0 for sucess #define ICQACKTYPE_SMS 1001 -#define ICQEVENTTYPE_SMS 2001 //database event type #define MS_ICQ_SENDSMS "/SendSMS" // Database setting names -- cgit v1.2.3