@@ -68,8 +68,9 @@ QgsProject * QgsProject::theProject_;
68
68
static
69
69
QStringList makeKeyTokens_ (QString const &scope, QString const &key)
70
70
{
71
- const char * scope_str = scope.toLocal8Bit ().data (); // debugger probes
72
- const char * key_str = key.toLocal8Bit ().data ();
71
+ // XXX - debugger probes
72
+ // const char * scope_str = scope.toLocal8Bit().data();
73
+ // const char * key_str = key.toLocal8Bit().data();
73
74
74
75
QStringList keyTokens = QStringList (scope);
75
76
keyTokens += QStringList::split (' /' , key);
@@ -123,7 +124,7 @@ QgsProject * QgsProject::theProject_;
123
124
{
124
125
return currentProperty;
125
126
}
126
- else if ( nextProperty = currentProperty->find ( keySequence.first () ) )
127
+ else if (( nextProperty = currentProperty->find ( keySequence.first () ) ) )
127
128
{
128
129
if ( nextProperty->isKey () )
129
130
{
@@ -201,7 +202,7 @@ QgsProject * QgsProject::theProject_;
201
202
202
203
return currentProperty;
203
204
}
204
- else if ( newProperty = currentProperty->find ( keySequence.first () ) )
205
+ else if (( newProperty = currentProperty->find ( keySequence.first () ) ) )
205
206
{
206
207
currentProperty = dynamic_cast <QgsPropertyKey*>(newProperty);
207
208
@@ -271,7 +272,7 @@ QgsProject * QgsProject::theProject_;
271
272
{
272
273
previousQgsPropertyKey->removeKey ( currentProperty->name () );
273
274
}
274
- else if ( nextProperty = currentProperty->find ( keySequence.first () ) )
275
+ else if (( nextProperty = currentProperty->find ( keySequence.first () ) ) )
275
276
{
276
277
previousQgsPropertyKey = currentProperty;
277
278
currentProperty = dynamic_cast <QgsPropertyKey*>(nextProperty);
@@ -559,7 +560,7 @@ _getProperties(QDomDocument const &doc, QgsPropertyKey & project_properties)
559
560
560
561
if ( ! project_properties.readXML ( propertyNode ) )
561
562
{
562
- qDebug (" %s:%d project_properties .readXML() failed" );
563
+ qDebug (" Project_properties .readXML() failed" );
563
564
}
564
565
565
566
// DEPRECATED as functionality has been shoved down to QgsProperyKey::readXML()
@@ -844,7 +845,7 @@ static pair< bool, list<QDomNode> > _getMapLayers(QDomDocument const &doc)
844
845
845
846
bool returnStatus = true ;
846
847
847
- for (size_t i = 0 ; i < nl.count (); i++)
848
+ for (int i = 0 ; i < nl.count (); i++)
848
849
{
849
850
QDomNode node = nl.item (i);
850
851
QDomElement element = node.toElement ();
0 commit comments