AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added default values TypeText accessors

This commit is contained in:
Josh Wittner 2016-09-12 19:17:54 -07:00
parent 584af57086
commit 3a621f5b6e
1 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tinyxml2.h
View File

@ -1231,41 +1231,41 @@ public:
returned if there is an error. For a method with error returned if there is an error. For a method with error
checking, see QueryIntAttribute() checking, see QueryIntAttribute()
*/ */
int IntAttribute( const char* name ) const { int IntAttribute(const char* name, int defaultValue = 0) const {
int i=0; int i=defaultValue;
QueryIntAttribute( name, &i ); QueryIntAttribute( name, &i );
return i; return i;
} }
/// See IntAttribute() /// See IntAttribute()
unsigned UnsignedAttribute( const char* name ) const { unsigned UnsignedAttribute(const char* name , unsigned defaultValue = 0) const {
unsigned i=0; unsigned i=defaultValue;
QueryUnsignedAttribute( name, &i ); QueryUnsignedAttribute( name, &i );
return i; return i;
} }
/// See IntAttribute() /// See IntAttribute()
int64_t Int64Attribute(const char* name) const { int64_t Int64Attribute(const char* name, int64_t defaultValue = 0) const {
int64_t i = 0; int64_t i = defaultValue;
QueryInt64Attribute(name, &i); QueryInt64Attribute(name, &i);
return i; return i;
} }
/// See IntAttribute() /// See IntAttribute()
bool BoolAttribute( const char* name ) const { bool BoolAttribute( const char* name, bool defaultValue = false ) const {
bool b=false; bool b=defaultValue;
QueryBoolAttribute( name, &b ); QueryBoolAttribute( name, &b );
return b; return b;
} }
/// See IntAttribute() /// See IntAttribute()
double DoubleAttribute( const char* name ) const { double DoubleAttribute( const char* name, double defaultValue=0 ) const {
double d=0; double d=defaultValue;
QueryDoubleAttribute( name, &d ); QueryDoubleAttribute( name, &d );
return d; return d;
} }
/// See IntAttribute() /// See IntAttribute()
float FloatAttribute( const char* name ) const { float FloatAttribute( const char* name, float defaultValue=0 ) const {
float f=0; float f=defaultValue;
QueryFloatAttribute( name, &f ); QueryFloatAttribute( name, &f );
return f; return f;
} }
@ -1542,6 +1542,48 @@ public:
/// See QueryIntText() /// See QueryIntText()
XMLError QueryFloatText( float* fval ) const; XMLError QueryFloatText( float* fval ) const;
int IntText(int defaultValue = 0) const
{
int i = defaultValue;
QueryIntText(&i);
return i;
}
/// See QueryIntText()
unsigned UnsignedText(unsigned defaultValue = 0) const
{
unsigned i = defaultValue;
QueryUnsignedText(&i);
return i;
}
/// See QueryIntText()
int64_t Int64Text(int64_t defaultValue = 0) const
{
int64_t i = defaultValue;
QueryInt64Text(&i);
return i;
}
/// See QueryIntText()
bool BoolText(bool defaultValue = false) const
{
bool b = defaultValue;
QueryBoolText(&b);
return b;
}
/// See QueryIntText()
double DoubleText(double defaultValue = 0) const
{
double d = defaultValue;
QueryDoubleText(&d);
return d;
}
/// See QueryIntText()
float FloatText(float defaultValue = 0) const
{
float f = defaultValue;
QueryFloatText(&f);
return f;
}
// internal: // internal:
enum { enum {
OPEN, // <foo> OPEN, // <foo>