Skip to content

Commit ddd7c8b

Browse files
author
jef
committedJan 31, 2009
automatic indentation update (r10009-r10065)
git-svn-id: http://svn.osgeo.org/qgis/trunk@10066 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 0f0f381 commit ddd7c8b

15 files changed

+104
-102
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ void QgisApp::createActions()
801801
mActionLayerSelectionSaveAs->setStatusTip( tr( "Save the selection as a shapefile" ) );
802802
connect( mActionLayerSelectionSaveAs, SIGNAL( triggered() ), this, SLOT( saveSelectionAsShapefile() ) );
803803
mActionLayerSelectionSaveAs->setEnabled( false );
804-
804+
805805
mActionRemoveLayer = new QAction( getThemeIcon( "mActionRemoveLayer.png" ), tr( "Remove Layer" ), this );
806806
mActionRemoveLayer->setShortcut( tr( "Ctrl+D", "Remove a Layer" ) );
807807
mActionRemoveLayer->setStatusTip( tr( "Remove a Layer" ) );
@@ -2173,15 +2173,16 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS
21732173

21742174
// If the newly created layer has more than 1 layer of data available, we show the
21752175
// sublayers selection dialog so the user can select the sublayers to actually load.
2176-
if ( sublayers.count() > 1)
2177-
{
2178-
askUserForSublayers(layer);
2176+
if ( sublayers.count() > 1 )
2177+
{
2178+
askUserForSublayers( layer );
21792179

2180-
// The first layer loaded is not usefull in that case. The user can select it in
2180+
// The first layer loaded is not usefull in that case. The user can select it in
21812181
// the list if he wants to load it.
21822182
delete layer;
21832183

2184-
}else // there is 1 layer of data available
2184+
}
2185+
else // there is 1 layer of data available
21852186
{
21862187
// Register this layer with the layers registry
21872188
QgsMapLayerRegistry::instance()->addMapLayer( layer );
@@ -2219,57 +2220,57 @@ bool QgisApp::addVectorLayers( QStringList const & theLayerQStringList, const QS
22192220
} // QgisApp::addVectorLayer()
22202221

22212222
// This method is the method that does the real job. If the layer given in
2222-
// parameter is NULL, then the method tries to act on the activeLayer.
2223-
void QgisApp::askUserForSublayers(QgsVectorLayer *layer)
2223+
// parameter is NULL, then the method tries to act on the activeLayer.
2224+
void QgisApp::askUserForSublayers( QgsVectorLayer *layer )
22242225
{
2225-
if (layer == NULL)
2226+
if ( layer == NULL )
22262227
{
2227-
if (activeLayer() == NULL || activeLayer()->type() != QgsMapLayer::VectorLayer)
2228+
if ( activeLayer() == NULL || activeLayer()->type() != QgsMapLayer::VectorLayer )
22282229
return;
2229-
2230-
layer = (QgsVectorLayer*) activeLayer();
2231-
if (layer->dataProvider()->name() != "ogr")
2230+
2231+
layer = ( QgsVectorLayer* ) activeLayer();
2232+
if ( layer->dataProvider()->name() != "ogr" )
22322233
return;
22332234
}
2234-
2235+
22352236
QStringList sublayers = layer->dataProvider()->subLayers();
22362237

22372238
// We initialize a selection dialog and display it.
22382239
QgsOGRSublayersDialog chooseSublayersDialog( this );
22392240
chooseSublayersDialog.populateLayerTable( sublayers );
2240-
2241-
if (chooseSublayersDialog.exec())
2241+
2242+
if ( chooseSublayersDialog.exec() )
22422243
{
22432244
QString uri = layer->source();
2244-
if ( uri.contains('&', Qt::CaseSensitive) )
2245+
if ( uri.contains( '&', Qt::CaseSensitive ) )
22452246
{
22462247
// If we get here, there are some options added to the filename.
22472248
// A valid uri is of the form: filename&option1=value1&option2=value2,...
22482249
// We want only the filename here, so we get the first part of the split.
2249-
QStringList theURIParts = uri.split("&");
2250+
QStringList theURIParts = uri.split( "&" );
22502251
uri = theURIParts.at( 0 );
22512252
}
2252-
2253+
22532254
// the user has done his choice
2254-
loadOGRSublayers(uri, chooseSublayersDialog.getSelection());
2255+
loadOGRSublayers( uri, chooseSublayersDialog.getSelection() );
22552256
}
22562257
}
22572258

2258-
// This method will load with OGR the layers in parameter.
2259+
// This method will load with OGR the layers in parameter.
22592260
// This method has been conceived to use the new URI
22602261
// format of the ogrprovider so as to give precisions about which
22612262
// sublayer to load into QGIS. It is normally triggered by the
22622263
// sublayer selection dialog.
2263-
void QgisApp::loadOGRSublayers( QString uri, QStringList list)
2264+
void QgisApp::loadOGRSublayers( QString uri, QStringList list )
22642265
{
22652266
// The uri must contain the actual uri of the vectorLayer from which we are
22662267
// going to load the sublayers.
2267-
QString fileName = QFileInfo(uri).baseName();
2268-
for (int i = 0; i < list.size(); i++)
2269-
{
2270-
QString composedURI=uri+"&layername="+list.at(i);
2271-
QgsVectorLayer *layer=addVectorLayer(composedURI,fileName+":"+list.at(i),"ogr");
2272-
}
2268+
QString fileName = QFileInfo( uri ).baseName();
2269+
for ( int i = 0; i < list.size(); i++ )
2270+
{
2271+
QString composedURI = uri + "&layername=" + list.at( i );
2272+
QgsVectorLayer *layer = addVectorLayer( composedURI, fileName + ":" + list.at( i ), "ogr" );
2273+
}
22732274
}
22742275

22752276
/** This helper checks to see whether the file name appears to be a valid vector file name */

‎src/app/qgisapp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class QgisApp : public QMainWindow
600600
/** This method will open a dialog so the user can select the sublayers
601601
* to load
602602
*/
603-
void askUserForSublayers(QgsVectorLayer *layer);
603+
void askUserForSublayers( QgsVectorLayer *layer );
604604
/** Add a raster layer to the map (passed in as a ptr).
605605
* It won't force a refresh.
606606
*/

‎src/app/qgsogrsublayersdialog.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ QgsOGRSublayersDialog::QgsOGRSublayersDialog( QWidget* parent, Qt::WFlags fl )
2323
: QDialog( parent, fl )
2424
{
2525
setupUi( this );
26-
QStringList labels=QStringList() << "Layer ID" << "Layer name" << "Nb of features" << "Geometry type";
27-
layersTable->setHeaderLabels(labels);
26+
QStringList labels = QStringList() << "Layer ID" << "Layer name" << "Nb of features" << "Geometry type";
27+
layersTable->setHeaderLabels( labels );
2828
}
2929

3030
QgsOGRSublayersDialog::~QgsOGRSublayersDialog()
@@ -33,22 +33,23 @@ QgsOGRSublayersDialog::~QgsOGRSublayersDialog()
3333

3434
QStringList QgsOGRSublayersDialog::getSelection()
3535
{
36-
QStringList list=QStringList();
37-
for (int i = 0; i < layersTable-> selectedItems().size(); i++)
36+
QStringList list = QStringList();
37+
for ( int i = 0; i < layersTable-> selectedItems().size(); i++ )
3838
{
39-
QString theItem =layersTable-> selectedItems().at(i)->text(1);
40-
list.append(theItem);
39+
QString theItem = layersTable-> selectedItems().at( i )->text( 1 );
40+
list.append( theItem );
4141
}
4242
return list;
4343
}
4444

45-
void QgsOGRSublayersDialog::populateLayerTable (QStringList theList)
45+
void QgsOGRSublayersDialog::populateLayerTable( QStringList theList )
4646
{
47-
for (int i =0; i< theList.size(); i++){
48-
QString ligne = theList.at(i);
49-
QStringList elements = ligne.split(":");
50-
QStringList item=QStringList();
51-
item << elements.at(0) << elements.at(1) << elements.at(2) << elements.at(3);
52-
layersTable -> addTopLevelItem(new QTreeWidgetItem(item));
53-
}
47+
for ( int i = 0; i < theList.size(); i++ )
48+
{
49+
QString ligne = theList.at( i );
50+
QStringList elements = ligne.split( ":" );
51+
QStringList item = QStringList();
52+
item << elements.at( 0 ) << elements.at( 1 ) << elements.at( 2 ) << elements.at( 3 );
53+
layersTable -> addTopLevelItem( new QTreeWidgetItem( item ) );
54+
}
5455
}

‎src/app/qgsogrsublayersdialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class QgsOGRSublayersDialog : public QDialog, private Ui::QgsOGRSublayersDialogB
2828
public:
2929
QgsOGRSublayersDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
3030
~QgsOGRSublayersDialog();
31-
void populateLayerTable(QStringList theList);
32-
QStringList getSelection();
31+
void populateLayerTable( QStringList theList );
32+
QStringList getSelection();
3333

3434
};
3535

