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

24
src/gtk/clipbrd.cpp
View File

@@ -156,7 +156,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
wxDataFormat clip(gtk_selection_data_get_selection(selection_data));
wxLogTrace( TRACE_CLIPBOARD,
wxT("Received available formats for clipboard %s"),
clip.GetId().c_str() );
clip.GetId() );
// the atoms we received, holding a list of targets (= formats)
const GdkAtom* const atoms = reinterpret_cast<const GdkAtom*>(gtk_selection_data_get_data(selection_data));
@@ -164,7 +164,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
{
const wxDataFormat format(atoms[i]);
wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId().c_str());
wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId());
if ( clipboard->GTKOnTargetReceived(format) )
return;
@@ -292,10 +292,10 @@ selection_handler( GtkWidget *WXUNUSED(widget),
wxLogTrace(TRACE_CLIPBOARD,
wxT("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"),
format.GetId().c_str(),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_target(selection_data)))).c_str(),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_data_type(selection_data)))).c_str(),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_selection(selection_data)))).c_str(),
format.GetId(),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_target(selection_data)))),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_data_type(selection_data)))),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_selection(selection_data)))),
timestamp
);
@@ -343,7 +343,7 @@ void wxClipboard::GTKOnSelectionReceived(const GtkSelectionData& sel)
const wxDataFormat format(gtk_selection_data_get_target(const_cast<GtkSelectionData*>(&sel)));
wxLogTrace(TRACE_CLIPBOARD, wxT("Received selection %s"),
format.GetId().c_str());
format.GetId());
if ( !m_receivedData->IsSupportedFormat(format, wxDataObject::Set) )
return;
@@ -405,7 +405,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
wxDataFormat clip(gtk_selection_data_get_selection(selection_data));
wxLogTrace( TRACE_CLIPBOARD,
wxT("Received available formats for clipboard %s"),
clip.GetId().c_str() );
clip.GetId() );
// the atoms we received, holding a list of targets (= formats)
const GdkAtom* const atoms = reinterpret_cast<const GdkAtom*>(gtk_selection_data_get_data(selection_data));
@@ -413,7 +413,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
{
const wxDataFormat format(atoms[i]);
wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId().c_str());
wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId());
event->AddFormat( format );
}
@@ -551,7 +551,7 @@ bool wxClipboard::DoIsSupported(const wxDataFormat& format)
wxCHECK_MSG( format, false, wxT("invalid clipboard format") );
wxLogTrace(TRACE_CLIPBOARD, wxT("Checking if format %s is available"),
format.GetId().c_str());
format.GetId());
// these variables will be used by our GTKOnTargetReceived()
m_targetRequested = format;
@@ -655,7 +655,7 @@ bool wxClipboard::AddData( wxDataObject *data )
const wxDataFormat format(formats[i]);
wxLogTrace(TRACE_CLIPBOARD, wxT("Adding support for %s"),
format.GetId().c_str());
format.GetId());
AddSupportedTarget(format);
}
@@ -719,7 +719,7 @@ bool wxClipboard::GetData( wxDataObject& data )
continue;
wxLogTrace(TRACE_CLIPBOARD, wxT("Requesting format %s"),
format.GetId().c_str());
format.GetId());
// these variables will be used by our GTKOnSelectionReceived()
m_receivedData = &data;