diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-21 13:30:53 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-21 13:30:53 +0300 |
| commit | 206f15f700b31dc45c2ad6b7c1ec21142d6a38a5 (patch) | |
| tree | 035f7a89aeeb3cf07c9d45e495a5ec9fbf3b1d41 /protocols/SkypeWeb/src | |
| parent | b6330f119c9f253d470dac46b20335811a8e0676 (diff) | |
warning fix
Diffstat (limited to 'protocols/SkypeWeb/src')
| -rw-r--r-- | protocols/SkypeWeb/src/http_request.h | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/requests/avatars.h | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/requests/login.h | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_polling.cpp | 18 |
4 files changed, 12 insertions, 12 deletions
diff --git a/protocols/SkypeWeb/src/http_request.h b/protocols/SkypeWeb/src/http_request.h index bfc872ba68..b18d8c18b2 100644 --- a/protocols/SkypeWeb/src/http_request.h +++ b/protocols/SkypeWeb/src/http_request.h @@ -209,7 +209,7 @@ protected: HttpRequestBody & operator<<(const FORMAT_VALUE ¶m)
{
AppendSeparator();
- content.AppendFormat("%s=%s", param.szName, param.szValue);
+ content.AppendFormat("%s=%s", param.szName, param.szValue.c_str());
return *this;
}
diff --git a/protocols/SkypeWeb/src/requests/avatars.h b/protocols/SkypeWeb/src/requests/avatars.h index 0715e5c552..97b5460416 100644 --- a/protocols/SkypeWeb/src/requests/avatars.h +++ b/protocols/SkypeWeb/src/requests/avatars.h @@ -31,7 +31,7 @@ class SetAvatarRequest : public HttpRequest {
public:
SetAvatarRequest(const PBYTE data, size_t dataSize, const char *szMime, LoginInfo &li) :
- HttpRequest(REQUEST_PUT, FORMAT, "api.skype.com/users/%s/profile/avatar", CMStringA(li.szSkypename.get()).MakeLower())
+ HttpRequest(REQUEST_PUT, FORMAT, "api.skype.com/users/%s/profile/avatar", CMStringA(li.szSkypename.get()).MakeLower().c_str())
{
Headers
<< CHAR_VALUE("X-Skypetoken", li.api.szToken)
diff --git a/protocols/SkypeWeb/src/requests/login.h b/protocols/SkypeWeb/src/requests/login.h index 78b8cdd431..f318831721 100644 --- a/protocols/SkypeWeb/src/requests/login.h +++ b/protocols/SkypeWeb/src/requests/login.h @@ -25,7 +25,7 @@ public: HttpRequest(REQUEST_POST, "api.skype.com/login/skypetoken")
{
username.MakeLower();
- CMStringA hashStr(::FORMAT, "%s\nskyper\n%s", username, password);
+ CMStringA hashStr(::FORMAT, "%s\nskyper\n%s", username.c_str(), password);
BYTE digest[16];
mir_md5_hash((const BYTE*)hashStr.GetString(), hashStr.GetLength(), digest);
diff --git a/protocols/SkypeWeb/src/skype_polling.cpp b/protocols/SkypeWeb/src/skype_polling.cpp index 70921b62b6..459e45ebe8 100644 --- a/protocols/SkypeWeb/src/skype_polling.cpp +++ b/protocols/SkypeWeb/src/skype_polling.cpp @@ -157,31 +157,31 @@ void CSkypeProto::ProcessEndpointPresence(const JSONNode &node) {
case 0:
case 1:
- MirVer.AppendFormat("Skype (Web) %s", ParseUrl(version.c_str(), "/"));
+ MirVer.Append("Skype (Web) " + ParseUrl(version.c_str(), "/"));
break;
case 10:
- MirVer.AppendFormat("Skype (XBOX) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (XBOX) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 17:
- MirVer.AppendFormat("Skype (Android) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (Android) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 16:
- MirVer.AppendFormat("Skype (iOS) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (iOS) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 12:
- MirVer.AppendFormat("Skype (WinRT) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (WinRT) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 15:
- MirVer.AppendFormat("Skype (WP) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (WP) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 13:
- MirVer.AppendFormat("Skype (OSX) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (OSX) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 11:
- MirVer.AppendFormat("Skype (Windows) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (Windows) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 14:
- MirVer.AppendFormat("Skype (Linux) %s", ParseUrl(skypeNameVersion.c_str(), "/"));
+ MirVer.Append("Skype (Linux) " + ParseUrl(skypeNameVersion.c_str(), "/"));
break;
case 125:
MirVer.AppendFormat("Miranda NG Skype %s", version.c_str());
|