Commit 2bf53897 authored by Robert Maynard's avatar Robert Maynard

Remove unneeded semicolons on closing namespaces.

parent 840c04c0
......@@ -54,7 +54,7 @@ namespace smtk
friend class smtk::attribute::AttributeRefItem;
public:
static smtk::AttributePtr New(const std::string &myName,
smtk::AttributeDefinitionPtr myDefinition,
smtk::AttributeDefinitionPtr myDefinition,
unsigned long myId)
{ return smtk::AttributePtr(new Attribute(myName, myDefinition, myId)); }
......@@ -188,8 +188,8 @@ namespace smtk
this->m_color[2]= b;
this->m_color[3]= a;
}
};
};
}
}
#endif /* __smtk_attribute_Attribute_h */
......@@ -47,8 +47,8 @@ namespace smtk
std::string m_errorMessages;
private:
};
};
};
}
}
#endif /* __smtk_attribute_AttributeReader_h */
......@@ -65,14 +65,14 @@ namespace smtk
virtual bool isSet(int element=0) const
{return this->m_values[element].lock().get() != NULL;}
virtual void unset(int element=0);
protected:
void clearAllReferences();
std::vector<WeakAttributePtr>m_values;
private:
};
};
};
}
}
#endif /* __smtk_attribute_AttributeRefItem_h */
......@@ -46,7 +46,7 @@ namespace smtk
{ return smtk::AttributeRefItemDefinitionPtr(new AttributeRefItemDefinition(myName));}
virtual ~AttributeRefItemDefinition();
virtual Item::Type type() const;
smtk::AttributeDefinitionPtr attributeDefinition() const
{return this->m_definition.lock();}
......@@ -58,7 +58,7 @@ namespace smtk
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
int numberOfRequiredValues() const
......@@ -81,9 +81,9 @@ namespace smtk
std::vector<std::string> m_valueLabels;
int m_numberOfRequiredValues;
private:
};
};
};
}
}
#endif /* __smtk_attribute_AttributeRefItemDefinition_h */
......@@ -65,8 +65,8 @@ namespace smtk
private:
};
};
};
}
}
#endif /* __AttributeSection_h */
......@@ -47,8 +47,8 @@ namespace smtk
std::string m_errorMessages;
private:
};
};
};
}
}
#endif /* __smtk_attribute_AttributeWriter_h */
......@@ -299,7 +299,7 @@ namespace smtk
this->m_defaultColor[2]= b;
this->m_defaultColor[3]= a;
}
};
};
}
}
#endif /* __smtk_attribute_Definition_h */
......@@ -67,14 +67,14 @@ namespace smtk
{return this->m_isSet[element];}
virtual void unset(int element=0)
{this->m_isSet[element] = false;}
protected:
std::vector<std::string>m_values;
std::vector<bool> m_isSet;
private:
};
};
};
}
}
#endif /* __smtk_attribute_DirectoryItem_h */
......@@ -45,13 +45,13 @@ namespace smtk
static smtk::DirectoryItemDefinitionPtr New(const std::string &myName)
{ return smtk::DirectoryItemDefinitionPtr(new DirectoryItemDefinition(myName));}
virtual ~DirectoryItemDefinition();
virtual Item::Type type() const;
bool isValueValid(const std::string &val) const;
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
int numberOfRequiredValues() const
......@@ -83,9 +83,9 @@ namespace smtk
std::vector<std::string> m_valueLabels;
int m_numberOfRequiredValues;
private:
};
};
};
}
}
#endif /* __smtk_attribute_DirectoryItemDefinition_h */
......@@ -39,18 +39,18 @@ namespace smtk
class SMTKCORE_EXPORT DoubleItem :
public ValueItemTemplate<double>
{
friend class DoubleItemDefinition;
friend class DoubleItemDefinition;
public:
DoubleItem(Attribute *owningAttribute, int itemPosition);
DoubleItem(Item *owningItem, int myPosition, int mySubGroupPosition);
virtual ~DoubleItem();
virtual Item::Type type() const;
protected:
private:
};
};
};
}
}
#endif /* __smtk_attribute_DoubleItem_h */
......@@ -43,7 +43,7 @@ namespace smtk
virtual Item::Type type() const;
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
......@@ -53,7 +53,7 @@ namespace smtk
private:
};
};
};
}
}
#endif /* __smtk_attribute_DoubleItemDefinition_h */
......@@ -67,14 +67,14 @@ namespace smtk
{return this->m_isSet[element];}
virtual void unset(int element=0)
{this->m_isSet[element] = false;}
protected:
std::vector<std::string>m_values;
std::vector<bool> m_isSet;
private:
};
};
};
}
}
#endif /* __smtk_attribute_FileItem_h */
......@@ -46,13 +46,13 @@ namespace smtk
{ return smtk::FileItemDefinitionPtr(new FileItemDefinition(myName));}
virtual ~FileItemDefinition();
virtual Item::Type type() const;
bool isValueValid(const std::string &val) const;
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
int numberOfRequiredValues() const
......@@ -88,11 +88,11 @@ namespace smtk
std::vector<std::string> m_valueLabels;
int m_numberOfRequiredValues;
std::string m_fileFilters;
private:
};
};
};
}
}
#endif /* __smtk_attribute_FileItemDefinition_h */
......@@ -66,15 +66,15 @@ namespace smtk
virtual void reset();
protected:
// This method will detach all of the items directly owned by
// This method will detach all of the items directly owned by
// this group
void detachAllItems();
std::vector<std::vector<smtk::AttributeItemPtr> >m_items;
private:
};
};
};
}
}
#endif /* __GroupItem_h */
......@@ -50,8 +50,8 @@ namespace smtk
{return this->m_itemDefs.size();}
smtk::AttributeItemDefinitionPtr itemDefinition(int ith) const
{
return (ith < 0) ? smtk::AttributeItemDefinitionPtr() :
(ith >= this->m_itemDefs.size() ?
return (ith < 0) ? smtk::AttributeItemDefinitionPtr() :
(ith >= this->m_itemDefs.size() ?
smtk::AttributeItemDefinitionPtr() : this->m_itemDefs[ith]);
}
bool addItemDefinition(smtk::AttributeItemDefinitionPtr cdef);
......@@ -60,7 +60,7 @@ namespace smtk
addItemDefinition(const std::string &name)
{
typedef smtk::internal::shared_ptr_type<T> SharedTypes;
typename SharedTypes::SharedPointerType
typename SharedTypes::SharedPointerType
item = SharedTypes::RawPointerType::New(name);
this->m_itemDefs.push_back(item);
return item;
......@@ -83,13 +83,13 @@ namespace smtk
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
void buildGroup(smtk::attribute::GroupItem *group, int subGroupPosition) const;
virtual void addCategory(const std::string &category);
virtual void removeCategory(const std::string &category);
protected:
GroupItemDefinition(const std::string &myname);
virtual void updateCategories();
......@@ -112,8 +112,8 @@ namespace smtk
}
return it->second;
}
};
};
}
}
#endif /* __smtk_attribute_GroupItemDefinition_h */
......@@ -49,7 +49,7 @@ namespace smtk
addSubsection(const std::string &name)
{
typedef smtk::internal::shared_ptr_type<T> SharedTypes;
typename SharedTypes::SharedPointerType
typename SharedTypes::SharedPointerType
section(new typename SharedTypes::RawPointerType(name));
this->m_subSections.push_back(section);
return section;
......@@ -58,9 +58,9 @@ namespace smtk
protected:
std::vector<smtk::SectionPtr> m_subSections;
private:
};
};
};
}
}
#endif /* __smtk_attribute_GroupSection_h */
......@@ -56,10 +56,10 @@ namespace smtk
protected:
std::vector<smtk::AttributePtr> m_instances;
private:
};
};
};
}
}
#endif /* __smtk_attribute_InstancedSection_h */
......@@ -39,18 +39,18 @@ namespace smtk
class SMTKCORE_EXPORT IntItem :
public ValueItemTemplate<int>
{
friend class IntItemDefinition;
friend class IntItemDefinition;
public:
IntItem(Attribute *owningAttribute, int itemPosition);
IntItem(Item *owningItem, int myPosition, int mySubGroupPosition);
virtual ~IntItem();
virtual Item::Type type() const;
protected:
private:
};
};
};
}
}
#endif /* __smtk_attribute_IntItem_h */
......@@ -44,7 +44,7 @@ namespace smtk
virtual Item::Type type() const;
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
......@@ -54,7 +54,7 @@ namespace smtk
private:
};
};
};
}
}
#endif /* __smtk_attribute_DoubleItemDefinition_h */
......@@ -139,7 +139,7 @@ namespace smtk
this->m_userData.find(key);
return ((it == this->m_userData.end()) ? smtk::UserDataPtr() : it->second);
}
};
};
}
}
#endif /* __smtk_attribute_Item_h */
......@@ -112,7 +112,7 @@ namespace smtk
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const = 0;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const = 0;
protected:
......@@ -127,9 +127,9 @@ namespace smtk
std::string m_detailedDescription;
std::string m_briefDescription;
private:
};
};
};
}
}
#endif /* __smtk_attribute_ItemDefinition_h */
......@@ -208,8 +208,8 @@ namespace smtk
this->m_analyses[analysisName] = categories;
return true;
}
};
};
}
}
#endif /* __smtk_attribute_Manager_h */
......@@ -49,7 +49,7 @@ namespace smtk
{return this->m_modelEntityMask;}
void setModelEntityMask(unsigned long mask)
{this->m_modelEntityMask = mask;}
// If this def is not null then the section should
// display all model entities of the requested mask along
// with the attribute of this type in a table view
......@@ -62,9 +62,9 @@ namespace smtk
unsigned long m_modelEntityMask;
smtk::AttributeDefinitionPtr m_attributeDefinition;
private:
};
};
};
}
}
#endif /* __smtk_attribute_ModelEntitySection_h */
......@@ -78,8 +78,8 @@ namespace smtk
this->m_invalidColor[3] = a;
}
//----------------------------------------------------------------------------
};
};
}
}
#endif /* __smtk_attribute_RootSection_h */
......@@ -86,7 +86,7 @@ namespace smtk
return ((it == this->m_userData.end()) ? smtk::UserDataPtr() : it->second);
}
};
};
}
}
#endif /* __smtk_attribute_Section_h */
......@@ -51,8 +51,8 @@ namespace smtk
smtk::AttributeDefinitionPtr m_definition;
private:
};
};
};
}
}
#endif /* __SimpleExpressionSection_h */
......@@ -39,18 +39,18 @@ namespace smtk
class SMTKCORE_EXPORT StringItem :
public ValueItemTemplate<std::string>
{
friend class StringItemDefinition;
friend class StringItemDefinition;
public:
StringItem(Attribute *owningAttribute, int itemPosition);
StringItem(Item *owningItem, int myPosition, int mySubGroupPosition);
virtual ~StringItem();
virtual Item::Type type() const;
protected:
private:
};
};
};
}
}
#endif /* __smtk_attribute_StringItem_h */
......@@ -44,7 +44,7 @@ namespace smtk
virtual Item::Type type() const;
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
bool isMultiline() const
......@@ -57,7 +57,7 @@ namespace smtk
private:
};
};
};
}
}
#endif /* __smtk_attribute_StringItemDefinition_h */
......@@ -94,7 +94,7 @@ namespace smtk
private:
};
};
};
}
}
#endif /* __smtk_attribute_ValueItem_h */
......@@ -45,7 +45,7 @@ namespace smtk
class Definition;
class Cluster;
class ValueItem;
class SMTKCORE_EXPORT ValueItemDefinition :
class SMTKCORE_EXPORT ValueItemDefinition :
public smtk::attribute::ItemDefinition
{
public:
......@@ -66,7 +66,7 @@ namespace smtk
int defaultDiscreteIndex() const
{return this->m_defaultDiscreteIndex;}
void setDefaultDiscreteIndex(int discreteIndex);
bool allowsExpressions() const;
bool isValidExpression(smtk::AttributePtr exp) const;
smtk::AttributeDefinitionPtr expressionDefinition() const;
......@@ -105,9 +105,9 @@ namespace smtk
std::string m_units;
smtk::AttributeRefItemDefinitionPtr m_expressionDefinition;
private:
};
};
};
}
}
#endif /* __smtk_attribute_ValueItemDefinition_h */
......@@ -43,7 +43,7 @@ namespace smtk
typedef DataT DataType;
virtual ~ValueItemDefinitionTemplate() {}
const DataT &defaultValue() const
{return this->m_defaultValue;}
void setDefaultValue(const DataT &val);
......@@ -81,7 +81,7 @@ namespace smtk
bool m_maxRangeInclusive;
std::vector<DataT> m_discreteValues;
private:
};
//----------------------------------------------------------------------------
......@@ -191,21 +191,21 @@ namespace smtk
{
return true;
}
if (this->m_minRangeSet &&
((val < this->m_minRange) ||
if (this->m_minRangeSet &&
((val < this->m_minRange) ||
((!this->m_minRangeInclusive) && (val == this->m_minRange))))
{
return false;
}
if (this->m_maxRangeSet &&
((val > this->m_maxRange) ||
if (this->m_maxRangeSet &&
((val > this->m_maxRange) ||
((!this->m_maxRangeInclusive) && (val == this->m_maxRange))))
{
return false;
}
return true;
}
};
};
}
}
#endif /* __smtk_attribute_ValueItemDefinitionTemplate_h */
......@@ -405,8 +405,8 @@ namespace smtk
}
return false;
}
};
};
}
}
#endif /* __smtk_attribute_ValueItemTemplate_h */
......@@ -45,12 +45,12 @@ namespace smtk
virtual ~VoidItem();
virtual Item::Type type() const;
virtual bool setDefinition(smtk::ConstAttributeItemDefinitionPtr def);
protected:
private:
};
};
};
}
}
#endif /* __smtk_attribute_VoidItem_h */
......@@ -47,15 +47,15 @@ namespace smtk
virtual Item::Type type() const;
virtual smtk::AttributeItemPtr buildItem(Attribute *owningAttribute,
int itemPosition) const;
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
virtual smtk::AttributeItemPtr buildItem(Item *owningItem,
int position,
int subGroupPosition) const;
protected:
VoidItemDefinition(const std::string &myName);
private:
};
};
};
}
}
#endif /* __smtk_attribute_VoidItemDefinition_h */
......@@ -73,39 +73,39 @@ namespace smtk
void processDefinition(pugi::xml_node &defNode);
void processAttribute(pugi::xml_node &attNode);
void processItem(pugi::xml_node &node,
void processItem(pugi::xml_node &node,
smtk::AttributeItemPtr item);
void processItemDef(pugi::xml_node &node,
void processItemDef(pugi::xml_node &node,
smtk::AttributeItemDefinitionPtr idef);
void processAttributeRefItem(pugi::xml_node &node,
void processAttributeRefItem(pugi::xml_node &node,
smtk::AttributeRefItemPtr item);
void processAttributeRefDef(pugi::xml_node &node,
smtk::AttributeRefItemDefinitionPtr idef);
void processDoubleItem(pugi::xml_node &node,
void processDoubleItem(pugi::xml_node &node,
smtk::DoubleItemPtr item);
void processDoubleDef(pugi::xml_node &node,
smtk::DoubleItemDefinitionPtr idef);
void processDirectoryItem(pugi::xml_node &node,
void processDirectoryItem(pugi::xml_node &node,
smtk::DirectoryItemPtr item);
void processDirectoryDef(pugi::xml_node &node,
smtk::DirectoryItemDefinitionPtr idef);
void processFileItem(pugi::xml_node &node,
void processFileItem(pugi::xml_node &node,
smtk::FileItemPtr item);
void processFileDef(pugi::xml_node &node,
smtk::FileItemDefinitionPtr idef);
void processGroupItem(pugi::xml_node &node,
void processGroupItem(pugi::xml_node &node,
smtk::GroupItemPtr item);
void processGroupDef(pugi::xml_node &node,
smtk::GroupItemDefinitionPtr idef);
void processIntItem(pugi::xml_node &node,
void processIntItem(pugi::xml_node &node,
smtk::IntItemPtr item);
void processIntDef(pugi::xml_node &node,
smtk::IntItemDefinitionPtr idef);
void processStringItem(pugi::xml_node &node,
void processStringItem(pugi::xml_node &node,
smtk::StringItemPtr item);
void processStringDef(pugi::xml_node &node,
smtk::StringItemDefinitionPtr idef);
void processValueItem(pugi::xml_node &node,
void processValueItem(pugi::xml_node &node,
smtk::ValueItemPtr item);
void processValueDef(pugi::xml_node &node,
smtk::ValueItemDefinitionPtr idef);
......@@ -143,10 +143,10 @@ namespace smtk
std::string m_defaultCategory;
pugi::xml_node m_root; // Dummy for now!
private: