solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Use default ctor's and dtor's instead of those with empty bodies

Browse source
This commit is contained in:
Artur Wieczorek 2022-12-03 17:00:14 +02:00
parent 6d4eadefe6
commit 2cc7f7d8d7
17 changed files with 44 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/wx/propgrid/advprops.h
View file

@ -138,7 +138,7 @@ public:
wxFontProperty(const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxFont& value = wxFont());
virtual ~wxFontProperty();
virtual ~wxFontProperty() = default;
virtual void OnSetValue() override;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
virtual wxVariant ChildChanged( wxVariant& thisValue,
@ -168,7 +168,7 @@ public:
const wxString& name = wxPG_LABEL,
const wxColourPropertyValue&
value = wxColourPropertyValue() );
virtual ~wxSystemColourProperty();
virtual ~wxSystemColourProperty() = default;
virtual void OnSetValue() override;
virtual bool IntToValue(wxVariant& variant,

16
include/wx/propgrid/editors.h
View file

@ -204,7 +204,7 @@ class WXDLLIMPEXP_PROPGRID wxPGTextCtrlEditor : public wxPGEditor
{
wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor);
public:
wxPGTextCtrlEditor() {}
wxPGTextCtrlEditor() = default;
virtual ~wxPGTextCtrlEditor();
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
@ -247,7 +247,7 @@ class WXDLLIMPEXP_PROPGRID wxPGChoiceEditor : public wxPGEditor
{
wxDECLARE_DYNAMIC_CLASS(wxPGChoiceEditor);
public:
wxPGChoiceEditor() {}
wxPGChoiceEditor() = default;
virtual ~wxPGChoiceEditor();
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
@ -296,7 +296,7 @@ class WXDLLIMPEXP_PROPGRID wxPGComboBoxEditor : public wxPGChoiceEditor
{
wxDECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor);
public:
wxPGComboBoxEditor() {}
wxPGComboBoxEditor() = default;
virtual ~wxPGComboBoxEditor();
virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
@ -323,7 +323,7 @@ public:
class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
{
public:
wxPGChoiceAndButtonEditor() {}
wxPGChoiceAndButtonEditor() = default;
virtual ~wxPGChoiceAndButtonEditor();
virtual wxString GetName() const override;
@ -339,7 +339,7 @@ class WXDLLIMPEXP_PROPGRID
wxPGTextCtrlAndButtonEditor : public wxPGTextCtrlEditor
{
public:
wxPGTextCtrlAndButtonEditor() {}
wxPGTextCtrlAndButtonEditor() = default;
virtual ~wxPGTextCtrlAndButtonEditor();
virtual wxString GetName() const override;
@ -362,7 +362,7 @@ class WXDLLIMPEXP_PROPGRID wxPGCheckBoxEditor : public wxPGEditor
{
wxDECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor);
public:
wxPGCheckBoxEditor() {}
wxPGCheckBoxEditor() = default;
virtual ~wxPGCheckBoxEditor();
virtual wxString GetName() const override;
@ -423,7 +423,7 @@ public:
{
}
virtual ~wxPGEditorDialogAdapter() { }
virtual ~wxPGEditorDialogAdapter() = default;
bool ShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property );
@ -458,7 +458,7 @@ class WXDLLIMPEXP_PROPGRID wxPGMultiButton : public wxWindow
{
public:
wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz );
virtual ~wxPGMultiButton() {}
virtual ~wxPGMultiButton() = default;
wxWindow* GetButton( unsigned int i ) { return m_buttons[i]; }
const wxWindow* GetButton( unsigned int i ) const

13
include/wx/propgrid/property.h
View file

@ -60,9 +60,8 @@ class WXDLLIMPEXP_PROPGRID wxPGCellRenderer : public wxObjectRefData
{
public:
wxPGCellRenderer()
: wxObjectRefData() { }
virtual ~wxPGCellRenderer() { }
wxPGCellRenderer() = default;
virtual ~wxPGCellRenderer() = default;
// Render flags
enum
@ -188,7 +187,7 @@ public:
void SetFont( const wxFont& font ) { m_font = font; }
protected:
virtual ~wxPGCellData() { }
virtual ~wxPGCellData() = default;
wxString m_text;
wxBitmapBundle m_bitmapBundle;
@ -205,7 +204,7 @@ protected:
class WXDLLIMPEXP_PROPGRID wxPGCell : public wxObject
{
public:
wxPGCell();
wxPGCell() = default;
wxPGCell(const wxPGCell& other)
: wxObject(other)
{
@ -216,7 +215,7 @@ public:
const wxColour& fgCol = wxNullColour,
const wxColour& bgCol = wxNullColour );
virtual ~wxPGCell() { }
virtual ~wxPGCell() = default;
wxPGCellData* GetData()
{
@ -650,7 +649,7 @@ public:
SetText(label);
}
virtual ~wxPGChoiceEntry() { }
virtual ~wxPGChoiceEntry() = default;
void SetValue( int value ) { m_value = value; }
int GetValue() const { return m_value; }

2
include/wx/propgrid/propgridiface.h
View file

@ -140,7 +140,7 @@ class WXDLLIMPEXP_PROPGRID wxPropertyGridInterface
public:
// Destructor.
virtual ~wxPropertyGridInterface() { }
virtual ~wxPropertyGridInterface() = default;
// Appends property to the list.
// wxPropertyGrid assumes ownership of the object.

4
include/wx/propgrid/propgridpagestate.h
View file

@ -277,10 +277,10 @@ class WXDLLIMPEXP_PROPGRID wxPGVIteratorBase : public wxObjectRefData
{
friend class wxPGVIterator;
public:
wxPGVIteratorBase() { }
wxPGVIteratorBase() = default;
virtual void Next() = 0;
protected:
virtual ~wxPGVIteratorBase() { }
virtual ~wxPGVIteratorBase() = default;
wxPropertyGridIterator m_it;
};

26
include/wx/propgrid/props.h
View file

@ -100,7 +100,7 @@ public:
wxStringProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxString& value = wxString() );
virtual ~wxStringProperty();
virtual ~wxStringProperty() = default;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
virtual bool StringToValue( wxVariant& variant,
@ -146,7 +146,7 @@ public:
};
wxNumericPropertyValidator( NumericType numericType, int base = 10 );
virtual ~wxNumericPropertyValidator() { }
virtual ~wxNumericPropertyValidator() = default;
virtual bool Validate(wxWindow* parent) override;
};
@ -190,7 +190,7 @@ public:
wxIntProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
long value = 0 );
virtual ~wxIntProperty();
virtual ~wxIntProperty() = default;
#if wxUSE_LONGLONG
wxIntProperty( const wxString& label,
@ -245,7 +245,7 @@ public:
wxUIntProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
unsigned long value = 0 );
virtual ~wxUIntProperty();
virtual ~wxUIntProperty() = default;
#if wxUSE_LONGLONG
wxUIntProperty( const wxString& label,
const wxString& name,
@ -300,7 +300,7 @@ public:
wxFloatProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
double value = 0.0 );
virtual ~wxFloatProperty();
virtual ~wxFloatProperty() = default;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
virtual bool StringToValue( wxVariant& variant,
@ -336,7 +336,7 @@ public:
wxBoolProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
bool value = false );
virtual ~wxBoolProperty();
virtual ~wxBoolProperty() = default;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
virtual bool StringToValue( wxVariant& variant,
@ -606,7 +606,7 @@ public:
wxFileProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxString& value = wxString() );
virtual ~wxFileProperty ();
virtual ~wxFileProperty() = default;
virtual void OnSetValue() override;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
@ -646,7 +646,7 @@ public:
wxLongStringProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxString& value = wxString() );
virtual ~wxLongStringProperty();
virtual ~wxLongStringProperty() = default;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
virtual bool StringToValue( wxVariant& variant,
@ -668,7 +668,7 @@ public:
wxDirProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxString& value = wxString() );
virtual ~wxDirProperty();
virtual ~wxDirProperty() = default;
virtual wxString ValueToString(wxVariant& value, int argFlags = 0) const override;
virtual bool StringToValue(wxVariant& variant, const wxString& text,
@ -700,7 +700,7 @@ public:
wxArrayStringProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxArrayString& value = wxArrayString() );
virtual ~wxArrayStringProperty();
virtual ~wxArrayStringProperty() = default;
virtual void OnSetValue() override;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;
@ -801,7 +801,7 @@ PROPNAME::PROPNAME( const wxString& label, \
m_delimiter = DELIMCHAR; \
m_customBtnText = CUSTBUTTXT; \
} \
PROPNAME::~PROPNAME() { }
PROPNAME::~PROPNAME() = default;
#define WX_PG_DECLARE_ARRAYSTRING_PROPERTY(PROPNAME) \
WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAME)
@ -833,7 +833,7 @@ class WXDLLIMPEXP_PROPGRID wxPGArrayEditorDialog : public wxDialog
{
public:
wxPGArrayEditorDialog();
virtual ~wxPGArrayEditorDialog() { }
virtual ~wxPGArrayEditorDialog() = default;
void Init();
@ -939,7 +939,7 @@ class WXDLLIMPEXP_PROPGRID
{
public:
wxPGArrayStringEditorDialog();
virtual ~wxPGArrayStringEditorDialog() { }
virtual ~wxPGArrayStringEditorDialog() = default;
void Init();

8
samples/propgrid/propgrid.cpp
View file

@ -80,8 +80,8 @@ class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor
{
wxDECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor);
public:
wxSampleMultiButtonEditor() {}
virtual ~wxSampleMultiButtonEditor() {}
wxSampleMultiButtonEditor() = default;
virtual ~wxSampleMultiButtonEditor() = default;
virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid,
wxPGProperty* property,
@ -219,8 +219,6 @@ wxVectorProperty::wxVectorProperty( const wxString& label,
AddPrivateChild( new wxFloatProperty("Z",wxPG_LABEL,value.z) );
}
wxVectorProperty::~wxVectorProperty() { }
void wxVectorProperty::RefreshChildren()
{
if ( !GetChildCount() ) return;
@ -270,8 +268,6 @@ wxTriangleProperty::wxTriangleProperty( const wxString& label,
AddPrivateChild( new wxVectorProperty("C",wxPG_LABEL,value.c) );
}
wxTriangleProperty::~wxTriangleProperty() { }
void wxTriangleProperty::RefreshChildren()
{
if ( !GetChildCount() ) return;

4
samples/propgrid/propgrid.h
View file

@ -73,7 +73,7 @@ public:
wxVectorProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxVector3f& value = wxVector3f() );
virtual ~wxVectorProperty();
virtual ~wxVectorProperty() = default;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
@ -106,7 +106,7 @@ public:
wxTriangleProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxTriangle& value = wxTriangle() );
virtual ~wxTriangleProperty();
virtual ~wxTriangleProperty() = default;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,

8
samples/propgrid/sampleprops.cpp
View file

@ -77,8 +77,6 @@ wxFontDataProperty::wxFontDataProperty( const wxString& label, const wxString& n
fontData.GetColour() ) );
}
wxFontDataProperty::~wxFontDataProperty () { }
void wxFontDataProperty::OnSetValue()
{
if ( !m_value.IsType("wxFontData") )
@ -203,8 +201,6 @@ wxSizeProperty::wxSizeProperty( const wxString& label, const wxString& name,
AddPrivateChild( new wxIntProperty("Height",wxPG_LABEL,value.y) );
}
wxSizeProperty::~wxSizeProperty() { }
void wxSizeProperty::RefreshChildren()
{
if ( !GetChildCount() ) return;
@ -243,8 +239,6 @@ wxPointProperty::wxPointProperty( const wxString& label, const wxString& name,
AddPrivateChild( new wxIntProperty("Y",wxPG_LABEL,value.y) );
}
wxPointProperty::~wxPointProperty() { }
void wxPointProperty::RefreshChildren()
{
if ( !GetChildCount() ) return;
@ -505,8 +499,6 @@ wxArrayDoubleProperty::wxArrayDoubleProperty (const wxString& label,
SetValue( WXVARIANT(array) );
}
wxArrayDoubleProperty::~wxArrayDoubleProperty () { }
void wxArrayDoubleProperty::OnSetValue()
{
// Generate cached display string, to optimize grid drawing

8
samples/propgrid/sampleprops.h
View file

@ -24,7 +24,7 @@ public:
wxFontDataProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxFontData& value = wxFontData() );
virtual ~wxFontDataProperty ();
virtual ~wxFontDataProperty() = default;
void OnSetValue() override;
@ -56,7 +56,7 @@ public:
wxSizeProperty( const wxString& label = wxPG_LABEL, const wxString& name = wxPG_LABEL,
const wxSize& value = wxSize() );
virtual ~wxSizeProperty();
virtual ~wxSizeProperty() = default;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
@ -81,7 +81,7 @@ public:
wxPointProperty( const wxString& label = wxPG_LABEL, const wxString& name = wxPG_LABEL,
const wxPoint& value = wxPoint() );
virtual ~wxPointProperty();
virtual ~wxPointProperty() = default;
virtual wxVariant ChildChanged( wxVariant& thisValue,
int childIndex,
@ -114,7 +114,7 @@ public:
const wxString& name = wxPG_LABEL,
const wxArrayDouble& value = wxArrayDouble() );
virtual ~wxArrayDoubleProperty ();
virtual ~wxArrayDoubleProperty() = default;
virtual void OnSetValue() override;
virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const override;

6
src/propgrid/advprops.cpp
View file

@ -602,8 +602,6 @@ wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
font.GetFamily()) );
}
wxFontProperty::~wxFontProperty() { }
void wxFontProperty::OnSetValue()
{
wxFont font;
@ -883,10 +881,6 @@ wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxS
Init( wxPG_COLOUR_CUSTOM, value );
}
wxSystemColourProperty::~wxSystemColourProperty() { }
wxColourPropertyValue wxSystemColourProperty::GetVal( const wxVariant* pVariant ) const
{
if ( !pVariant )

2
src/propgrid/editors.cpp
View file

@ -2175,7 +2175,7 @@ public:
#endif
}
virtual ~wxPGEditorBitmapButton() { }
virtual ~wxPGEditorBitmapButton() = default;
private:
#ifndef __WXGTK3__

