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 --- 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 - 5 files changed, 6 insertions(+), 7 deletions(-) (limited to 'protocols') 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