haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warning the old fashioned way. (Remove the code.)

This commit is contained in:
Jeff Young 2020-12-21 18:06:03 +00:00
parent 6848b1055e
commit b255feb94f
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/property.h
View File

@ -168,14 +168,15 @@ public:
class PROPERTY_BASE class PROPERTY_BASE
{ {
private:
///> Used to generate unique IDs. Must come up front so it's initialized before ctor.
public: public:
PROPERTY_BASE( const wxString& aName, PROPERTY_DISPLAY aDisplay = DEFAULT ) : PROPERTY_BASE( const wxString& aName, PROPERTY_DISPLAY aDisplay = DEFAULT ) :
m_id( nextId ),
m_name( aName ), m_name( aName ),
m_display( aDisplay ), m_display( aDisplay ),
m_availFunc( [](INSPECTABLE*)->bool { return true; } ) m_availFunc( [](INSPECTABLE*)->bool { return true; } )
{ {
++nextId;
} }
virtual ~PROPERTY_BASE() virtual ~PROPERTY_BASE()
@ -245,14 +246,6 @@ public:
*/ */
virtual size_t TypeHash() const = 0; virtual size_t TypeHash() const = 0;
/**
* Returns unique ID of the property.
*/
size_t Id() const
{
return m_id;
}
virtual bool IsReadOnly() const = 0; virtual bool IsReadOnly() const = 0;
PROPERTY_DISPLAY GetDisplay() const PROPERTY_DISPLAY GetDisplay() const
@ -283,15 +276,10 @@ protected:
virtual wxAny getter( void* aObject ) const = 0; virtual wxAny getter( void* aObject ) const = 0;
private: private:
const size_t m_id; const wxString m_name;
const wxString m_name; const PROPERTY_DISPLAY m_display;
const PROPERTY_DISPLAY m_display;
///> Condition that determines whether the property is available std::function<bool(INSPECTABLE*)> m_availFunc; ///> Eval to determine if prop is available
std::function<bool(INSPECTABLE*)> m_availFunc;
///> Used to generate unique IDs
size_t nextId = 0;
friend class INSPECTABLE; friend class INSPECTABLE;
}; };