diff options
author | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-04-25 17:08:00 +0000 |
---|---|---|
committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2015-04-25 17:08:00 +0000 |
commit | 763ff998a4b78f958fdc73440682ccbaf7a66fe4 (patch) | |
tree | 8c267251c696a7a55e2c16d37aafe417bdc3b8cd /protocols/FacebookRM/src | |
parent | 7661154c6360c2b9ff10dc536fe029323f7a96cb (diff) |
Facebook - common project
git-svn-id: http://svn.miranda-ng.org/main/trunk@13142 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/FacebookRM/src')
-rw-r--r-- | protocols/FacebookRM/src/avatars.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/captcha.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/chat.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/communication.cpp | 4 | ||||
-rw-r--r-- | protocols/FacebookRM/src/connection.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/contacts.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/dialogs.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/events.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/json.cpp | 5 | ||||
-rw-r--r-- | protocols/FacebookRM/src/main.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/messages.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/process.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/proto.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/stdafx.cxx (renamed from protocols/FacebookRM/src/stdafx.cpp) | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/stdafx.h (renamed from protocols/FacebookRM/src/common.h) | 0 | ||||
-rw-r--r-- | protocols/FacebookRM/src/theme.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/utils.cpp | 2 |
17 files changed, 18 insertions, 19 deletions
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 <http://www.gnu.org/licenses/>. */
-#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#include "common.h" +#include "stdafx.h" #include <m_history.h> #include <m_userinfo.h> 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */
-#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. */ -#include "common.h" +#include "stdafx.h" FacebookProto::FacebookProto(const char* proto_name, const TCHAR* username) : PROTO<FacebookProto>(proto_name, username), diff --git a/protocols/FacebookRM/src/stdafx.cpp b/protocols/FacebookRM/src/stdafx.cxx index 1eef4c42f8..8aab1386be 100644 --- a/protocols/FacebookRM/src/stdafx.cpp +++ b/protocols/FacebookRM/src/stdafx.cxx @@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "common.h"
\ No newline at end of file +#include "stdafx.h"
\ No newline at end of file diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/stdafx.h index bb93847815..bb93847815 100644 --- a/protocols/FacebookRM/src/common.h +++ b/protocols/FacebookRM/src/stdafx.h 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 <http://www.gnu.org/licenses/>. */
-#include "common.h"
+#include "stdafx.h"
extern OBJLIST<FacebookProto> 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 <http://www.gnu.org/licenses/>. */
-#include "common.h"
+#include "stdafx.h"
std::string utils::url::encode(const std::string &s)
{
|