2
src/propgrid/manager.cpp
View file

@ -2364,7 +2364,7 @@ public:
{
m_it.Init(manager->GetPage(0), flags);
}
virtual ~wxPGVIteratorBase_Manager() { }
virtual ~wxPGVIteratorBase_Manager() = default;
virtual void Next() override
{
m_it.Next();

5
src/propgrid/property.cpp
View file

@ -355,11 +355,6 @@ wxPGCellData::wxPGCellData()
// wxPGCell
// -----------------------------------------------------------------------
wxPGCell::wxPGCell()
: wxObject()
{
}
wxPGCell::wxPGCell( const wxString& text,
const wxBitmapBundle& bitmap,
const wxColour& fgCol,

2
src/propgrid/propgrid.cpp
View file

@ -144,7 +144,7 @@ class wxPGGlobalVarsClassManager : public wxModule
{
wxDECLARE_DYNAMIC_CLASS(wxPGGlobalVarsClassManager);
public:
wxPGGlobalVarsClassManager() {}
wxPGGlobalVarsClassManager() = default;
virtual bool OnInit() override { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; }
virtual void OnExit() override { wxDELETE(wxPGGlobalVars); }
};

2
src/propgrid/propgridiface.cpp
View file

@ -888,7 +888,7 @@ public:
{
m_it.Init( state, flags );
}
virtual ~wxPGVIteratorBase_State() { }
virtual ~wxPGVIteratorBase_State() = default;
virtual void Next() override { m_it.Next(); }
};

18
src/propgrid/props.cpp
View file

@ -64,8 +64,6 @@ void wxStringProperty::OnSetValue()
}
}
wxStringProperty::~wxStringProperty() { }
wxString wxStringProperty::ValueToString( wxVariant& value,
int argFlags ) const
{
@ -372,8 +370,6 @@ wxIntProperty::wxIntProperty( const wxString& label, const wxString& name,
}
#endif
wxIntProperty::~wxIntProperty() { }
wxString wxIntProperty::ValueToString( wxVariant& value,
int WXUNUSED(argFlags) ) const
{
@ -610,8 +606,6 @@ wxUIntProperty::wxUIntProperty( const wxString& label, const wxString& name,
}
#endif
wxUIntProperty::~wxUIntProperty() { }
wxString wxUIntProperty::ValueToString(wxVariant& value, int argFlags) const
{
static const wxStringCharType* const gs_uintTemplates32[wxPG_UINT_TEMPLATE_MAX] =
@ -882,8 +876,6 @@ wxFloatProperty::wxFloatProperty( const wxString& label,
SetValue(value);
}
wxFloatProperty::~wxFloatProperty() { }
#if WXWIN_COMPATIBILITY_3_0
// This helper method provides standard way for floating point-using
// properties to convert values to string.
@ -1089,8 +1081,6 @@ wxBoolProperty::wxBoolProperty( const wxString& label, const wxString& name, boo
m_flags |= wxPG_PROP_USE_DCC;
}
wxBoolProperty::~wxBoolProperty() { }
wxString wxBoolProperty::ValueToString( wxVariant& value,
int argFlags ) const
{
@ -1856,8 +1846,6 @@ wxDirProperty::wxDirProperty( const wxString& label, const wxString& name, const
SetValue(value);
}
wxDirProperty::~wxDirProperty() { }
wxString wxDirProperty::ValueToString(wxVariant& value, int WXUNUSED(argFlags)) const
{
return value;
@ -2000,8 +1988,6 @@ wxFileProperty::wxFileProperty( const wxString& label, const wxString& name,
SetValue(value);
}
wxFileProperty::~wxFileProperty() {}
wxValidator* wxFileProperty::GetClassValidator()
{
#if wxUSE_VALIDATORS
@ -2227,8 +2213,6 @@ wxLongStringProperty::wxLongStringProperty( const wxString& label, const wxStrin
SetValue(value);
}
wxLongStringProperty::~wxLongStringProperty() {}
wxString wxLongStringProperty::ValueToString( wxVariant& value,
int WXUNUSED(argFlags) ) const
{
@ -2675,8 +2659,6 @@ wxArrayStringProperty::wxArrayStringProperty( const wxString& label,
SetValue( array );
}
wxArrayStringProperty::~wxArrayStringProperty() { }
void wxArrayStringProperty::OnSetValue()
{
GenerateValueAsString();