diff options
Diffstat (limited to 'protocols/Skype/src')
25 files changed, 42 insertions, 42 deletions
diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp index 04bed2caeb..423a216eaf 100644 --- a/protocols/Skype/src/skype.cpp +++ b/protocols/Skype/src/skype.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
int hLangpack;
HINSTANCE g_hInstance;
diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h index 883be3ecd8..ffa6f36ce2 100644 --- a/protocols/Skype/src/skype.h +++ b/protocols/Skype/src/skype.h @@ -10,7 +10,11 @@ #include <fcntl.h>
#include <time.h>
+#include <map>
+#include <string>
+
#include <newpluginapi.h>
+#include <m_system_cpp.h>
#include <m_avatars.h>
#include <m_clist.h>
#include <m_clistint.h>
@@ -30,12 +34,11 @@ #include <m_userinfo.h>
#include <m_icolib.h>
#include <m_utils.h>
-#include <m_system_cpp.h>
+#include <m_history.h>
#include <m_xml.h>
#include <win2k.h>
#include <m_timezones.h>
#include <m_msg_buttonsbar.h>
-
#include <m_folders.h>
#include "resource.h"
@@ -70,6 +73,20 @@ #define SMI_CHAT_INVITE 1
+#include "string_list.h"
+
+#include "skypekit\common.h"
+#include "skypekit\group.h"
+#include "skypekit\search.h"
+#include "skypekit\account.h"
+#include "skypekit\contact.h"
+#include "skypekit\message.h"
+#include "skypekit\transfer.h"
+#include "skypekit\participant.h"
+#include "skypekit\conversation.h"
+
+#include "skype_proto.h"
+
extern HINSTANCE g_hInstance;
extern int g_cbCountries;
diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp index 728bcc2750..a4b49637df 100644 --- a/protocols/Skype/src/skype_account.cpp +++ b/protocols/Skype/src/skype_account.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
wchar_t *CSkypeProto::LogoutReasons[] =
{
diff --git a/protocols/Skype/src/skype_avatars.cpp b/protocols/Skype/src/skype_avatars.cpp index b44cb2cb66..867b20f537 100644 --- a/protocols/Skype/src/skype_avatars.cpp +++ b/protocols/Skype/src/skype_avatars.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
bool CSkypeProto::IsAvatarChanged(const SEBinary &avatar, HANDLE hContact)
{
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 83f93dff2e..4276df71dc 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -1,7 +1,5 @@ -#include "skype_proto.h"
+#include "skype.h"
#include "skype_chat.h"
-#include <m_message.h>
-#include <m_history.h>
enum CHAT_LIST_MENU
{
diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp index 9b5f1e0cd2..37c97d286e 100644 --- a/protocols/Skype/src/skype_contacts.cpp +++ b/protocols/Skype/src/skype_contacts.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
void CSkypeProto::UpdateContactAuthState(HANDLE hContact, CContact::Ref contact)
{
diff --git a/protocols/Skype/src/skype_database.cpp b/protocols/Skype/src/skype_database.cpp index 2ee7a22eca..f67bad9f86 100644 --- a/protocols/Skype/src/skype_database.cpp +++ b/protocols/Skype/src/skype_database.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
bool CSkypeProto::IsMessageInDB(HANDLE hContact, DWORD timestamp, SEBinary &guid, int flag)
{
diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index 3f225f7dc2..f4927c049a 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
INT_PTR CALLBACK CSkypeProto::SkypeMainOptionsProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 9432284352..dd1c7c7684 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
int CSkypeProto::OnModulesLoaded(WPARAM, LPARAM)
{
diff --git a/protocols/Skype/src/skype_hooks.cpp b/protocols/Skype/src/skype_hooks.cpp index 60592fa39f..5a0d3cfa61 100644 --- a/protocols/Skype/src/skype_hooks.cpp +++ b/protocols/Skype/src/skype_hooks.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
void CSkypeProto::InitHookList()
{
diff --git a/protocols/Skype/src/skype_icons.cpp b/protocols/Skype/src/skype_icons.cpp index 25ac88589c..f3bf880b66 100644 --- a/protocols/Skype/src/skype_icons.cpp +++ b/protocols/Skype/src/skype_icons.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
_tag_iconList CSkypeProto::IconList[] =
{
diff --git a/protocols/Skype/src/skype_instances.cpp b/protocols/Skype/src/skype_instances.cpp index 603a551a03..c3d8adea64 100644 --- a/protocols/Skype/src/skype_instances.cpp +++ b/protocols/Skype/src/skype_instances.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
LIST<CSkypeProto> CSkypeProto::instanceList(1, CSkypeProto::CompareProtos);
diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp index e47754fbb3..41ffc990ac 100644 --- a/protocols/Skype/src/skype_menus.cpp +++ b/protocols/Skype/src/skype_menus.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
HANDLE CSkypeProto::hChooserMenu;
HANDLE CSkypeProto::contactMenuItems[CMI_TEMS_COUNT];
diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp index 3619de3382..b4788e98a5 100644 --- a/protocols/Skype/src/skype_messages.cpp +++ b/protocols/Skype/src/skype_messages.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
int CSkypeProto::OnMessagePreCreate(WPARAM, LPARAM lParam)
{
diff --git a/protocols/Skype/src/skype_netlib.cpp b/protocols/Skype/src/skype_netlib.cpp index 0095383ffe..8641eb8de8 100644 --- a/protocols/Skype/src/skype_netlib.cpp +++ b/protocols/Skype/src/skype_netlib.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
void CSkypeProto::InitNetLib()
{
diff --git a/protocols/Skype/src/skype_own_info.cpp b/protocols/Skype/src/skype_own_info.cpp index 302932b369..7682b2722b 100644 --- a/protocols/Skype/src/skype_own_info.cpp +++ b/protocols/Skype/src/skype_own_info.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
void __cdecl CSkypeProto::LoadOwnInfo(void *)
{
diff --git a/protocols/Skype/src/skype_profile.cpp b/protocols/Skype/src/skype_profile.cpp index 48d3214052..4ab12980c9 100644 --- a/protocols/Skype/src/skype_profile.cpp +++ b/protocols/Skype/src/skype_profile.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
#include <sstream>
void CSkypeProto::UpdateProfileAvatar(SEObject *obj, HANDLE hContact)
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index 3347708837..b0ccba123b 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName) :
Skype(1),
diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 4c79e4355f..b19944400b 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -1,21 +1,5 @@ #pragma once
-#include "skype.h"
-#include "string_list.h"
-
-#include "skypekit\common.h"
-#include "skypekit\group.h"
-#include "skypekit\search.h"
-#include "skypekit\account.h"
-#include "skypekit\contact.h"
-#include "skypekit\message.h"
-#include "skypekit\transfer.h"
-#include "skypekit\participant.h"
-#include "skypekit\conversation.h"
-
-#include <map>
-#include <string>
-
typedef void (__cdecl CSkypeProto::* SkypeThreadFunc) (void*);
typedef int (__cdecl CSkypeProto::* SkypeEventFunc)(WPARAM, LPARAM);
typedef INT_PTR (__cdecl CSkypeProto::* SkypeServiceFunc)(WPARAM, LPARAM);
diff --git a/protocols/Skype/src/skype_runtime.cpp b/protocols/Skype/src/skype_runtime.cpp index b5ebbfef0c..a5c41d58c2 100644 --- a/protocols/Skype/src/skype_runtime.cpp +++ b/protocols/Skype/src/skype_runtime.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
#include "aes\aes.h"
diff --git a/protocols/Skype/src/skype_services.cpp b/protocols/Skype/src/skype_services.cpp index 051051a466..b2f50ca917 100644 --- a/protocols/Skype/src/skype_services.cpp +++ b/protocols/Skype/src/skype_services.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
void CSkypeProto::InitServiceList()
{
diff --git a/protocols/Skype/src/skype_skype.cpp b/protocols/Skype/src/skype_skype.cpp index 214f4fb242..65df7f98f7 100644 --- a/protocols/Skype/src/skype_skype.cpp +++ b/protocols/Skype/src/skype_skype.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
CAccount* CSkypeProto::newAccount(int oid)
{
diff --git a/protocols/Skype/src/skype_transfers.cpp b/protocols/Skype/src/skype_transfers.cpp index 0b2a4286fa..6cd70b09d8 100644 --- a/protocols/Skype/src/skype_transfers.cpp +++ b/protocols/Skype/src/skype_transfers.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
void CSkypeProto::OnTransferChanged(CTransfer::Ref transfer, int prop)
{
diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index 9af8c5b5cf..f61b2b8afe 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -1,4 +1,4 @@ -#include "skype_proto.h"
+#include "skype.h"
wchar_t *CSkypeProto::ValidationReasons[] =
{
diff --git a/protocols/Skype/src/stdafx.cpp b/protocols/Skype/src/stdafx.cpp new file mode 100644 index 0000000000..102b3be23c --- /dev/null +++ b/protocols/Skype/src/stdafx.cpp @@ -0,0 +1 @@ +#include "skype.h"
|