Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary c_str() from wx var arg functions arguments

Browse Source 
Using c_str() for arguments to wxString::Printf(), Format() and
wxLogXXX() is useless since wx 2.9 days, so simply remove them.

No real changes, this is just a (long due) cleanup.
This commit is contained in:
Vadim Zeitlin
2021-07-04 14:28:55 +01:00
parent 723265f9ef
commit f31a745909
50 changed files with 237 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/debugrpt.cpp
View File

@@ -207,7 +207,7 @@ wxDebugReport::wxDebugReport()
// permissions
if ( !wxMkdir(m_dir, 0700) )
{
wxLogSysError(_("Failed to create directory \"%s\""), m_dir.c_str());
wxLogSysError(_("Failed to create directory \"%s\""), m_dir);
wxLogError(_("Debug report couldn't be created."));
Reset();
@@ -226,7 +226,7 @@ wxDebugReport::~wxDebugReport()
if ( wxRemove(wxFileName(m_dir, file).GetFullPath()) != 0 )
{
wxLogSysError(_("Failed to remove debug report file \"%s\""),
file.c_str());
file);
m_dir.clear();
break;
}
@@ -238,7 +238,7 @@ wxDebugReport::~wxDebugReport()
if ( wxRmDir(m_dir) != 0 )
{
wxLogSysError(_("Failed to clean up debug report directory \"%s\""),
m_dir.c_str());
m_dir);
}
}
}
@@ -559,7 +559,7 @@ bool wxDebugReport::Process()
if ( !DoProcess() )
{
wxLogError(_("Processing debug report has failed, leaving the files in \"%s\" directory."),
GetDirectory().c_str());
GetDirectory());
Reset();
@@ -586,7 +586,7 @@ bool wxDebugReport::DoProcess()
msg += _("\nPlease send this report to the program maintainer, thank you!\n");
wxLogMessage(wxT("%s"), msg.c_str());
wxLogMessage(wxT("%s"), msg);
// we have to do this or the report would be deleted, and we don't even
// have any way to ask the user if he wants to keep it from here
@@ -718,10 +718,10 @@ bool wxDebugReportUpload::DoProcess()
int rc = wxExecute(wxString::Format
(
wxT("%s -F \"%s=@%s\" %s"),
m_curlCmd.c_str(),
m_inputField.c_str(),
GetCompressedFileName().c_str(),
m_uploadURL.c_str()
m_curlCmd,
m_inputField,
GetCompressedFileName(),
m_uploadURL
),
output,
errors);
@@ -736,7 +736,7 @@ bool wxDebugReportUpload::DoProcess()
{
for ( size_t n = 0; n < count; n++ )
{
wxLogWarning(wxT("%s"), errors[n].c_str());
wxLogWarning(wxT("%s"), errors[n]);
}
}