diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-19 14:24:12 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-19 14:24:12 +0000 |
| commit | 83310365c69bd40365ee0ae0e16c99c28e24cd0b (patch) | |
| tree | 10ac18bfdc3fcf0fd62a5aba3ccb5dedffa2e410 /protocols/Tox/src | |
| parent | d68cd04d6f7b997692476b531bdc30f546a50efd (diff) | |
- all static protocol services replaced with functions;
- m_protomod.h removed as useless
git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src')
| -rw-r--r-- | protocols/Tox/src/stdafx.h | 1 | ||||
| -rw-r--r-- | protocols/Tox/src/tox.cpp | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_chatrooms.cpp | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_contacts.cpp | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index 82ef5e31e3..3a5cfafe8b 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -17,7 +17,6 @@ #include <newpluginapi.h>
#include <m_protoint.h>
-#include <m_protomod.h>
#include <m_protosvc.h>
#include <m_database.h>
diff --git a/protocols/Tox/src/tox.cpp b/protocols/Tox/src/tox.cpp index f6c89d2a00..3643149fbd 100644 --- a/protocols/Tox/src/tox.cpp +++ b/protocols/Tox/src/tox.cpp @@ -49,7 +49,7 @@ extern "C" int __declspec(dllexport) Load(void) pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = (pfnInitProto)CToxProto::InitAccount;
pd.fnUninit = (pfnUninitProto)CToxProto::UninitAccount;
- CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+ Proto_RegisterModule(&pd);
HookEvent(ME_SYSTEM_MODULESLOADED, &CToxProto::OnModulesLoaded);
diff --git a/protocols/Tox/src/tox_chatrooms.cpp b/protocols/Tox/src/tox_chatrooms.cpp index 27aa4c7444..629d46c510 100644 --- a/protocols/Tox/src/tox_chatrooms.cpp +++ b/protocols/Tox/src/tox_chatrooms.cpp @@ -24,7 +24,7 @@ MCONTACT CToxProto::AddChatRoom(int groupNumber) if (!hContact)
{
hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
- CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName);
+ Proto_AddToContact(hContact, m_szModuleName);
setWord(hContact, TOX_SETTINGS_CHAT_ID, groupNumber);
diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp index 532f23ab48..069f368990 100644 --- a/protocols/Tox/src/tox_contacts.cpp +++ b/protocols/Tox/src/tox_contacts.cpp @@ -69,7 +69,7 @@ MCONTACT CToxProto::AddContact(const char *address, const char *nick, const char if (!hContact)
{
hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
- CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName);
+ Proto_AddToContact(hContact, m_szModuleName);
setString(hContact, TOX_SETTINGS_ID, address);
@@ -376,7 +376,7 @@ void CToxProto::OnConnectionStatusChanged(Tox*, uint32_t friendNumber, TOX_CONNE int CToxProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
{
- if (!CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)m_szModuleName))
+ if (!Proto_IsProtocolLoaded(m_szModuleName))
return 0;
MCONTACT hContact = lParam;
|