From d14e2b59f51177dc421b50cfb757d27fba7b6cf9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 30 Mar 2020 10:33:31 +0300
Subject: SkypeWeb: fix for vcxproj file

---
 protocols/SkypeWeb/src/requests/asm/files.h | 45 -----------------------------
 protocols/SkypeWeb/src/requests/files.h     | 45 +++++++++++++++++++++++++++++
 protocols/SkypeWeb/src/stdafx.h             | 23 ++++++++-------
 3 files changed, 57 insertions(+), 56 deletions(-)
 delete mode 100644 protocols/SkypeWeb/src/requests/asm/files.h
 create mode 100644 protocols/SkypeWeb/src/requests/files.h

(limited to 'protocols/SkypeWeb/src')

diff --git a/protocols/SkypeWeb/src/requests/asm/files.h b/protocols/SkypeWeb/src/requests/asm/files.h
deleted file mode 100644
index c5bcf7373a..0000000000
--- a/protocols/SkypeWeb/src/requests/asm/files.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-class ASMObjectCreateRequest : public HttpRequest
-{
-public:
-	ASMObjectCreateRequest(CSkypeProto *ppro, const char *szContact, const char *szFileName) :
-		HttpRequest(REQUEST_POST, "api.asm.skype.com/v1/objects")
-	{
-		flags &= (~NLHRF_DUMPASTEXT);
-		Headers
-			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken.get())
-			<< CHAR_VALUE("Content-Type", "text/json")
-			<< CHAR_VALUE("X-Client-Version", "0/0.0.0.0");
-
-		JSONNode node, jPermissions, jPermission(JSON_ARRAY);
-		jPermissions.set_name("permissions");
-		jPermission.set_name(szContact);
-		jPermission << JSONNode("", "read");
-		jPermissions << jPermission;
-		node << JSONNode("type", "sharing/file") << JSONNode("filename", szFileName) << jPermissions;
-
-		Body << VALUE(node.write().c_str());
-	}
-};
-
-class ASMObjectUploadRequest : public HttpRequest
-{
-public:
-	ASMObjectUploadRequest(CSkypeProto *ppro, const char *szObject, const PBYTE data, const size_t size) :
-		HttpRequest(REQUEST_PUT, FORMAT, "api.asm.skype.com/v1/objects/%s/content/original", szObject)
-	{
-		Headers
-			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken.get())
-			<< CHAR_VALUE("Content-Type", "application/octet-stream");
-
-		pData = (char*)mir_alloc(size);
-		memcpy(pData, data, size);
-		dataLength = (int)size;
-
-	}
-	~ASMObjectUploadRequest()
-	{
-		mir_free(pData);
-	}
-};
diff --git a/protocols/SkypeWeb/src/requests/files.h b/protocols/SkypeWeb/src/requests/files.h
new file mode 100644
index 0000000000..f7404474a2
--- /dev/null
+++ b/protocols/SkypeWeb/src/requests/files.h
@@ -0,0 +1,45 @@
+#pragma once
+
+class ASMObjectCreateRequest : public HttpRequest
+{
+public:
+	ASMObjectCreateRequest(CSkypeProto *ppro, const char *szContact, const char *szFileName) :
+		HttpRequest(REQUEST_POST, "api.asm.skype.com/v1/objects")
+	{
+		flags &= (~NLHRF_DUMPASTEXT);
+		Headers
+			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken.get())
+			<< CHAR_VALUE("Content-Type", "text/json")
+			<< CHAR_VALUE("X-Client-Version", "0/0.0.0.0");
+
+		JSONNode node, jPermissions, jPermission(JSON_ARRAY);
+		jPermissions.set_name("permissions");
+		jPermission.set_name(szContact);
+		jPermission << JSONNode("", "read");
+		jPermissions << jPermission;
+		node << JSONNode("type", "sharing/file") << JSONNode("filename", szFileName) << jPermissions;
+
+		Body << VALUE(node.write().c_str());
+	}
+};
+
+class ASMObjectUploadRequest : public HttpRequest
+{
+public:
+	ASMObjectUploadRequest(CSkypeProto *ppro, const char *szObject, const PBYTE data, const size_t size) :
+		HttpRequest(REQUEST_PUT, FORMAT, "api.asm.skype.com/v1/objects/%s/content/original", szObject)
+	{
+		Headers
+			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken.get())
+			<< CHAR_VALUE("Content-Type", "application/octet-stream");
+
+		pData = (char*)mir_alloc(size);
+		memcpy(pData, data, size);
+		dataLength = (int)size;
+
+	}
+	~ASMObjectUploadRequest()
+	{
+		mir_free(pData);
+	}
+};
diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h
index 433a38c1ab..ebaff8d4bb 100644
--- a/protocols/SkypeWeb/src/stdafx.h
+++ b/protocols/SkypeWeb/src/stdafx.h
@@ -94,23 +94,24 @@ struct MessageId
 #include "skype_db.h"
 #include "http_request.h"
 #include "skype_proto.h"
-#include "requests/login.h"
-#include "requests/profile.h"
+
+#include "requests/avatars.h"
+#include "requests/capabilities.h"
+#include "requests/chatrooms.h"
 #include "requests/contacts.h"
-#include "requests/status.h"
 #include "requests/endpoint.h"
-#include "requests/capabilities.h"
-#include "requests/subscriptions.h"
-#include "requests/messages.h"
+#include "requests/files.h"
 #include "requests/history.h"
+#include "requests/login.h"
+#include "requests/messages.h"
+#include "requests/mslogin.h"
+#include "requests/oauth.h"
 #include "requests/poll.h"
-#include "requests/avatars.h"
+#include "requests/profile.h"
 #include "requests/search.h"
-#include "requests/chatrooms.h"
+#include "requests/status.h"
+#include "requests/subscriptions.h"
 #include "requests/trouter.h"
-#include "requests/mslogin.h"
-#include "requests/oauth.h"
-#include "requests/asm/files.h"
 #include "request_queue.h"
 
 void SkypeHttpResponse(const NETLIBHTTPREQUEST *response, void *arg);
-- 
cgit v1.2.3