Skip to content

Commit 2ef10d0

Browse files
author
jef
committed
automatic indentation update (r10457-r10488)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10489 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b3f1f4d commit 2ef10d0

81 files changed

Lines changed: 12233 additions & 11090 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/app/qgsoptions.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -198,19 +198,19 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
198198
mDefaultSnappingToleranceSpinBox->setValue( settings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble() );
199199
mSearchRadiusVertexEditSpinBox->setValue( settings.value( "/qgis/digitizing/search_radius_vertex_edit", 10 ).toDouble() );
200200
int index;
201-
if (settings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt() == QgsTolerance::MapUnits)
201+
if ( settings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt() == QgsTolerance::MapUnits )
202202
{
203203
index = mDefaultSnappingToleranceComboBox->findText( tr( "map units" ) );
204-
}
204+
}
205205
else
206206
{
207207
index = mDefaultSnappingToleranceComboBox->findText( tr( "pixels" ) );
208208
}
209209
mDefaultSnappingToleranceComboBox->setCurrentIndex( index );
210-
if (settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt() == QgsTolerance::MapUnits)
210+
if ( settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt() == QgsTolerance::MapUnits )
211211
{
212212
index = mSearchRadiusVertexEditComboBox->findText( tr( "map units" ) );
213-
}
213+
}
214214
else
215215
{
216216
index = mSearchRadiusVertexEditComboBox->findText( tr( "pixels" ) );
@@ -242,19 +242,19 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
242242
groupBox_5->setEnabled( false );
243243
#endif //Q_WS_MAC
244244

245-
//overlay placement algorithm
246-
mOverlayAlgorithmComboBox->insertItem(0, tr("Central point (fastest)"));
247-
mOverlayAlgorithmComboBox->insertItem(1, tr("Chain (fast)"));
248-
mOverlayAlgorithmComboBox->insertItem(2, tr("Popmusic tabu chain (slow)"));
249-
mOverlayAlgorithmComboBox->insertItem(3, tr("Popmusic tabu (slow)"));
250-
mOverlayAlgorithmComboBox->insertItem(4, tr("Popmusic chain (very slow)"));
251-
252-
QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point").toString();
253-
if(overlayAlgorithmString == "Chain"){mOverlayAlgorithmComboBox->setCurrentIndex(1);}
254-
else if(overlayAlgorithmString == "Popmusic tabu chain"){mOverlayAlgorithmComboBox->setCurrentIndex(2);}
255-
else if(overlayAlgorithmString == "Popmusic tabu"){mOverlayAlgorithmComboBox->setCurrentIndex(3);}
256-
else if(overlayAlgorithmString == "Popmusic chain"){mOverlayAlgorithmComboBox->setCurrentIndex(4);}
257-
else{mOverlayAlgorithmComboBox->setCurrentIndex(0);} //default is central point
245+
//overlay placement algorithm
246+
mOverlayAlgorithmComboBox->insertItem( 0, tr( "Central point (fastest)" ) );
247+
mOverlayAlgorithmComboBox->insertItem( 1, tr( "Chain (fast)" ) );
248+
mOverlayAlgorithmComboBox->insertItem( 2, tr( "Popmusic tabu chain (slow)" ) );
249+
mOverlayAlgorithmComboBox->insertItem( 3, tr( "Popmusic tabu (slow)" ) );
250+
mOverlayAlgorithmComboBox->insertItem( 4, tr( "Popmusic chain (very slow)" ) );
251+
252+
QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point" ).toString();
253+
if ( overlayAlgorithmString == "Chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 1 );}
254+
else if ( overlayAlgorithmString == "Popmusic tabu chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 2 );}
255+
else if ( overlayAlgorithmString == "Popmusic tabu" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 3 );}
256+
else if ( overlayAlgorithmString == "Popmusic chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 4 );}
257+
else {mOverlayAlgorithmComboBox->setCurrentIndex( 0 );} //default is central point
258258
}
259259

260260
//! Destructor
@@ -346,25 +346,25 @@ void QgsOptions::saveOptions()
346346

347347
//overlay placement method
348348
int overlayIndex = mOverlayAlgorithmComboBox->currentIndex();
349-
if(overlayIndex == 1)
349+
if ( overlayIndex == 1 )
350350
{
351-
settings.setValue( "qgis/overlayPlacementAlgorithm", "Chain");
351+
settings.setValue( "qgis/overlayPlacementAlgorithm", "Chain" );
352352
}
353-
else if(overlayIndex == 2)
353+
else if ( overlayIndex == 2 )
354354
{
355-
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu chain");
355+
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu chain" );
356356
}
357-
else if(overlayIndex == 3)
357+
else if ( overlayIndex == 3 )
358358
{
359-
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu");
359+
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu" );
360360
}
361-
else if(overlayIndex == 4)
361+
else if ( overlayIndex == 4 )
362362
{
363-
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic chain");
363+
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic chain" );
364364
}
365365
else
366366
{
367-
settings.setValue( "qgis/overlayPlacementAlgorithm", "Central point" );
367+
settings.setValue( "qgis/overlayPlacementAlgorithm", "Central point" );
368368
}
369369

370370
if ( cmbTheme->currentText().length() == 0 )
@@ -431,10 +431,10 @@ void QgsOptions::saveOptions()
431431
settings.setValue( "/qgis/digitizing/default_snap_mode", defaultSnapModeString );
432432
settings.setValue( "/qgis/digitizing/default_snapping_tolerance", mDefaultSnappingToleranceSpinBox->value() );
433433
settings.setValue( "/qgis/digitizing/search_radius_vertex_edit", mSearchRadiusVertexEditSpinBox->value() );
434-
settings.setValue( "/qgis/digitizing/default_snapping_tolerance_unit",
435-
(mDefaultSnappingToleranceComboBox->currentIndex() == 0 ? QgsTolerance::MapUnits : QgsTolerance::Pixels ) );
436-
settings.setValue( "/qgis/digitizing/search_radius_vertex_edit_unit",
437-
(mSearchRadiusVertexEditComboBox->currentIndex() == 0 ? QgsTolerance::MapUnits : QgsTolerance::Pixels ) );
434+
settings.setValue( "/qgis/digitizing/default_snapping_tolerance_unit",
435+
( mDefaultSnappingToleranceComboBox->currentIndex() == 0 ? QgsTolerance::MapUnits : QgsTolerance::Pixels ) );
436+
settings.setValue( "/qgis/digitizing/search_radius_vertex_edit_unit",
437+
( mSearchRadiusVertexEditComboBox->currentIndex() == 0 ? QgsTolerance::MapUnits : QgsTolerance::Pixels ) );
438438

439439

440440
QString markerComboText = mMarkerStyleComboBox->currentText();

‎src/app/qgspluginregistry.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -442,11 +442,11 @@ bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName )
442442

443443
QList<QgsPluginMetadata*> QgsPluginRegistry::pluginData()
444444
{
445-
QList<QgsPluginMetadata*> resultList;
446-
QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.begin();
447-
for(; it != mPlugins.end(); ++it)
448-
{
449-
resultList.push_back(&(it.value()));
450-
}
451-
return resultList;
445+
QList<QgsPluginMetadata*> resultList;
446+
QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.begin();
447+
for ( ; it != mPlugins.end(); ++it )
448+
{
449+
resultList.push_back( &( it.value() ) );
450+
}
451+
return resultList;
452452
}

‎src/app/qgspluginregistry.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class QgsPluginRegistry
8686

8787
//! Returns metadata of all loaded plugins
8888
QList<QgsPluginMetadata*> pluginData();
89-
89+
9090
protected:
9191
//! protected constructor
9292
QgsPluginRegistry();

‎src/app/qgsprojectproperties.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void QgsProjectProperties::apply()
314314
{
315315
layerIdList << layerEntryIt.key();
316316
toleranceList << QString::number( layerEntryIt->tolerance, 'f' );
317-
toleranceUnitList << QString::number( (int)layerEntryIt->toleranceUnit );
317+
toleranceUnitList << QString::number(( int )layerEntryIt->toleranceUnit );
318318
if ( layerEntryIt->checked )
319319
{
320320
enabledList << "enabled";

‎src/app/qgssnappingdialog.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ QgsSnappingDialog::QgsSnappingDialog( QgsMapCanvas* canvas, const QMap<QString,
9595
index = snapToComboBox->findText( tr( "to vertex and segment" ) );
9696
}
9797
snapToComboBox->setCurrentIndex( index );
98-
if ( settingIt.value().toleranceUnit == 0 )//map units
98+
if ( settingIt.value().toleranceUnit == 0 )//map units
9999
{
100100
index = toleranceUnitsComboBox->findText( tr( "map units" ) );
101-
}
101+
}
102102
else
103103
{
104104
index = toleranceUnitsComboBox->findText( tr( "pixels" ) );

‎src/app/qgsvectorlayerproperties.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
129129
QList<QgsVectorOverlayPlugin*> overlayPluginList = overlayPlugins();
130130
QList<QgsVectorOverlayPlugin*>::const_iterator it = overlayPluginList.constBegin();
131131

132-
for(; it != overlayPluginList.constEnd(); ++it)
133-
{
134-
QgsApplyDialog* d = (*it)->dialog(lyr);
135-
position = tabWidget->addTab(d, (*it)->name());
136-
tabWidget->setCurrentIndex(position); //ugly, but otherwise the properties dialog is a mess
137-
mOverlayDialogs.push_back(d);
138-
}
132+
for ( ; it != overlayPluginList.constEnd(); ++it )
133+
{
134+
QgsApplyDialog* d = ( *it )->dialog( lyr );
135+
position = tabWidget->addTab( d, ( *it )->name() );
136+
tabWidget->setCurrentIndex( position ); //ugly, but otherwise the properties dialog is a mess
137+
mOverlayDialogs.push_back( d );
138+
}
139139

140140
tabWidget->setCurrentIndex( 0 );
141141
} // QgsVectorLayerProperties ctor
@@ -616,10 +616,10 @@ void QgsVectorLayerProperties::apply()
616616
layer->setTransparency( static_cast < unsigned int >( 255 - sliderTransparency->value() ) );
617617

618618
//apply overlay dialogs
619-
for(QList<QgsApplyDialog*>::iterator it = mOverlayDialogs.begin(); it != mOverlayDialogs.end(); ++it)
620-
{
621-
(*it)->apply();
622-
}
619+
for ( QList<QgsApplyDialog*>::iterator it = mOverlayDialogs.begin(); it != mOverlayDialogs.end(); ++it )
620+
{
621+
( *it )->apply();
622+
}
623623

624624
// update symbology
625625
emit refreshLegend( layer->getLayerID(), false );
@@ -1058,21 +1058,21 @@ QList<QgsVectorOverlayPlugin*> QgsVectorLayerProperties::overlayPlugins() const
10581058
QgsVectorOverlayPlugin* theOverlayPlugin = 0;
10591059

10601060
QList<QgsPluginMetadata*> pluginData = QgsPluginRegistry::instance()->pluginData();
1061-
for(QList<QgsPluginMetadata*>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
1062-
{
1063-
if(*it)
1061+
for ( QList<QgsPluginMetadata*>::iterator it = pluginData.begin(); it != pluginData.end(); ++it )
1062+
{
1063+
if ( *it )
10641064
{
1065-
thePlugin = (*it)->plugin();
1066-
if(thePlugin && thePlugin->type() == QgisPlugin::VECTOR_OVERLAY)
1067-
{
1068-
theOverlayPlugin = dynamic_cast<QgsVectorOverlayPlugin*>(thePlugin);
1069-
if(theOverlayPlugin)
1065+
thePlugin = ( *it )->plugin();
1066+
if ( thePlugin && thePlugin->type() == QgisPlugin::VECTOR_OVERLAY )
1067+
{
1068+
theOverlayPlugin = dynamic_cast<QgsVectorOverlayPlugin*>( thePlugin );
1069+
if ( theOverlayPlugin )
10701070
{
1071-
pluginList.push_back(theOverlayPlugin);
1071+
pluginList.push_back( theOverlayPlugin );
10721072
}
1073-
}
1074-
}
1073+
}
10751074
}
1075+
}
10761076

10771077
return pluginList;
10781078
}

0 commit comments

Comments
 (0)