From 3a83f75a76d4b8f27b5abf476e9d3e5a4cb7e673 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 24 Apr 2013 06:50:50 +0000 Subject: - compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@4520 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/Skype_10.vcxproj | 4 +- protocols/Skype/Skype_10.vcxproj.filters | 12 +++--- protocols/Skype/Skype_11.vcxproj | 4 +- protocols/Skype/Skype_11.vcxproj.filters | 12 +++--- protocols/Skype/src/skype_proto.h | 2 +- protocols/Skype/src/skypekit/account.cpp | 2 +- protocols/Skype/src/skypekit/skype.cpp | 63 ------------------------------- protocols/Skype/src/skypekit/skype.h | 41 -------------------- protocols/Skype/src/skypekit/skypekit.cpp | 63 +++++++++++++++++++++++++++++++ protocols/Skype/src/skypekit/skypekit.h | 41 ++++++++++++++++++++ 10 files changed, 122 insertions(+), 122 deletions(-) delete mode 100644 protocols/Skype/src/skypekit/skype.cpp delete mode 100644 protocols/Skype/src/skypekit/skype.h create mode 100644 protocols/Skype/src/skypekit/skypekit.cpp create mode 100644 protocols/Skype/src/skypekit/skypekit.h diff --git a/protocols/Skype/Skype_10.vcxproj b/protocols/Skype/Skype_10.vcxproj index dea0492a7f..5f7cea213b 100644 --- a/protocols/Skype/Skype_10.vcxproj +++ b/protocols/Skype/Skype_10.vcxproj @@ -192,7 +192,7 @@ - + @@ -209,7 +209,7 @@ - + diff --git a/protocols/Skype/Skype_10.vcxproj.filters b/protocols/Skype/Skype_10.vcxproj.filters index d7470bc9bb..2befbf1767 100644 --- a/protocols/Skype/Skype_10.vcxproj.filters +++ b/protocols/Skype/Skype_10.vcxproj.filters @@ -96,15 +96,15 @@ Source Files\skypekit - - Source Files\skypekit - Source Files\skypekit Source Files + + Source Files + @@ -146,15 +146,15 @@ Header Files\skypekit - - Header Files\skypekit - Header Files\skypekit Header Files + + Header Files\skypekit + diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj index 733c9894d8..7c772da91a 100644 --- a/protocols/Skype/Skype_11.vcxproj +++ b/protocols/Skype/Skype_11.vcxproj @@ -199,7 +199,7 @@ - + @@ -216,7 +216,7 @@ - + diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters index d7470bc9bb..2befbf1767 100644 --- a/protocols/Skype/Skype_11.vcxproj.filters +++ b/protocols/Skype/Skype_11.vcxproj.filters @@ -96,15 +96,15 @@ Source Files\skypekit - - Source Files\skypekit - Source Files\skypekit Source Files + + Source Files + @@ -146,15 +146,15 @@ Header Files\skypekit - - Header Files\skypekit - Header Files\skypekit Header Files + + Header Files\skypekit + diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 4f72dc8096..0e89f4580b 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -1,7 +1,7 @@ #pragma once #include "skype.h" -#include "skypekit\skype.h" +#include "skypekit\skypekit.h" typedef void (__cdecl CSkypeProto::* SkypeThreadFunc) (void*); typedef int (__cdecl CSkypeProto::* SkypeEventFunc)(WPARAM, LPARAM); diff --git a/protocols/Skype/src/skypekit/account.cpp b/protocols/Skype/src/skypekit/account.cpp index 313b1cf50d..31b4c45298 100644 --- a/protocols/Skype/src/skypekit/account.cpp +++ b/protocols/Skype/src/skypekit/account.cpp @@ -1,5 +1,5 @@ #include "account.h" -#include "skype.h" +#include "skypekit.h" CAccount::CAccount(unsigned int oid, SERootObject* root) : Account(oid, root) { diff --git a/protocols/Skype/src/skypekit/skype.cpp b/protocols/Skype/src/skypekit/skype.cpp deleted file mode 100644 index fe22f548c8..0000000000 --- a/protocols/Skype/src/skypekit/skype.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include "skype.h" - -CSkype::CSkype(int num_threads) : Skype(num_threads) -{ - this->proto = NULL; - this->onMessagedCallback = NULL; -} - -CAccount* CSkype::newAccount(int oid) -{ - return new CAccount(oid, this); -} - -CContactGroup* CSkype::newContactGroup(int oid) -{ - return new CContactGroup(oid, this); -} - -CContact* CSkype::newContact(int oid) -{ - return new CContact(oid, this); -} - -CConversation* CSkype::newConversation(int oid) -{ - return new CConversation(oid, this); -} - -CParticipant* CSkype::newParticipant(int oid) -{ - return new CParticipant(oid, this); -} - -CMessage* CSkype::newMessage(int oid) -{ - return new CMessage(oid, this); -} - -CTransfer* CSkype::newTransfer(int oid) -{ - return new CTransfer(oid, this); -} - -CContactSearch* CSkype::newContactSearch(int oid) -{ - return new CContactSearch(oid, this); -} - -void CSkype::OnMessage ( - const MessageRef & message, - const bool & changesInboxTimestamp, - const MessageRef & supersedesHistoryMessage, - const ConversationRef & conversation) -{ - if (this->proto) - (proto->*onMessagedCallback)(conversation, message); -} - -void CSkype::SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto) -{ - this->proto = proto; - this->onMessagedCallback = callback; -} \ No newline at end of file diff --git a/protocols/Skype/src/skypekit/skype.h b/protocols/Skype/src/skypekit/skype.h deleted file mode 100644 index faac4f3d65..0000000000 --- a/protocols/Skype/src/skypekit/skype.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include "common.h" - -#include "group.h" -#include "search.h" -#include "account.h" -#include "contact.h" -#include "message.h" -#include "transfer.h" -#include "participant.h" -#include "conversation.h" - -class CSkype : public Skype -{ -public: - typedef void (CSkypeProto::* OnMessaged)(CConversation::Ref conversation, CMessage::Ref message); - - CAccount* newAccount(int oid); - CContactGroup* newContactGroup(int oid); - CConversation* newConversation(int oid); - CContactSearch* newContactSearch(int oid); - CParticipant* newParticipant(int oid); - CContact* newContact(int oid); - CMessage* newMessage(int oid); - CTransfer* newTransfer(int oid); - - CSkype(int num_threads = 1); - - void SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto); - -private: - CSkypeProto* proto; - OnMessaged onMessagedCallback; - - void OnMessage( - const MessageRef & message, - const bool & changesInboxTimestamp, - const MessageRef & supersedesHistoryMessage, - const ConversationRef & conversation); -}; \ No newline at end of file diff --git a/protocols/Skype/src/skypekit/skypekit.cpp b/protocols/Skype/src/skypekit/skypekit.cpp new file mode 100644 index 0000000000..fe22f548c8 --- /dev/null +++ b/protocols/Skype/src/skypekit/skypekit.cpp @@ -0,0 +1,63 @@ +#include "skype.h" + +CSkype::CSkype(int num_threads) : Skype(num_threads) +{ + this->proto = NULL; + this->onMessagedCallback = NULL; +} + +CAccount* CSkype::newAccount(int oid) +{ + return new CAccount(oid, this); +} + +CContactGroup* CSkype::newContactGroup(int oid) +{ + return new CContactGroup(oid, this); +} + +CContact* CSkype::newContact(int oid) +{ + return new CContact(oid, this); +} + +CConversation* CSkype::newConversation(int oid) +{ + return new CConversation(oid, this); +} + +CParticipant* CSkype::newParticipant(int oid) +{ + return new CParticipant(oid, this); +} + +CMessage* CSkype::newMessage(int oid) +{ + return new CMessage(oid, this); +} + +CTransfer* CSkype::newTransfer(int oid) +{ + return new CTransfer(oid, this); +} + +CContactSearch* CSkype::newContactSearch(int oid) +{ + return new CContactSearch(oid, this); +} + +void CSkype::OnMessage ( + const MessageRef & message, + const bool & changesInboxTimestamp, + const MessageRef & supersedesHistoryMessage, + const ConversationRef & conversation) +{ + if (this->proto) + (proto->*onMessagedCallback)(conversation, message); +} + +void CSkype::SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto) +{ + this->proto = proto; + this->onMessagedCallback = callback; +} \ No newline at end of file diff --git a/protocols/Skype/src/skypekit/skypekit.h b/protocols/Skype/src/skypekit/skypekit.h new file mode 100644 index 0000000000..faac4f3d65 --- /dev/null +++ b/protocols/Skype/src/skypekit/skypekit.h @@ -0,0 +1,41 @@ +#pragma once + +#include "common.h" + +#include "group.h" +#include "search.h" +#include "account.h" +#include "contact.h" +#include "message.h" +#include "transfer.h" +#include "participant.h" +#include "conversation.h" + +class CSkype : public Skype +{ +public: + typedef void (CSkypeProto::* OnMessaged)(CConversation::Ref conversation, CMessage::Ref message); + + CAccount* newAccount(int oid); + CContactGroup* newContactGroup(int oid); + CConversation* newConversation(int oid); + CContactSearch* newContactSearch(int oid); + CParticipant* newParticipant(int oid); + CContact* newContact(int oid); + CMessage* newMessage(int oid); + CTransfer* newTransfer(int oid); + + CSkype(int num_threads = 1); + + void SetOnMessageCallback(OnMessaged callback, CSkypeProto* proto); + +private: + CSkypeProto* proto; + OnMessaged onMessagedCallback; + + void OnMessage( + const MessageRef & message, + const bool & changesInboxTimestamp, + const MessageRef & supersedesHistoryMessage, + const ConversationRef & conversation); +}; \ No newline at end of file -- cgit v1.2.3