From 763ff998a4b78f958fdc73440682ccbaf7a66fe4 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 25 Apr 2015 17:08:00 +0000 Subject: Facebook - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13142 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin10/miranda32.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- bin12/miranda32.sln | 2 +- protocols/FacebookRM/facebook.vcxproj | 28 +++ protocols/FacebookRM/facebook.vcxproj.filters | 4 + protocols/FacebookRM/facebook_10.vcxproj | 231 ---------------------- protocols/FacebookRM/facebook_10.vcxproj.filters | 154 --------------- protocols/FacebookRM/facebook_12.vcxproj | 234 ----------------------- protocols/FacebookRM/facebook_12.vcxproj.filters | 154 --------------- protocols/FacebookRM/src/avatars.cpp | 2 +- protocols/FacebookRM/src/captcha.cpp | 2 +- protocols/FacebookRM/src/chat.cpp | 2 +- protocols/FacebookRM/src/common.h | 83 -------- protocols/FacebookRM/src/communication.cpp | 4 +- protocols/FacebookRM/src/connection.cpp | 2 +- protocols/FacebookRM/src/contacts.cpp | 2 +- protocols/FacebookRM/src/dialogs.cpp | 2 +- protocols/FacebookRM/src/events.cpp | 2 +- protocols/FacebookRM/src/json.cpp | 5 +- protocols/FacebookRM/src/main.cpp | 2 +- protocols/FacebookRM/src/messages.cpp | 2 +- protocols/FacebookRM/src/process.cpp | 2 +- protocols/FacebookRM/src/proto.cpp | 2 +- protocols/FacebookRM/src/stdafx.cpp | 18 -- protocols/FacebookRM/src/stdafx.cxx | 18 ++ protocols/FacebookRM/src/stdafx.h | 83 ++++++++ protocols/FacebookRM/src/theme.cpp | 2 +- protocols/FacebookRM/src/utils.cpp | 2 +- 32 files changed, 157 insertions(+), 899 deletions(-) create mode 100644 protocols/FacebookRM/facebook.vcxproj create mode 100644 protocols/FacebookRM/facebook.vcxproj.filters delete mode 100644 protocols/FacebookRM/facebook_10.vcxproj delete mode 100644 protocols/FacebookRM/facebook_10.vcxproj.filters delete mode 100644 protocols/FacebookRM/facebook_12.vcxproj delete mode 100644 protocols/FacebookRM/facebook_12.vcxproj.filters delete mode 100644 protocols/FacebookRM/src/common.h delete mode 100644 protocols/FacebookRM/src/stdafx.cpp create mode 100644 protocols/FacebookRM/src/stdafx.cxx create mode 100644 protocols/FacebookRM/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 12d02257f3..bc94b33390 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -127,7 +127,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt_10.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_10.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker_10.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index c90113b115..ed99308c39 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -127,7 +127,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt_10.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_10.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker_10.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index bf5dd1b940..17fdd32a3b 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -127,7 +127,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt_10.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_10.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker_10.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}" EndProject diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln index 7996e9bcb6..eaa6e7ace0 100644 --- a/bin10/miranda32.sln +++ b/bin10/miranda32.sln @@ -149,7 +149,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginUpdater", "..\plugins\PluginUpdater\PluginUpdater_10.vcxproj", "{21F6C0E4-DD1A-49E6-82FD-64574BB902BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_10.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\FacebookRM\proto_facebook\Proto_Facebook_10.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index 0b0a720527..df7c47a15e 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -129,7 +129,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt_12.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_12.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker_12.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index a11afd5847..6565fa45cb 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -129,7 +129,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRA", "..\protocols\MRA\Mra EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTalkExt", "..\protocols\GTalkExt\GTalkExt_12.vcxproj", "{2A737817-2443-48FF-A2E8-CA8D69E450F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_12.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker", "..\plugins\SpellChecker\spellchecker_12.vcxproj", "{5DB86086-10E9-42E7-AC90-503D2678C2A2}" EndProject diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln index ad2dea0f26..be2bffed06 100644 --- a/bin12/miranda32.sln +++ b/bin12/miranda32.sln @@ -151,7 +151,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginUpdater", "..\plugins\PluginUpdater\PluginUpdater_12.vcxproj", "{21F6C0E4-DD1A-49E6-82FD-64574BB902BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook_12.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\protocols\FacebookRM\facebook.vcxproj", "{DADE9455-DC28-465A-9604-2CA28052B9FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\FacebookRM\proto_facebook\Proto_Facebook_12.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}" EndProject diff --git a/protocols/FacebookRM/facebook.vcxproj b/protocols/FacebookRM/facebook.vcxproj new file mode 100644 index 0000000000..06ada48bed --- /dev/null +++ b/protocols/FacebookRM/facebook.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Facebook + {DADE9455-DC28-465A-9604-2CA28052B9FB} + + + + + \ No newline at end of file diff --git a/protocols/FacebookRM/facebook.vcxproj.filters b/protocols/FacebookRM/facebook.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/protocols/FacebookRM/facebook.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/protocols/FacebookRM/facebook_10.vcxproj b/protocols/FacebookRM/facebook_10.vcxproj deleted file mode 100644 index 4eaf93aa95..0000000000 --- a/protocols/FacebookRM/facebook_10.vcxproj +++ /dev/null @@ -1,231 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DADE9455-DC28-465A-9604-2CA28052B9FB} - Facebook - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)\$(Configuration)\Plugins\ - $(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)\$(Configuration)64\Plugins\ - $(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)\$(Configuration)\Plugins\ - $(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)\$(Configuration)64\Plugins\ - $(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - MultiThreadedDebugDLL - true - Use - common.h - Level3 - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - false - Use - common.h - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - - - Full - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - Use - common.h - Level3 - Fast - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Full - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - Use - common.h - Level3 - Strict - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/protocols/FacebookRM/facebook_10.vcxproj.filters b/protocols/FacebookRM/facebook_10.vcxproj.filters deleted file mode 100644 index 94f5cf0179..0000000000 --- a/protocols/FacebookRM/facebook_10.vcxproj.filters +++ /dev/null @@ -1,154 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4cbdc49c-f233-4d62-9c62-0cc8d034e377} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - \ No newline at end of file diff --git a/protocols/FacebookRM/facebook_12.vcxproj b/protocols/FacebookRM/facebook_12.vcxproj deleted file mode 100644 index 857c916868..0000000000 --- a/protocols/FacebookRM/facebook_12.vcxproj +++ /dev/null @@ -1,234 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DADE9455-DC28-465A-9604-2CA28052B9FB} - Facebook - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)\$(Configuration)\Plugins\ - $(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)\$(Configuration)64\Plugins\ - $(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)\$(Configuration)\Plugins\ - $(SolutionDir)\$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)\$(Configuration)64\Plugins\ - $(SolutionDir)\$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - MultiThreadedDebugDLL - true - Use - common.h - Level4 - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - - - - - Disabled - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - false - Use - common.h - Level4 - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - - - - - Full - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - Use - common.h - Level4 - Fast - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - - - - - Full - Size - ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - Use - common.h - Level4 - Strict - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/protocols/FacebookRM/facebook_12.vcxproj.filters b/protocols/FacebookRM/facebook_12.vcxproj.filters deleted file mode 100644 index 94f5cf0179..0000000000 --- a/protocols/FacebookRM/facebook_12.vcxproj.filters +++ /dev/null @@ -1,154 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {4cbdc49c-f233-4d62-9c62-0cc8d034e377} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - Resource Files\Icons - - - \ No newline at end of file diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp index 91a1591a05..cd68b55c62 100644 --- a/protocols/FacebookRM/src/avatars.cpp +++ b/protocols/FacebookRM/src/avatars.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *url) { diff --git a/protocols/FacebookRM/src/captcha.cpp b/protocols/FacebookRM/src/captcha.cpp index 1dd064e9ab..d526d06623 100644 --- a/protocols/FacebookRM/src/captcha.cpp +++ b/protocols/FacebookRM/src/captcha.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" #include "resource.h" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp index 4ed39f0afa..cae422e414 100644 --- a/protocols/FacebookRM/src/chat.cpp +++ b/protocols/FacebookRM/src/chat.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" #include #include diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h deleted file mode 100644 index bb93847815..0000000000 --- a/protocols/FacebookRM/src/common.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - -Facebook plugin for Miranda Instant Messenger -_____________________________________________ - -Copyright © 2009-11 Michal Zelinka, 2011-15 Robert Pösel - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -*/ - -#pragma once - -#pragma warning(disable:4996) - -#define _CRT_RAND_S - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class FacebookProto; - -#include "constants.h" -#include "definitions.h" -#include "entities.h" -#include "http.h" -#include "list.hpp" -#include "utils.h" -#include "client.h" -#include "proto.h" -#include "json.h" -#include "db.h" -#include "dialogs.h" -#include "theme.h" -#include "resource.h" -#include "version.h" - -extern HINSTANCE g_hInstance; -extern std::string g_strUserAgent; -extern DWORD g_mirandaVersion; \ No newline at end of file diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp index 66e931bf14..08fe0ea73a 100644 --- a/protocols/FacebookRM/src/communication.cpp +++ b/protocols/FacebookRM/src/communication.cpp @@ -20,14 +20,14 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" void facebook_client::client_notify(TCHAR* message) { parent->NotifyEvent(parent->m_tszUserName, message, NULL, FACEBOOK_EVENT_CLIENT); } -http::response facebook_client::flap(RequestType request_type, std::string *post_data, std::string *get_data, int method) +http::response facebook_client::flap(RequestType request_type, std::string *post_data, std::string *get_data, int) { http::response resp; diff --git a/protocols/FacebookRM/src/connection.cpp b/protocols/FacebookRM/src/connection.cpp index 38f5c1b3ce..31acc8955e 100644 --- a/protocols/FacebookRM/src/connection.cpp +++ b/protocols/FacebookRM/src/connection.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" void FacebookProto::ChangeStatus(void*) { diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp index 38daa3f3ca..9ea1e60abf 100644 --- a/protocols/FacebookRM/src/contacts.cpp +++ b/protocols/FacebookRM/src/contacts.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" void updateStringUtf(FacebookProto *proto, MCONTACT hContact, const char *key, const std::string &value) { bool update_required = true; diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp index bdd9995d3a..b736b2c239 100644 --- a/protocols/FacebookRM/src/dialogs.cpp +++ b/protocols/FacebookRM/src/dialogs.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" static BOOL LoadDBCheckState(FacebookProto* ppro, HWND hwnd, int idCtrl, const char* szSetting, BYTE bDef) { diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp index 5a2abf822f..da46bbe96b 100644 --- a/protocols/FacebookRM/src/events.cpp +++ b/protocols/FacebookRM/src/events.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" HWND FacebookProto::NotifyEvent(TCHAR* title, TCHAR* info, MCONTACT contact, DWORD flags, std::string *url, std::string *notification_id) { diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index 5eea6287bc..defcec4595 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" int facebook_json_parser::parse_buddy_list(std::string *data, List::List< facebook_user >* buddy_list) { @@ -277,7 +277,7 @@ int facebook_json_parser::parse_notifications(std::string *data, std::map< std:: return EXIT_SUCCESS; } -bool ignore_duplicits(FacebookProto *proto, const std::string &mid, const std::string &text) +bool ignore_duplicits(FacebookProto *proto, const std::string &mid, const std::string &) { ScopedLock s(proto->facy.send_message_lock_); @@ -717,7 +717,6 @@ int facebook_json_parser::parse_messages(std::string *data, std::vector< faceboo continue; } else if (t == "ticker_update:home") { JSONNODE *actor_ = json_get(it, "actor"); - JSONNODE *time_ = json_get(it, "story_time"); JSONNODE *story_ = json_get(it, "story_xhp"); std::string text = json_as_pstring(story_); diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index 242a1c944c..697cfbe802 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" // TODO: Make following as "globals" structure? diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp index ec37efcb68..f5be08b2fc 100644 --- a/protocols/FacebookRM/src/messages.cpp +++ b/protocols/FacebookRM/src/messages.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" int FacebookProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) { diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp index 9799856a77..9a95fc584c 100644 --- a/protocols/FacebookRM/src/process.cpp +++ b/protocols/FacebookRM/src/process.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" #define MAX_NEWSFEED_LEN 500 diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 009dfba478..81c5e131ae 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" FacebookProto::FacebookProto(const char* proto_name, const TCHAR* username) : PROTO(proto_name, username), diff --git a/protocols/FacebookRM/src/stdafx.cpp b/protocols/FacebookRM/src/stdafx.cpp deleted file mode 100644 index 1eef4c42f8..0000000000 --- a/protocols/FacebookRM/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG team (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "common.h" \ No newline at end of file diff --git a/protocols/FacebookRM/src/stdafx.cxx b/protocols/FacebookRM/src/stdafx.cxx new file mode 100644 index 0000000000..8aab1386be --- /dev/null +++ b/protocols/FacebookRM/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG team (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h new file mode 100644 index 0000000000..bb93847815 --- /dev/null +++ b/protocols/FacebookRM/src/stdafx.h @@ -0,0 +1,83 @@ +/* + +Facebook plugin for Miranda Instant Messenger +_____________________________________________ + +Copyright © 2009-11 Michal Zelinka, 2011-15 Robert Pösel + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +*/ + +#pragma once + +#pragma warning(disable:4996) + +#define _CRT_RAND_S + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class FacebookProto; + +#include "constants.h" +#include "definitions.h" +#include "entities.h" +#include "http.h" +#include "list.hpp" +#include "utils.h" +#include "client.h" +#include "proto.h" +#include "json.h" +#include "db.h" +#include "dialogs.h" +#include "theme.h" +#include "resource.h" +#include "version.h" + +extern HINSTANCE g_hInstance; +extern std::string g_strUserAgent; +extern DWORD g_mirandaVersion; \ No newline at end of file diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index db9e7434f2..d95a16b40c 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" extern OBJLIST g_Instances; diff --git a/protocols/FacebookRM/src/utils.cpp b/protocols/FacebookRM/src/utils.cpp index 383aac5d4b..2267f0cce9 100644 --- a/protocols/FacebookRM/src/utils.cpp +++ b/protocols/FacebookRM/src/utils.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" std::string utils::url::encode(const std::string &s) { -- cgit v1.2.3