Avoid some -Wcast-qual warnings
This commit is contained in:
@@ -1996,7 +1996,7 @@ void DnDShapeDataObject::CreateMetaFile() const
|
||||
|
||||
wxMetafile *mf = dcMF.Close();
|
||||
|
||||
DnDShapeDataObject *self = (DnDShapeDataObject *)this; // const_cast
|
||||
DnDShapeDataObject* self = const_cast<DnDShapeDataObject*>(this);
|
||||
self->m_dobjMetaFile.SetMetafile(*mf);
|
||||
self->m_hasMetaFile = true;
|
||||
|
||||
|
@@ -1277,7 +1277,7 @@ void wxD2DMatrixData::TransformDistance(wxDouble* dx, wxDouble* dy) const
|
||||
|
||||
void* wxD2DMatrixData::GetNativeMatrix() const
|
||||
{
|
||||
return (void*)&m_matrix;
|
||||
return const_cast<void*>(static_cast<const void*>(&m_matrix));
|
||||
}
|
||||
|
||||
D2D1::Matrix3x2F wxD2DMatrixData::GetMatrix3x2F() const
|
||||
|
@@ -331,7 +331,7 @@ TEST_CASE("wxTextInputStream::GetChar", "[text][input][stream][char]")
|
||||
wxMemoryInputStream mis(buf, sizeof(buf));
|
||||
wxTextInputStream tis(mis);
|
||||
|
||||
wxCharTypeBuffer<wxChar> e = wxString::FromUTF8((char*)buf, sizeof(buf))
|
||||
wxCharTypeBuffer<wxChar> e = wxString::FromUTF8((const char*)buf, sizeof(buf))
|
||||
.tchar_str<wxChar>();
|
||||
for ( size_t i = 0; i < e.length(); ++i )
|
||||
{
|
||||
@@ -351,7 +351,7 @@ TEST_CASE("wxTextInputStream::GetChar", "[text][input][stream][char]")
|
||||
wxMemoryInputStream mis(buf, sizeof(buf));
|
||||
wxTextInputStream tis(mis);
|
||||
|
||||
wxCharTypeBuffer<wxChar> e = wxString((char*)buf, wxCSConv(wxFONTENCODING_ISO8859_1),
|
||||
wxCharTypeBuffer<wxChar> e = wxString((const char*)buf, wxCSConv(wxFONTENCODING_ISO8859_1),
|
||||
sizeof(buf)).tchar_str<wxChar>();
|
||||
for ( size_t i = 0; i < e.length(); ++i )
|
||||
{
|
||||
|
Reference in New Issue
Block a user