Use m_http.h in Facebook, Omegle and MinecraftDynmap protocols

git-svn-id: http://svn.miranda-ng.org/main/trunk@13844 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 3 insertions, 110 deletions

diff --git a/protocols/FacebookRM/src/http.h b/protocols/FacebookRM/src/http.h
index a17cea8b04..fd7f30723d 100644
--- a/protocols/FacebookRM/src/http.h
+++ b/protocols/FacebookRM/src/http.h
@@ -24,94 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define HTTP_PROTO_SECURE           "https://"
 
-// 1xx Informational
-#define HTTP_CODE_CONTINUE				100
-#define HTTP_CODE_SWITCHING_PROTOCOLS   101
-#define HTTP_CODE_PROCESSING			102
-
-// 2xx Success
-#define HTTP_CODE_OK					200
-#define HTTP_CODE_CREATED				201
-#define HTTP_CODE_ACCEPTED				202
-#define HTTP_CODE_NON_AUTHORITATIVE_INFORMATION	203
-#define HTTP_CODE_NO_CONTENT			204
-#define HTTP_CODE_RESET_CONTENT			205
-#define HTTP_CODE_PARTIAL_CONTENT		206
-#define HTTP_CODE_MULTI_STATUS			207
-
-// 3xx Redirection
-#define HTTP_CODE_MULTIPLE_CHOICES		300
-#define HTTP_CODE_MOVED_PERMANENTLY		301
-#define HTTP_CODE_FOUND					302
-#define HTTP_CODE_SEE_OTHER				303
-#define HTTP_CODE_NOT_MODIFIED			304
-#define HTTP_CODE_USE_PROXY				305
-#define HTTP_CODE_SWITCH_PROXY			306
-#define HTTP_CODE_TEMPORARY_REDIRECT	307
-#define HTTP_CODE_PERMANENT_REDIRECT	308
-
-// 4xx Client Error
-#define HTTP_CODE_BAD_REQUEST			400
-#define HTTP_CODE_UNAUTHORIZED			401
-#define HTTP_CODE_PAYMENT_REQUIRED		402
-#define HTTP_CODE_FORBIDDEN				403
-#define HTTP_CODE_NOT_FOUND				404
-#define HTTP_CODE_METHOD_NOT_ALLOWED    405
-#define HTTP_CODE_NOT_ACCEPTABLE		406
-#define HTTP_CODE_PROXY_AUTHENTICATION_REQUIRED	407
-#define HTTP_CODE_REQUEST_TIMEOUT		408
-#define HTTP_CODE_CONFLICT				409
-#define HTTP_CODE_GONE					410
-#define HTTP_CODE_LENGTH_REQUIRED		411
-#define HTTP_CODE_PRECONDITION_FAILED	412
-#define HTTP_CODE_REQUEST_ENTITY_TOO_LARGE	413
-#define HTTP_CODE_REQUEST_URI_TOO_LONG	414
-#define HTTP_CODE_UNSUPPORTED_MEDIA_TYPE	415
-#define HTTP_CODE_REQUESTED_RANGE_NOT_SATISFIABLE	416
-#define HTTP_CODE_EXPECTATION_FAILED	417
-#define HTTP_CODE_IM_A_TEAPOT			418
-#define HTTP_CODE_AUTHENTICATION_TIMEOUT	419
-#define HTTP_CODE_METHOD_FAILURE		420
-#define HTTP_CODE_ENHANCE_YOUR_CALM		420
-#define HTTP_CODE_MISDIRECTED_REQUEST	421
-#define HTTP_CODE_UNPROCESSABLE_ENTITY  422
-#define HTTP_CODE_LOCKED				423
-#define HTTP_CODE_FAILED_DEPENDENCY		424
-#define HTTP_CODE_UNORDERED_COLLECTION  425
-#define HTTP_CODE_UPGRADE_REQUIRED		426
-#define HTTP_CODE_PRECONDITION_REQUIRED	428
-#define HTTP_CODE_TOO_MANY_REQUESTS		429
-#define HTTP_CODE_REQUEST_HEADER_FIELDS_TOO_LARGE	431
-#define HTTP_CODE_LOGIN_TIMEOUT			440
-#define HTTP_CODE_NO_RESPONSE			444
-#define HTTP_CODE_RETRY_WITH			449
-#define HTTP_CODE_BLOCKED_BY_WINDOWS_PARENTAL_CONTROL	450
-#define HTTP_CODE_UNAVAILABLE_FOR_LEGAL_REASONS	451
-#define HTTP_CODE_REDIRECT				451
-#define HTTP_CODE_REQUEST_HEADER_TOO_LARGE	494
-#define HTTP_CODE_CERT_ERROR			495
-#define HTTP_CODE_NO_CERT				496
-#define HTTP_CODE_HTTP_TO_HTTPS			497
-#define HTTP_CODE_TOKEN_EXPIRED_INVALID	498
-#define HTTP_CODE_CLIENT_CLOSED_REQUEST	499
-#define HTTP_CODE_TOKEN_REQUIRED		499
-
-// 5xx Server Error
-#define HTTP_CODE_INTERNAL_SERVER_ERROR 500
-#define HTTP_CODE_NOT_IMPLEMENTED		501
-#define HTTP_CODE_BAD_GATEWAY			502
-#define HTTP_CODE_SERVICE_UNAVAILABLE   503
-#define HTTP_CODE_GATEWAY_TIMEOUT		504
-#define HTTP_CODE_HTTP_VERSION_NOT_SUPPORTED	505
-#define HTTP_CODE_VARIANT_ALSO_NEGOTIATES	506
-#define HTTP_CODE_INSUFFICIENT_STORAGE	507
-#define HTTP_CODE_LOOP_DETECTED			508
-#define HTTP_CODE_BANDWIDTH_LIMIT_EXCEEDED	509
-#define HTTP_CODE_NOT_EXTENDED			510
-#define HTTP_CODE_NETWORK_AUTHENTICATION_REQUIRED	511
-#define HTTP_CODE_NETWORK_READ_TIMEOUT_ERROR	598
-#define HTTP_CODE_NETWORK_CONNECT_TIMEOUT_ERROR	599
-
 #define HTTP_CODE_FAKE_DISCONNECTED		0
 #define HTTP_CODE_FAKE_ERROR			1
 #define HTTP_CODE_FAKE_OFFLINE			2
diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index bb93847815..ce1b356b67 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -60,6 +60,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_toptoolbar.h>

 #include <m_json.h>

 #include <m_imgsrvc.h>

+#include <m_http.h>

 

 class FacebookProto;

 

diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h
index bff97adae0..008157da25 100644
--- a/protocols/MinecraftDynmap/src/stdafx.h
+++ b/protocols/MinecraftDynmap/src/stdafx.h
@@ -57,6 +57,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_hotkeys.h>
 #include <m_message.h>
 #include <m_json.h>
+#include <m_http.h>
 
 #include "version.h"
 
diff --git a/protocols/MinecraftDynmap/src/utils.h b/protocols/MinecraftDynmap/src/utils.h
index 02c0acb9b1..29a62228ab 100644
--- a/protocols/MinecraftDynmap/src/utils.h
+++ b/protocols/MinecraftDynmap/src/utils.h
@@ -27,17 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define setU8String(setting, value)       db_set_utf(NULL, m_szModuleName, setting, value)
 
 // HTTP constants and object
-#define HTTP_CODE_OK					200
-#define HTTP_CODE_MOVED_PERMANENTLY		301
-#define HTTP_CODE_FOUND					302
-#define HTTP_CODE_FORBIDDEN				403
-#define HTTP_CODE_NOT_FOUND				404
-#define HTTP_CODE_REQUEST_TIMEOUT		408
-#define HTTP_CODE_INTERNAL_SERVER_ERROR	500
-#define HTTP_CODE_NOT_IMPLEMENTED		501
-#define HTTP_CODE_BAD_GATEWAY			502
-#define HTTP_CODE_SERVICE_UNAVAILABLE   503
-
 #define HTTP_CODE_FAKE_DISCONNECTED 0
 #define HTTP_CODE_FAKE_ERROR        1
 
diff --git a/protocols/Omegle/src/http.h b/protocols/Omegle/src/http.h
index d4724432e1..2fb3cb5fe6 100644
--- a/protocols/Omegle/src/http.h
+++ b/protocols/Omegle/src/http.h
@@ -22,17 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #pragma once

 

-#define HTTP_CODE_OK					200

-#define HTTP_CODE_MOVED_PERMANENTLY		301

-#define HTTP_CODE_FOUND					302

-#define HTTP_CODE_FORBIDDEN				403

-#define HTTP_CODE_NOT_FOUND				404

-#define HTTP_CODE_REQUEST_TIMEOUT		408

-#define HTTP_CODE_INTERNAL_SERVER_ERROR	500

-#define HTTP_CODE_NOT_IMPLEMENTED		501

-#define HTTP_CODE_BAD_GATEWAY			502

-#define HTTP_CODE_SERVICE_UNAVAILABLE   503

-

 #define HTTP_CODE_FAKE_DISCONNECTED 0

 #define HTTP_CODE_FAKE_ERROR        1

 

diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h
index 3b6b8b66bb..aaf7530ce4 100644
--- a/protocols/Omegle/src/stdafx.h
+++ b/protocols/Omegle/src/stdafx.h
@@ -57,6 +57,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_hotkeys.h>

 #include <m_message.h>

 //#include <m_msg_buttonsbar.h>

+#include <m_http.h>

 

 #include "version.h"