Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Excessive c_str() removed

Browse Source
This commit is contained in:
Simon Rozman 2016-10-17 16:37:27 +02:00
parent 68c2c05b41
commit 7557bf784a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EventMonitor/ETWLog.cpp
View File

@ -228,7 +228,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session.")); wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."));
return; return;
} else if (ulResult == ERROR_ALREADY_EXISTS) { } else if (ulResult == ERROR_ALREADY_EXISTS) {
wxLogDebug(_("The %s event session already exists."), name.c_str()); wxLogDebug(_("The %s event session already exists."), name);
// Do not despair... Retry with a new session name and ID. // Do not despair... Retry with a new session name and ID.
continue; continue;
} else { } else {
@ -703,7 +703,7 @@ void wxPersistentETWListCtrl::Save() const
col.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH); col.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH);
for (int i = 0, n = wnd->GetColumnCount(); i < n; i++) { for (int i = 0, n = wnd->GetColumnCount(); i < n; i++) {
wnd->GetColumn(i, col); wnd->GetColumn(i, col);
SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), col.GetWidth()); SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), col.GetWidth());
} }
SaveValue(wxT("ScrollAuto"), wnd->m_scroll_auto); SaveValue(wxT("ScrollAuto"), wnd->m_scroll_auto);
@ -728,7 +728,7 @@ bool wxPersistentETWListCtrl::Restore()
wnd->GetColumn(i, col); wnd->GetColumn(i, col);
int width; int width;
if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), &width)) if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), &width))
wnd->SetColumnWidth(i, width); wnd->SetColumnWidth(i, width);
} }

2
lib/TLS_UI/src/TLS_UI.cpp
View File

@ -261,7 +261,7 @@ void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event)
for (PCCERT_CONTEXT cert = NULL; (cert = CertEnumCertificatesInStore(cs, cert)) != NULL;) for (PCCERT_CONTEXT cert = NULL; (cert = CertEnumCertificatesInStore(cs, cert)) != NULL;)
AddRootCA(cert); AddRootCA(cert);
} else } else
wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i].c_str()), _("Error"), wxOK | wxICON_EXCLAMATION, this); wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i]), _("Error"), wxOK | wxICON_EXCLAMATION, this);
} }
} }

2
lib/wxExtend

@ -1 +1 @@
Subproject commit dee95d7d6c246fe521e2cd5c1f76937484f3717c Subproject commit c22865524dde5417b23d7f24763e591d99d357bb