diff options
Diffstat (limited to 'protocols/SkypeWeb/src/skype_mood.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_mood.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/protocols/SkypeWeb/src/skype_mood.cpp b/protocols/SkypeWeb/src/skype_mood.cpp index 78ceebec8a..dfaa5b0922 100644 --- a/protocols/SkypeWeb/src/skype_mood.cpp +++ b/protocols/SkypeWeb/src/skype_mood.cpp @@ -44,31 +44,31 @@ struct SetStatusMsgRequest : public AsyncHttpRequest SetStatusMsgRequest(CSkypeProto *ppro) : AsyncHttpRequest(REQUEST_POST, HOST_API, "/users/self/profile/partial") { - int iMood = ppro->iMood; - auto &pMood = moods[iMood]; + int m_iMood = ppro->m_iMood; + auto &pMood = moods[m_iMood]; JSONNode node, payload; payload.set_name("payload"); CMStringW s1, s2; - switch (iMood) { + switch (m_iMood) { case 0: // none - s1 = ppro->wstrMoodMessage; + s1 = ppro->m_wstrMoodMessage; break; case 1: // custom - s1.Format(L"(%x) %s", Utf16toUtf32(ppro->wstrMoodEmoji), (wchar_t *)ppro->wstrMoodMessage); + s1.Format(L"(%x) %s", Utf16toUtf32(ppro->m_wstrMoodEmoji), (wchar_t *)ppro->m_wstrMoodMessage); break; default: - s1.Format(L"(%S) %s", pMood.ss, (wchar_t *)ppro->wstrMoodMessage); + s1.Format(L"(%S) %s", pMood.ss, (wchar_t *)ppro->m_wstrMoodMessage); break; } payload << WCHAR_PARAM("mood", s1); - if (iMood > 1) - s2.Format(L"<ss type=\"%S\">(%S)</ss>%s", pMood.ss, pMood.ss, (wchar_t*)ppro->wstrMoodMessage); - else if (iMood == 1) { - int code = Utf16toUtf32(ppro->wstrMoodEmoji); - s2.Format(L"<ss type=\"%x\">(%x)</ss>%s", code, code, (wchar_t *)ppro->wstrMoodMessage); + if (m_iMood > 1) + s2.Format(L"<ss type=\"%S\">(%S)</ss>%s", pMood.ss, pMood.ss, (wchar_t*)ppro->m_wstrMoodMessage); + else if (m_iMood == 1) { + int code = Utf16toUtf32(ppro->m_wstrMoodEmoji); + s2.Format(L"<ss type=\"%x\">(%x)</ss>%s", code, code, (wchar_t *)ppro->m_wstrMoodMessage); } if (!s2.IsEmpty()) @@ -103,8 +103,8 @@ public: edtEmoji(this, IDC_MOOD_EMOJI), cmbMoods(this, IDC_MOOD_COMBO) { - CreateLink(edtText, ppro->wstrMoodMessage); - CreateLink(edtEmoji, ppro->wstrMoodEmoji); + CreateLink(edtText, ppro->m_wstrMoodMessage); + CreateLink(edtEmoji, ppro->m_wstrMoodEmoji); cmbMoods.OnChange = Callback(this, &CMoodDialog::onChangeSel_Mood); } @@ -113,17 +113,17 @@ public: { for (auto &it : moods) cmbMoods.AddString(TranslateW(it.defStatus), int(&it - moods)); - cmbMoods.SetCurSel(m_proto->iMood); + cmbMoods.SetCurSel(m_proto->m_iMood); onChangeSel_Mood(0); return true; } bool OnApply() override { - m_proto->iMood = cmbMoods.GetCurSel(); + m_proto->m_iMood = cmbMoods.GetCurSel(); - CMStringA szSetting(FORMAT, "Mood%d", (int)m_proto->iMood); - m_proto->setWString(szSetting, m_proto->wstrMoodMessage); + CMStringA szSetting(FORMAT, "Mood%d", (int)m_proto->m_iMood); + m_proto->setWString(szSetting, m_proto->m_wstrMoodMessage); m_proto->PushRequest(new SetStatusMsgRequest(m_proto)); return true; @@ -131,10 +131,10 @@ public: void onChangeSel_Mood(CCtrlCombo *) { - int iMood = cmbMoods.GetCurSel(); - edtEmoji.Enable(iMood == 1); + int m_iMood = cmbMoods.GetCurSel(); + edtEmoji.Enable(m_iMood == 1); - CMStringA szSetting(FORMAT, "Mood%d", iMood); + CMStringA szSetting(FORMAT, "Mood%d", m_iMood); edtText.SetText(m_proto->getMStringW(szSetting)); } }; |