diff options
Diffstat (limited to 'protocols/IRCG/src/services.cpp')
| -rw-r--r-- | protocols/IRCG/src/services.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index b2aa2604a8..edcefa6a76 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -157,8 +157,7 @@ INT_PTR __cdecl CIrcProto::OnDoubleclicked(WPARAM, LPARAM lParam) dlg->Show();
HWND hWnd = dlg->GetHwnd();
wchar_t szTemp[500];
- mir_snwprintf(szTemp, TranslateT("%s (%s) is requesting a client-to-client chat connection."),
- pdci->sContactName.c_str(), pdci->sHostmask.c_str());
+ mir_snwprintf(szTemp, TranslateT("%s (%s) is requesting a client-to-client chat connection."), pdci->sContactName.c_str(), pdci->sHostmask.c_str());
SetDlgItemText(hWnd, IDC_TEXT, szTemp);
ShowWindow(hWnd, SW_SHOW);
return 1;
@@ -331,7 +330,7 @@ INT_PTR __cdecl CIrcProto::OnChangeNickMenuCommand(WPARAM, LPARAM) SetDlgItemText(m_nickDlg->GetHwnd(), IDC_CAPTION, TranslateT("Change nickname"));
SetDlgItemText(m_nickDlg->GetHwnd(), IDC_TEXT, TranslateT("Please enter a unique nickname"));
- m_nickDlg->m_Enick.SetText(m_info.sNick.c_str());
+ m_nickDlg->m_Enick.SetText(m_info.sNick);
m_nickDlg->m_Enick.SendMsg(CB_SETEDITSEL, 0, MAKELPARAM(0, -1));
ShowWindow(m_nickDlg->GetHwnd(), SW_SHOW);
SetActiveWindow(m_nickDlg->GetHwnd());
@@ -790,12 +789,12 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam) nickItems[23].bDisabled = ulAdr == 0 ? TRUE : FALSE; // DCC submenu
auto *wi = GetChannelInfo(gcmi->pszID);
- BOOL bServOwner = strchr(sUserModes.c_str(), 'q') == nullptr ? FALSE : TRUE;
- BOOL bServAdmin = strchr(sUserModes.c_str(), 'a') == nullptr ? FALSE : TRUE;
+ BOOL bServOwner = strchr(sUserModes, 'q') == nullptr ? FALSE : TRUE;
+ BOOL bServAdmin = strchr(sUserModes, 'a') == nullptr ? FALSE : TRUE;
BOOL bOwner = bServOwner ? ((wi->OwnMode >> 4) & 01) : FALSE;
BOOL bAdmin = bServAdmin ? ((wi->OwnMode >> 3) & 01) : FALSE;
- BOOL bOp = strchr(sUserModes.c_str(), 'o') == nullptr ? FALSE : ((wi->OwnMode >> 2) & 01);
- BOOL bHalfop = strchr(sUserModes.c_str(), 'h') == nullptr ? FALSE : ((wi->OwnMode >> 1) & 01);
+ BOOL bOp = strchr(sUserModes, 'o') == nullptr ? FALSE : ((wi->OwnMode >> 2) & 01);
+ BOOL bHalfop = strchr(sUserModes, 'h') == nullptr ? FALSE : ((wi->OwnMode >> 1) & 01);
BOOL bForceEnable = GetAsyncKeyState(VK_CONTROL);
@@ -998,7 +997,7 @@ INT_PTR __cdecl CIrcProto::GetMyAwayMsg(WPARAM wParam, LPARAM lParam) if ((int)wParam != m_iStatus)
return 0;
- const wchar_t* p = m_statusMessage.c_str();
+ const wchar_t* p = m_statusMessage;
return (lParam & SGMA_UNICODE) ? (INT_PTR)mir_wstrdup(p) : (INT_PTR)mir_u2a(p);
}
|