Commit c96c6502 authored by Ben Boeckel's avatar Ben Boeckel

shiboken: use SMTK_OVERRIDE to hide `override` from shiboken

Shiboken does not recognize the `override` keyword; use `SMTK_OVERRIDE`
to hide it.
parent d68f0ab0
......@@ -29,4 +29,12 @@
typedef superclass Superclass;\
const char* classname() const override { return #thisclass; }
// Shiboken does not parse the `override` keyword properly. Hide usage of
// `override` from Shiboken.
#ifndef SHIBOKEN_SKIP
#define SMTK_OVERRIDE override
#else
#define SMTK_OVERRIDE
#endif
#endif //__smtk_SystemConfig_h
......@@ -30,8 +30,8 @@ namespace smtk
friend class DirectoryItemDefinition;
public:
smtkTypeMacro(DirectoryItem);
~DirectoryItem() override;
Item::Type type() const override;
~DirectoryItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
protected:
DirectoryItem(Attribute *owningAttribute, int itemPosition);
......
......@@ -31,18 +31,18 @@ namespace smtk
static smtk::attribute::DirectoryItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::DirectoryItemDefinitionPtr(new DirectoryItemDefinition(myName));}
~DirectoryItemDefinition() override;
~DirectoryItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
DirectoryItemDefinition(const std::string &myName);
......
......@@ -29,14 +29,14 @@ namespace smtk
friend class DoubleItemDefinition;
public:
smtkTypeMacro(DoubleItem);
~DoubleItem() override;
Item::Type type() const override;
~DoubleItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
// Assigns this item to be equivalent to another. Options are processed by derived item classes
// Returns true if success and false if a problem occured. By default, an attribute being used by this
// to represent an expression will be copied if needed. Use IGNORE_EXPRESSIONS option to prevent this
// When an expression attribute is copied, its model associations are by default not.
// Use COPY_MODEL_ASSOCIATIONS if you want them copied as well.These options are defined in Item.h .
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
protected:
DoubleItem(Attribute *owningAttribute, int itemPosition);
DoubleItem(Item *owningItem, int myPosition, int mySubGroupPosition);
......
......@@ -28,16 +28,16 @@ namespace smtk
static smtk::attribute::DoubleItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::DoubleItemDefinitionPtr(new DoubleItemDefinition(myName));}
~DoubleItemDefinition() override;
Item::Type type() const override;
~DoubleItemDefinition() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
DoubleItemDefinition(const std::string &myName);
......
......@@ -30,9 +30,9 @@ namespace smtk
friend class FileItemDefinition;
public:
smtkTypeMacro(FileItem);
~FileItem() override;
~FileItem() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
const std::vector<std::string>& recentValues() const
{ return this->m_recentValues; }
......@@ -41,7 +41,7 @@ namespace smtk
protected:
FileItem(Attribute *owningAttribute, int itemPosition);
FileItem(Item *owningItem, int position, int subGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) SMTK_OVERRIDE;
std::vector<std::string> m_recentValues;
......
......@@ -32,15 +32,15 @@ namespace smtk
static smtk::attribute::FileItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::FileItemDefinitionPtr(new FileItemDefinition(myName));}
~FileItemDefinition() override;
~FileItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
const std::string& getFileFilters() const
{return this->m_fileFilters;}
......@@ -48,7 +48,7 @@ namespace smtk
{this->m_fileFilters = filters;}
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
FileItemDefinition(const std::string &myName);
......
......@@ -32,9 +32,9 @@ namespace smtk
typedef std::vector<std::string>::const_iterator const_iterator;
smtkTypeMacro(FileSystemItem);
~FileSystemItem() override;
Item::Type type() const override = 0;
bool isValid() const override;
~FileSystemItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE = 0;
bool isValid() const SMTK_OVERRIDE;
bool shouldBeRelative() const;
bool shouldExist() const;
std::size_t numberOfValues() const
......@@ -50,7 +50,7 @@ namespace smtk
bool setValue(std::size_t element, const std::string &val);
bool appendValue(const std::string &val);
bool removeValue(int element);
void reset() override;
void reset() SMTK_OVERRIDE;
virtual bool setToDefault(std::size_t elementIndex=0);
// Returns true if there is a default defined and the item is curently set to it
virtual bool isUsingDefault(std::size_t elementIndex) const;
......@@ -75,12 +75,12 @@ namespace smtk
// Assigns this item to be equivalent to another. Options are processed by derived item classes
// Returns true if success and false if a problem occured. Does not use options.
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
protected:
FileSystemItem(Attribute *owningAttribute, int itemPosition);
FileSystemItem(Item *owningItem, int position, int subGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) SMTK_OVERRIDE;
std::vector<std::string>m_values;
std::vector<bool> m_isSet;
private:
......
......@@ -30,9 +30,9 @@ namespace smtk
public:
smtkTypeMacro(FileSystemItemDefinition);
~FileSystemItemDefinition() override;
~FileSystemItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
bool isValueValid(const std::string &val) const;
// Returns or Sets the def's extensiblity property. If true then items from this def
......@@ -80,15 +80,15 @@ namespace smtk
bool hasDefault() const
{return m_hasDefault;}
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override = 0;
int itemPosition) const SMTK_OVERRIDE = 0;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override = 0;
int subGroupPosition) const SMTK_OVERRIDE = 0;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override = 0;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE = 0;
protected:
FileSystemItemDefinition(const std::string &myName);
bool m_shouldExist;
......
......@@ -29,9 +29,9 @@ namespace smtk
typedef std::vector<std::vector<smtk::attribute::ItemPtr> >::const_iterator const_iterator;
smtkTypeMacro(GroupItem);
~GroupItem() override;
Item::Type type() const override;
bool isValid() const override;
~GroupItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
bool isValid() const SMTK_OVERRIDE;
std::size_t numberOfRequiredGroups() const;
std::size_t maxNumberOfGroups() const;
......@@ -62,7 +62,7 @@ namespace smtk
template<typename T>
typename T::ConstPtr findAs(const std::string& name) const;
void reset() override;
void reset() SMTK_OVERRIDE;
// Iterator-style access to values:
const_iterator begin() const;
......@@ -71,11 +71,11 @@ namespace smtk
// Assigns this item to be equivalent to another. Options are processed by derived item classes
// Returns true if success and false if a problem occured - options are use when copying sub-items.
// See Items.h for a description of these options.
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
protected:
GroupItem(Attribute *owningAttribute, int itemPosition);
GroupItem(Item *owningItem, int myPosition, int mySubGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def) SMTK_OVERRIDE;
// This method will detach all of the items directly owned by
// this group
void detachAllItems();
......
......@@ -32,8 +32,8 @@ namespace smtk
static smtk::attribute::GroupItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::GroupItemDefinitionPtr(new GroupItemDefinition(myName));}
~GroupItemDefinition() override;
Item::Type type() const override;
~GroupItemDefinition() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
std::size_t numberOfItemDefinitions() const
{return this->m_itemDefs.size();}
smtk::attribute::ItemDefinitionPtr itemDefinition(int ith) const
......@@ -96,19 +96,19 @@ namespace smtk
std::string subGroupLabel(std::size_t element) const;
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
void buildGroup(smtk::attribute::GroupItem *group, int subGroupPosition) const;
void addCategory(const std::string &category) override;
void removeCategory(const std::string &category) override;
void addCategory(const std::string &category) SMTK_OVERRIDE;
void removeCategory(const std::string &category) SMTK_OVERRIDE;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
GroupItemDefinition(const std::string &myname);
void updateCategories() override;
void updateCategories() SMTK_OVERRIDE;
std::vector<smtk::attribute::ItemDefinitionPtr> m_itemDefs;
std::map<std::string, int> m_itemDefPositions;
std::vector<std::string> m_labels;
......
......@@ -29,14 +29,14 @@ namespace smtk
friend class IntItemDefinition;
public:
smtkTypeMacro(IntItem);
~IntItem() override;
Item::Type type() const override;
~IntItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
// Assigns this item to be equivalent to another. Options are processed by derived item classes
// Returns true if success and false if a problem occured. By default, an attribute being used by this
// to represent an expression will be copied if needed. Use IGNORE_EXPRESSIONS option to prevent this
// When an expression attribute is copied, its model associations are by default not.
// Use COPY_MODEL_ASSOCIATIONS if you want them copied as well.These options are defined in Item.h .
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
protected:
IntItem(Attribute *owningAttribute, int itemPosition);
IntItem(Item *owningItem, int myPosition, int mySubGroupPosition);
......
......@@ -28,16 +28,16 @@ namespace smtk
static smtk::attribute::IntItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::IntItemDefinitionPtr(new IntItemDefinition(myName));}
~IntItemDefinition() override;
Item::Type type() const override;
~IntItemDefinition() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
IntItemDefinition(const std::string &myName);
......
......@@ -32,9 +32,9 @@ public:
typedef smtk::mesh::MeshList::iterator mesh_it;
smtkTypeMacro(MeshItem);
~MeshItem() override;
Item::Type type() const override;
bool isValid() const override;
~MeshItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
bool isValid() const SMTK_OVERRIDE;
std::size_t numberOfRequiredValues() const;
bool isExtensible() const;
......@@ -54,10 +54,10 @@ public:
std::size_t numberOfValues() const;
bool setNumberOfValues(std::size_t newSize);
const smtk::mesh::MeshList& values() const;
void reset() override;
void reset() SMTK_OVERRIDE;
// Assigns this item to be equivalent to another. Options are processed by derived item classes
// Returns true if success and false if a problem occured.
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
const_mesh_it begin() const;
const_mesh_it end() const;
......@@ -68,7 +68,7 @@ protected:
MeshItem(Attribute *owningAttribute, int itemPosition);
MeshItem(Item *owningItem, int position, int subGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) SMTK_OVERRIDE;
smtk::mesh::MeshList m_meshValues;
};
......
......@@ -33,9 +33,9 @@ namespace smtk
static smtk::attribute::MeshItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::MeshItemDefinitionPtr(new MeshItemDefinition(myName));}
~MeshItemDefinition() override;
~MeshItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
std::size_t numberOfRequiredValues() const;
void setNumberOfRequiredValues(std::size_t esize);
std::size_t maxNumberOfValues() const { return this->m_maxNumberOfValues; }
......@@ -46,13 +46,13 @@ namespace smtk
void setIsExtensible(bool extensible) { this->m_isExtensible = extensible; }
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
MeshItemDefinition(const std::string &myName);
......
......@@ -41,9 +41,9 @@ public:
typedef std::map<smtk::common::UUID, std::set<int> >::const_iterator const_sel_map_it;
smtkTypeMacro(MeshSelectionItem);
~MeshSelectionItem() override;
Item::Type type() const override;
bool isValid() const override;
~MeshSelectionItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
bool isValid() const SMTK_OVERRIDE;
void setValues(const smtk::common::UUID&, const std::set<int>&);
void unionValues(const smtk::common::UUID&, const std::set<int>&);
......@@ -59,10 +59,10 @@ public:
std::size_t numberOfValues() const;
const std::set<int>& values(const smtk::common::UUID&);
void reset() override;
void reset() SMTK_OVERRIDE;
// Assigns this item to be equivalent to another. Options are currently not used.
// Returns true if success and false if a problem occured
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
const_sel_map_it begin() const;
const_sel_map_it end() const;
......@@ -77,7 +77,7 @@ protected:
MeshSelectionItem(Attribute *owningAttribute, int itemPosition);
MeshSelectionItem(Item *owningItem, int position, int subGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr vdef) SMTK_OVERRIDE;
std::map<smtk::common::UUID, std::set<int> >m_selectionValues;
MeshModifyMode m_modifyMode;
bool m_isCtrlKeyDown;
......
......@@ -33,9 +33,9 @@ namespace smtk
static smtk::attribute::MeshSelectionItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::MeshSelectionItemDefinitionPtr(new MeshSelectionItemDefinition(myName));}
~MeshSelectionItemDefinition() override;
~MeshSelectionItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
smtk::model::BitFlags membershipMask() const;
void setMembershipMask(smtk::model::BitFlags entMask);
std::string refModelEntityName() const
......@@ -50,13 +50,13 @@ namespace smtk
bool isValueValid(const int &val) const;
smtk::attribute::ItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const override;
int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const override;
int subGroupPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
MeshSelectionItemDefinition(const std::string &myName);
......
......@@ -45,9 +45,9 @@ public:
typedef smtk::model::EntityRefArray::const_iterator const_iterator;
smtkTypeMacro(ModelEntityItem);
~ModelEntityItem() override;
Item::Type type() const override;
bool isValid() const override;
~ModelEntityItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
bool isValid() const SMTK_OVERRIDE;
std::size_t numberOfValues() const;
bool setNumberOfValues(std::size_t newSize);
......@@ -62,7 +62,7 @@ public:
bool appendValue(const smtk::model::EntityRef& val);
bool removeValue(std::size_t element);
void reset() override;
void reset() SMTK_OVERRIDE;
virtual std::string valueAsString() const;
virtual std::string valueAsString(std::size_t element) const;
virtual bool isSet(std::size_t element = 0) const;
......@@ -70,7 +70,7 @@ public:
// Assigns this item to be equivalent to another. Options are processed by derived item classes
// Returns true if success and false if a problem occured. By default, the model enity is assigned.
// Use IGNORE_MODEL_ENTITIES option to prevent this (defined in Item.h).
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
bool isExtensible() const;
......@@ -89,7 +89,7 @@ protected:
ModelEntityItem(Attribute *owningAttribute, int itemPosition);
ModelEntityItem(Item *owningItem, int myPosition, int mySubGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def) SMTK_OVERRIDE;
smtk::model::EntityRefArray m_values;
......
......@@ -30,9 +30,9 @@ public:
static smtk::attribute::ModelEntityItemDefinitionPtr New(const std::string& sname)
{ return smtk::attribute::ModelEntityItemDefinitionPtr(new ModelEntityItemDefinition(sname));}
~ModelEntityItemDefinition() override;
~ModelEntityItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
smtk::model::BitFlags membershipMask() const;
void setMembershipMask(smtk::model::BitFlags entMask);
......@@ -40,9 +40,9 @@ public:
bool isValueValid(const smtk::model::EntityRef& entity) const;
smtk::attribute::ItemPtr buildItem(
Attribute* owningAttribute, int itemPosition) const override;
Attribute* owningAttribute, int itemPosition) const SMTK_OVERRIDE;
smtk::attribute::ItemPtr buildItem(
Item* owningItem, int position, int subGroupPosition) const override;
Item* owningItem, int position, int subGroupPosition) const SMTK_OVERRIDE;
std::size_t numberOfRequiredValues() const;
void setNumberOfRequiredValues(std::size_t esize);
......@@ -60,7 +60,7 @@ public:
bool usingCommonLabel() const;
smtk::attribute::ItemDefinitionPtr
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const override;
createCopy(smtk::attribute::ItemDefinition::CopyInfo& info) const SMTK_OVERRIDE;
protected:
ModelEntityItemDefinition(const std::string& myName);
......
......@@ -34,14 +34,14 @@ namespace smtk
typedef std::vector<attribute::WeakAttributePtr>::const_iterator const_iterator;
smtkTypeMacro(RefItem);
~RefItem() override;
Item::Type type() const override;
~RefItem() SMTK_OVERRIDE;
Item::Type type() const SMTK_OVERRIDE;
// A RefItem is valid if it is either no enabled or if all of
// its values are set and the attributes it references exist
// It does NOT check to see if the attribute(s) it refers to are
// valid - the reason for this is to avoid infinite loops if 2
// attributes contain items that reference each other.
bool isValid() const override;
bool isValid() const SMTK_OVERRIDE;
std::size_t numberOfValues() const
{return this->m_values.size();}
......@@ -54,7 +54,7 @@ namespace smtk
bool setValue(std::size_t element, smtk::attribute::AttributePtr val);
bool appendValue(smtk::attribute::AttributePtr val);
bool removeValue(std::size_t element);
void reset() override;
void reset() SMTK_OVERRIDE;
virtual std::string valueAsString(const std::string &format="") const
{return this->valueAsString(0, format);}
virtual std::string valueAsString(std::size_t element, const std::string &format="") const;
......@@ -73,12 +73,12 @@ namespace smtk
// item will also be copied if needed. Use IGNORE_ATTRIBUTE_REF_ITEMS option to prevent this.
// When the reference attribute is copied, its model associations are not copied by default.
// Use COPY_MODEL_ASSOCIATIONS if you want them copied as well These options are defined in Item.h .
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) override;
bool assign(smtk::attribute::ConstItemPtr &sourceItem, unsigned int options = 0) SMTK_OVERRIDE;
protected:
RefItem(Attribute *owningAttribute, int itemPosition);
RefItem(Item *owningItem, int myPosition, int mySubGroupPosition);
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def) override;
bool setDefinition(smtk::attribute::ConstItemDefinitionPtr def) SMTK_OVERRIDE;
void clearAllReferences();
std::vector<attribute::WeakAttributePtr>m_values;
private:
......
......@@ -32,9 +32,9 @@ namespace smtk
static smtk::attribute::RefItemDefinitionPtr New(const std::string &myName)
{ return smtk::attribute::RefItemDefinitionPtr(new RefItemDefinition(myName));}
~RefItemDefinition() override;
~RefItemDefinition() SMTK_OVERRIDE;
Item::Type type() const override;
Item::Type type() const SMTK_OVERRIDE;
smtk::attribute::DefinitionPtr attributeDefinition() const
{return this->m_definition.lock();}
......