‎src/app/qgsserversourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ QgsServerSourceSelect::QgsServerSourceSelect( QWidget * parent, Qt::WFlags fl )
7777
int i = 1;
7878
while ( iter != m_PotentialFormats.end() )
7979
{
80-
QRadioButton* btn = new QRadioButton(iter.value().first);
80+
QRadioButton* btn = new QRadioButton( iter.value().first );
8181
m_imageFormatGroup->addButton( btn, iter.value().second );
8282
m_imageFormatLayout->addWidget( btn );
8383
if ( i == 1 )
@@ -584,7 +584,7 @@ QString QgsServerSourceSelect::selectedImageEncoding()
584584
QString imageEncoding = m_PotentialFormats.key( qMakePair( label, id ) );
585585

586586
//substitute blanks with %20 (e.g. in "image/png; mode=24bit")
587-
imageEncoding.replace(QRegExp(" "), "%20");
587+
imageEncoding.replace( QRegExp( " " ), "%20" );
588588
return imageEncoding;
589589
}
590590

‎src/core/composer/qgscomposermap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void QgsComposerMap::setSceneRect( const QRectF& rectangle )
372372
mExtent = QgsRectangle( mExtent.xMinimum(), mExtent.yMinimum(), mExtent.xMaximum(), mExtent.yMinimum() + newHeight );
373373
mCacheUpdated = false;
374374
emit extentChanged();
375-
if(mPreviewMode != Rectangle)
375+
if ( mPreviewMode != Rectangle )
376376
{
377377
cache();
378378
}

