Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fixed parsing of unsigned ints

Browse Source
This commit is contained in:
Jim Evins
2015-09-05 19:34:27 -04:00
parent 68cb85ce36
commit 4be367ae60
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libglabels/XmlUtil.cpp
+6 -12
View File
@@ -83,8 +83,7 @@ namespace libglabels
if ( !ok ) if ( !ok )
{ {
qWarning() << "Error: bad double value in attribute " qWarning() << "Error: bad double value in attribute "
<< node.tagName() << ":" << name << node.tagName() << ":" << name << "=" << valueString;
<< " : " << valueString;
return default_value; return default_value;
} }
@@ -123,8 +122,7 @@ namespace libglabels
} }
qWarning() << "Error: bad boolean value in attribute " qWarning() << "Error: bad boolean value in attribute "
<< node.tagName() << ":" << name << node.tagName() << ":" << name << "=" << valueString;
<< " : " << valueString;
return default_value; return default_value;
} }
@@ -147,8 +145,7 @@ namespace libglabels
if ( !ok ) if ( !ok )
{ {
qWarning() << "Error: bad integer value in attribute " qWarning() << "Error: bad integer value in attribute "
<< node.tagName() << ":" << name << node.tagName() << ":" << name << "=" << valueString;
<< " : " << valueString;
return default_value; return default_value;
} }
@@ -168,15 +165,13 @@ namespace libglabels
QString valueString = node.attribute( name, "" ); QString valueString = node.attribute( name, "" );
if ( valueString != "" ) if ( valueString != "" )
{ {
// TODO: Does base-0 do what we want? I.e. use base determined by format e.g. "0xff"
bool ok; bool ok;
uint32_t value = valueString.toInt(& ok, 0 ); uint32_t value = valueString.toUInt(& ok, 0 );
if ( !ok ) if ( !ok )
{ {
qWarning() << "Error: bad unsigned integer value in attribute " qWarning() << "Error: bad unsigned integer value in attribute "
<< node.tagName() << ":" << name << node.tagName() << ":" << name << "=" << valueString;
<< " : " << valueString;
return default_value; return default_value;
} }
@@ -223,8 +218,7 @@ namespace libglabels
if ( !Units::isIdValid( unitsString ) ) if ( !Units::isIdValid( unitsString ) )
{ {
qWarning() << "Error: bad length value in attribute " qWarning() << "Error: bad length value in attribute "
<< node.tagName() << ":" << name << node.tagName() << ":" << name << "=" << valueString;
<< " : " << valueString;
return default_value; return default_value;
} }