Skip to content

Commit 09c6ec1

Browse files
author
timlinux
committedNov 20, 2007
Fix compilation errors under gcc:
 qgis/src/app/qgsdbsourceselect.cpp:308: error: ‘>>’ should be ‘> >’ within a nested template argument list qgis/src/app/qgsdbsourceselect.cpp:445: error: ‘>>’ should be ‘> >’ within a nested template argument list gcc does not allow you to make nested template calls like this: Foo <bar<xyz>> The conjoined >> must have at least one space otherwise a compilation error will result. Also replaced tabs with 2 spaces. git-svn-id: http://svn.osgeo.org/qgis/trunk@7619 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent c9c3efb commit 09c6ec1

File tree

1 file changed

+51
-50
lines changed

1 file changed

+51
-50
lines changed
 

‎src/app/qgsdbsourceselect.cpp

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -299,31 +299,32 @@ void QgsDbSourceSelect::addTables()
299299
QString query = table + " sql=";
300300

301301
QComboBox *cb = static_cast<QComboBox *>( lstTables->cellWidget(i, dbssType) );
302-
if(cb) {
303-
int i = table.find("(");
304-
int j = table.find(")");
305-
QString column = table.mid(i+1,j-i-1);
306-
QString type;
307-
308-
QMapIterator <QString, QPair<QString, QIcon>> it(mLayerIcons);
309-
while( it.hasNext() ) {
310-
it.next();
311-
312-
if( it.value().first == cb->currentText() ) {
313-
type=it.key();
314-
break;
315-
}
316-
}
317-
318-
if( type=="POINT" ) {
319-
query += QString("GeometryType(\"%1\") IN ('POINT','MULTIPOINT')").arg(column);
320-
} else if(type=="LINESTRING") {
321-
query += QString("GeometryType(\"%1\") IN ('LINESTRING','MULTILINESTRING')").arg(column);
322-
} else if(type=="POLYGON") {
323-
query += QString("GeometryType(\"%1\") IN ('POLYGON','MULTIPOLYGON')").arg(column);
324-
} else {
325-
continue;
326-
}
302+
if(cb)
303+
{
304+
int i = table.find("(");
305+
int j = table.find(")");
306+
QString column = table.mid(i+1,j-i-1);
307+
QString type;
308+
309+
QMapIterator <QString, QPair < QString, QIcon > > it(mLayerIcons);
310+
while( it.hasNext() ) {
311+
it.next();
312+
313+
if( it.value().first == cb->currentText() ) {
314+
type=it.key();
315+
break;
316+
}
317+
}
318+
319+
if( type=="POINT" ) {
320+
query += QString("GeometryType(\"%1\") IN ('POINT','MULTIPOINT')").arg(column);
321+
} else if(type=="LINESTRING") {
322+
query += QString("GeometryType(\"%1\") IN ('LINESTRING','MULTILINESTRING')").arg(column);
323+
} else if(type=="POLYGON") {
324+
query += QString("GeometryType(\"%1\") IN ('POLYGON','MULTIPOLYGON')").arg(column);
325+
} else {
326+
continue;
327+
}
327328
}
328329

329330
QTableWidgetItem *sqlItem = lstTables->item(i, dbssSql);
@@ -407,47 +408,47 @@ void QgsDbSourceSelect::on_btnConnect_clicked()
407408
{
408409
QString myThemePath = QgsApplication::themePath();
409410
mLayerIcons.insert("POINT",
410-
qMakePair(tr("Point layer"),
411-
QIcon(myThemePath+"/mIconPointLayer.png")));
411+
qMakePair(tr("Point layer"),
412+
QIcon(myThemePath+"/mIconPointLayer.png")));
412413
mLayerIcons.insert("MULTIPOINT",
413-
qMakePair(tr("Multi-point layer"),
414-
mLayerIcons.value("POINT").second));
414+
qMakePair(tr("Multi-point layer"),
415+
mLayerIcons.value("POINT").second));
415416

416417
mLayerIcons.insert("LINESTRING",
417-
qMakePair(tr("Linestring layer"),
418-
QIcon(myThemePath+"/mIconLineLayer.png")));
418+
qMakePair(tr("Linestring layer"),
419+
QIcon(myThemePath+"/mIconLineLayer.png")));
419420
mLayerIcons.insert("MULTILINESTRING",
420-
qMakePair(tr("Multi-linestring layer"),
421-
mLayerIcons.value("LINESTRING").second));
421+
qMakePair(tr("Multi-linestring layer"),
422+
mLayerIcons.value("LINESTRING").second));
422423

423424
mLayerIcons.insert("POLYGON",
424-
qMakePair(tr("Polygon layer"),
425-
QIcon(myThemePath+"/mIconPolygonLayer.png")));
425+
qMakePair(tr("Polygon layer"),
426+
QIcon(myThemePath+"/mIconPolygonLayer.png")));
426427
mLayerIcons.insert("MULTIPOLYGON",
427-
qMakePair(tr("Multi-polygon layer"),
428-
mLayerIcons.value("POLYGON").second));
428+
qMakePair(tr("Multi-polygon layer"),
429+
mLayerIcons.value("POLYGON").second));
429430

430431
mLayerIcons.insert("GEOMETRY",
431-
qMakePair(tr("Mixed geometry layer"),
432-
QIcon(myThemePath+"/mIconGeometryLayer.png")));
432+
qMakePair(tr("Mixed geometry layer"),
433+
QIcon(myThemePath+"/mIconGeometryLayer.png")));
433434
mLayerIcons.insert("GEOMETRYCOLLECTION",
434-
qMakePair(tr("Geometry collection layer"),
435-
mLayerIcons.value("GEOMETRY").second));
435+
qMakePair(tr("Geometry collection layer"),
436+
mLayerIcons.value("GEOMETRY").second));
436437

437438
mLayerIcons.insert("WAITING",
438-
qMakePair(tr("Waiting for layer type"),
439-
QIcon(myThemePath+"/mIconWaitingForLayerType.png")));
439+
qMakePair(tr("Waiting for layer type"),
440+
QIcon(myThemePath+"/mIconWaitingForLayerType.png")));
440441
mLayerIcons.insert("UNKNOWN",
441-
qMakePair(tr("Unknown layer type"),
442-
QIcon(myThemePath+"/mIconUnknownLayerType.png")));
442+
qMakePair(tr("Unknown layer type"),
443+
QIcon(myThemePath+"/mIconUnknownLayerType.png")));
443444

444-
mCbMinLength = 0;
445-
QMapIterator <QString, QPair<QString, QIcon>> it(mLayerIcons);
445+
mCbMinLength = 0;
446+
QMapIterator <QString, QPair < QString, QIcon > > it(mLayerIcons);
446447
while( it.hasNext() ) {
447448
it.next();
448-
int len = it.value().first.length();;
449-
mCbMinLength = mCbMinLength<len ? len : mCbMinLength;
450-
}
449+
int len = it.value().first.length();;
450+
mCbMinLength = mCbMinLength<len ? len : mCbMinLength;
451+
}
451452
}
452453
//qDebug("Connection succeeded");
453454
// tell the DB that we want text encoded in UTF8

0 commit comments

Comments
 (0)
Please sign in to comment.