‎src/core/qgsgeometry.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5453,29 +5453,29 @@ QList<QgsGeometry*> QgsGeometry::asGeometryCollection()
54535453
if ( mGeos == NULL )
54545454
return QList<QgsGeometry*>();
54555455
}
5456-
5456+
54575457
int type = GEOSGeomTypeId( mGeos );
5458-
QgsDebugMsg("geom type: "+QString::number(type));
5459-
5458+
QgsDebugMsg( "geom type: " + QString::number( type ) );
5459+
54605460
QList<QgsGeometry*> geomCollection;
5461-
5461+
54625462
if ( type != GEOS_MULTIPOINT &&
54635463
type != GEOS_MULTILINESTRING &&
54645464
type != GEOS_MULTIPOLYGON &&
54655465
type != GEOS_GEOMETRYCOLLECTION )
54665466
{
54675467
// we have a single-part geometry - put there a copy of this one
5468-
geomCollection.append( new QgsGeometry(*this) );
5468+
geomCollection.append( new QgsGeometry( *this ) );
54695469
return geomCollection;
54705470
}
5471-
5471+
54725472
int count = GEOSGetNumGeometries( mGeos );
5473-
QgsDebugMsg("geom count: "+QString::number(count));
5473+
QgsDebugMsg( "geom count: " + QString::number( count ) );
54745474

54755475
for ( int i = 0; i < count; ++i )
54765476
{
54775477
const GEOSGeometry * geometry = GEOSGetGeometryN( mGeos, i );
5478-
geomCollection.append( fromGeosGeom( GEOSGeom_clone(geometry) ) );
5478+
geomCollection.append( fromGeosGeom( GEOSGeom_clone( geometry ) ) );
54795479
}
54805480

54815481
return geomCollection;

‎src/core/qgsvectorlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
23242324

23252325
if ( !renderer )
23262326
{
2327-
errorMessage = tr("Unknown renderer");
2327+
errorMessage = tr( "Unknown renderer" );
23282328
return false;
23292329
}
23302330

‎src/gui/qgsdetaileditemdelegate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ void QgsDetailedItemDelegate::paintManually( QPainter * thepPainter,
122122
if ( theOption.state & QStyle::State_Selected )
123123
{
124124
drawHighlight( theOption, thepPainter, height( theOption, theData ) );
125-
thepPainter->setPen(theOption.palette.highlightedText().color());
125+
thepPainter->setPen( theOption.palette.highlightedText().color() );
126126
}
127127
else
128128
{
129-
thepPainter->setPen(theOption.palette.text().color());
129+
thepPainter->setPen( theOption.palette.text().color() );
130130
}
131131

132132

‎src/gui/qgsmapcanvas.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,14 +431,14 @@ void QgsMapCanvas::saveAsImage( QString theFileName, QPixmap * theQPixmap, QStri
431431
myHeader += QString::number( myRect.xMinimum() ) + "\r\n";
432432
//Origin Y (top left corner)
433433
myHeader += QString::number( myRect.yMaximum() ) + "\r\n";
434-
QFileInfo myInfo = QFileInfo(theFileName);
434+
QFileInfo myInfo = QFileInfo( theFileName );
435435
QString myWorldFileName = myInfo.absolutePath() + QDir::separator() + myInfo.baseName() + "." + theFormat + "w";
436-
QFile myWorldFile(myWorldFileName);
437-
if (!myWorldFile.open(QIODevice::WriteOnly | QIODevice::Text))
436+
QFile myWorldFile( myWorldFileName );
437+
if ( !myWorldFile.open( QIODevice::WriteOnly | QIODevice::Text ) )
438438
{
439439
return;
440440
}
441-
QTextStream myStream(&myWorldFile);
441+
QTextStream myStream( &myWorldFile );
442442
myStream << myHeader;
443443
} // saveAsImage
444444

0 commit comments

Comments
 (0)
Please sign in to comment.