Skip to content
Permalink
Browse files
Applied patches r5669, r5668, r5667, r5666, as applied to the
lib-refactoring branch, to head. These were signed/unsigned int mods
and boolean comparison mismatches. Many of the changes in these
commits had already been done in head


git-svn-id: http://svn.osgeo.org/qgis/trunk@5681 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Aug 10, 2006
1 parent e863190 commit 80821514d682e3fe0c243c6e92c0152122023fb6
Showing with 13 additions and 12 deletions.
  1. +1 −1 src/core/qgsdistancearea.cpp
  2. +4 −4 src/core/qgsprojectproperty.cpp
  3. +8 −7 src/gui/qgsproject.cpp
@@ -335,7 +335,7 @@ unsigned char* QgsDistanceArea::measurePolygon(unsigned char* feature, double* a
double QgsDistanceArea::measurePolygon(const std::vector<QgsPoint>& points)
{
std::vector<QgsPoint> pts(points.size());
for (int i = 0; i < points.size(); i++)
for (std::vector<QgsPoint>::size_type i = 0; i < points.size(); i++)
{
pts[i] = mCoordTransform->transform(points[i]);
}
@@ -112,7 +112,7 @@ bool QgsPropertyValue::readXML(QDomNode & keyNode)

case QVariant::StringList:
{
size_t i = 0;
int i = 0;
QDomNodeList values = keyNode.childNodes();

// all the QStringList values will be inside <value> elements
@@ -296,7 +296,7 @@ bool QgsPropertyValue::readXML(QDomNode & keyNode)
break;
*/
default :
qDebug( "%s:%d unsupported value type %s .. not propertly translated to QVariant in qgsproject.cpp:%d",
qDebug( "%s:%d unsupported value type %s .. not propertly translated to QVariant in qgsproject.cpp:",
__FILE__, __LINE__, (const char*)typeString.utf8() );
}

@@ -363,7 +363,7 @@ QVariant QgsPropertyKey::value() const
{
QgsProperty * foundQgsProperty;

if ( foundQgsProperty = properties_.find( name()) )
if ( 0 == ( foundQgsProperty = properties_.find( name()) ) )
{ // recurse down to next key
return foundQgsProperty->value();
} else
@@ -441,7 +441,7 @@ void QgsPropertyKey::dump( size_t tabs ) const

bool QgsPropertyKey::readXML(QDomNode & keyNode)
{
size_t i = 0;
int i = 0;
QDomNodeList subkeys = keyNode.childNodes();

while (i < subkeys.count())
@@ -68,8 +68,9 @@ QgsProject * QgsProject::theProject_;
static
QStringList makeKeyTokens_(QString const &scope, QString const &key)
{
const char * scope_str = scope.toLocal8Bit().data(); // debugger probes
const char * key_str = key.toLocal8Bit().data();
// XXX - debugger probes
// const char * scope_str = scope.toLocal8Bit().data();
// const char * key_str = key.toLocal8Bit().data();

QStringList keyTokens = QStringList(scope);
keyTokens += QStringList::split('/', key);
@@ -123,7 +124,7 @@ QgsProject * QgsProject::theProject_;
{
return currentProperty;
}
else if ( nextProperty = currentProperty->find( keySequence.first() ) )
else if (( nextProperty = currentProperty->find( keySequence.first() ) ))
{
if ( nextProperty->isKey() )
{
@@ -201,7 +202,7 @@ QgsProject * QgsProject::theProject_;

return currentProperty;
}
else if ( newProperty = currentProperty->find( keySequence.first() ) )
else if (( newProperty = currentProperty->find( keySequence.first() ) ))
{
currentProperty = dynamic_cast<QgsPropertyKey*>(newProperty);

@@ -271,7 +272,7 @@ QgsProject * QgsProject::theProject_;
{
previousQgsPropertyKey->removeKey( currentProperty->name() );
}
else if ( nextProperty = currentProperty->find( keySequence.first() ) )
else if (( nextProperty = currentProperty->find( keySequence.first() ) ))
{
previousQgsPropertyKey = currentProperty;
currentProperty = dynamic_cast<QgsPropertyKey*>(nextProperty);
@@ -559,7 +560,7 @@ _getProperties(QDomDocument const &doc, QgsPropertyKey & project_properties)

if ( ! project_properties.readXML( propertyNode ) )
{
qDebug("%s:%d project_properties.readXML() failed");
qDebug("Project_properties.readXML() failed");
}

// DEPRECATED as functionality has been shoved down to QgsProperyKey::readXML()
@@ -844,7 +845,7 @@ static pair< bool, list<QDomNode> > _getMapLayers(QDomDocument const &doc)

bool returnStatus = true;

for (size_t i = 0; i < nl.count(); i++)
for (int i = 0; i < nl.count(); i++)
{
QDomNode node = nl.item(i);
QDomElement element = node.toElement();

0 comments on commit 8082151

Please sign in to comment.