Skip to content
Permalink
Browse files

automatic indentation update (r10457-r10488)

git-svn-id: http://svn.osgeo.org/qgis/trunk@10489 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Apr 6, 2009
1 parent 1bfc5c6 commit 39b28ed518427ac3418ee62ff88bdbd8371ebfe3
Showing with 12,233 additions and 11,090 deletions.
  1. +30 −30 src/app/qgsoptions.cpp
  2. +7 −7 src/app/qgspluginregistry.cpp
  3. +1 −1 src/app/qgspluginregistry.h
  4. +1 −1 src/app/qgsprojectproperties.cpp
  5. +2 −2 src/app/qgssnappingdialog.cpp
  6. +22 −22 src/app/qgsvectorlayerproperties.cpp
  7. +716 −614 src/core/pal/feature.cpp
  8. +188 −186 src/core/pal/feature.h
  9. +493 −421 src/core/pal/geomfunction.cpp
  10. +120 −113 src/core/pal/geomfunction.h
  11. +52 −40 src/core/pal/internalexception.h
  12. +60 −48 src/core/pal/label.cpp
  13. +82 −80 src/core/pal/label.h
  14. +457 −396 src/core/pal/labelposition.cpp
  15. +240 −237 src/core/pal/labelposition.h
  16. +381 −325 src/core/pal/layer.cpp
  17. +273 −271 src/core/pal/layer.h
  18. +967 −860 src/core/pal/pal.cpp
  19. +352 −347 src/core/pal/pal.h
  20. +67 −53 src/core/pal/palexception.h
  21. +40 −38 src/core/pal/palgeometry.h
  22. +65 −55 src/core/pal/palstat.cpp
  23. +52 −50 src/core/pal/palstat.h
  24. +1,399 −1,208 src/core/pal/pointset.cpp
  25. +256 −242 src/core/pal/pointset.h
  26. +214 −180 src/core/pal/priorityqueue.cpp
  27. +32 −30 src/core/pal/priorityqueue.h
  28. +2,657 −2,327 src/core/pal/problem.cpp
  29. +131 −126 src/core/pal/problem.h
  30. +26 −20 src/core/pal/simplemutex.h
  31. +481 −414 src/core/pal/util.cpp
  32. +192 −169 src/core/pal/util.h
  33. +132 −132 src/core/qgscentralpointpositionmanager.cpp
  34. +17 −17 src/core/qgscentralpointpositionmanager.h
  35. +2 −2 src/core/qgsgeometry.cpp
  36. +32 −32 src/core/qgsmaprenderer.cpp
  37. +24 −24 src/core/qgsoverlayobject.cpp
  38. +13 −13 src/core/qgsoverlayobject.h
  39. +9 −9 src/core/qgsoverlayobjectpositionmanager.h
  40. +72 −72 src/core/qgspalobjectpositionmanager.cpp
  41. +10 −10 src/core/qgspalobjectpositionmanager.h
  42. +6 −6 src/core/qgstolerance.cpp
  43. +4 −4 src/core/qgstolerance.h
  44. +16 −16 src/core/qgsvectorlayer.cpp
  45. +4 −4 src/core/qgsvectorlayer.h
  46. +14 −14 src/core/qgsvectoroverlay.cpp
  47. +44 −44 src/core/qgsvectoroverlay.h
  48. +3 −3 src/gui/qgsmapcanvassnapper.cpp
  49. +81 −81 src/plugins/diagram_overlay/qgsbardiagramfactory.cpp
  50. +30 −30 src/plugins/diagram_overlay/qgsbardiagramfactory.h
  51. +3 −3 src/plugins/diagram_overlay/qgsdiagramcategory.cpp
  52. +27 −27 src/plugins/diagram_overlay/qgsdiagramcategory.h
  53. +239 −239 src/plugins/diagram_overlay/qgsdiagramdialog.cpp
  54. +19 −19 src/plugins/diagram_overlay/qgsdiagramdialog.h
  55. +51 −51 src/plugins/diagram_overlay/qgsdiagramfactory.cpp
  56. +63 −63 src/plugins/diagram_overlay/qgsdiagramfactory.h
  57. +2 −2 src/plugins/diagram_overlay/qgsdiagramfactorywidget.h
  58. +242 −242 src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
  59. +28 −28 src/plugins/diagram_overlay/qgsdiagramoverlay.h
  60. +59 −59 src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp
  61. +10 −10 src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h
  62. +227 −227 src/plugins/diagram_overlay/qgsdiagramrenderer.cpp
  63. +60 −60 src/plugins/diagram_overlay/qgsdiagramrenderer.h
  64. +1 −1 src/plugins/diagram_overlay/qgsdiagramrendererwidget.cpp
  65. +21 −21 src/plugins/diagram_overlay/qgsdiagramrendererwidget.h
  66. +50 −50 src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp
  67. +18 −18 src/plugins/diagram_overlay/qgslinearlyscalingdialog.h
  68. +51 −51 src/plugins/diagram_overlay/qgspiediagramfactory.cpp
  69. +31 −31 src/plugins/diagram_overlay/qgspiediagramfactory.h
  70. +70 −70 src/plugins/diagram_overlay/qgssvgdiagramfactory.cpp
  71. +35 −35 src/plugins/diagram_overlay/qgssvgdiagramfactory.h
  72. +74 −74 src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
  73. +6 −6 src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.h
  74. +120 −120 src/plugins/diagram_overlay/qgswkndiagramfactory.cpp
  75. +33 −33 src/plugins/diagram_overlay/qgswkndiagramfactory.h
  76. +88 −88 src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp
  77. +11 −11 src/plugins/diagram_overlay/qgswkndiagramfactorywidget.h
  78. +10 −10 src/plugins/interpolation/qgstininterpolator.cpp
  79. +2 −2 src/plugins/qgsapplydialog.h
  80. +1 −1 src/plugins/qgsvectoroverlayplugin.cpp
  81. +12 −12 src/plugins/qgsvectoroverlayplugin.h
@@ -198,19 +198,19 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
mDefaultSnappingToleranceSpinBox->setValue( settings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble() );
mSearchRadiusVertexEditSpinBox->setValue( settings.value( "/qgis/digitizing/search_radius_vertex_edit", 10 ).toDouble() );
int index;
if (settings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt() == QgsTolerance::MapUnits)
if ( settings.value( "/qgis/digitizing/default_snapping_tolerance_unit", 0 ).toInt() == QgsTolerance::MapUnits )
{
index = mDefaultSnappingToleranceComboBox->findText( tr( "map units" ) );
}
}
else
{
index = mDefaultSnappingToleranceComboBox->findText( tr( "pixels" ) );
}
mDefaultSnappingToleranceComboBox->setCurrentIndex( index );
if (settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt() == QgsTolerance::MapUnits)
if ( settings.value( "/qgis/digitizing/search_radius_vertex_edit_unit", 0 ).toInt() == QgsTolerance::MapUnits )
{
index = mSearchRadiusVertexEditComboBox->findText( tr( "map units" ) );
}
}
else
{
index = mSearchRadiusVertexEditComboBox->findText( tr( "pixels" ) );
@@ -242,19 +242,19 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
groupBox_5->setEnabled( false );
#endif //Q_WS_MAC

//overlay placement algorithm
mOverlayAlgorithmComboBox->insertItem(0, tr("Central point (fastest)"));
mOverlayAlgorithmComboBox->insertItem(1, tr("Chain (fast)"));
mOverlayAlgorithmComboBox->insertItem(2, tr("Popmusic tabu chain (slow)"));
mOverlayAlgorithmComboBox->insertItem(3, tr("Popmusic tabu (slow)"));
mOverlayAlgorithmComboBox->insertItem(4, tr("Popmusic chain (very slow)"));

QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point").toString();
if(overlayAlgorithmString == "Chain"){mOverlayAlgorithmComboBox->setCurrentIndex(1);}
else if(overlayAlgorithmString == "Popmusic tabu chain"){mOverlayAlgorithmComboBox->setCurrentIndex(2);}
else if(overlayAlgorithmString == "Popmusic tabu"){mOverlayAlgorithmComboBox->setCurrentIndex(3);}
else if(overlayAlgorithmString == "Popmusic chain"){mOverlayAlgorithmComboBox->setCurrentIndex(4);}
else{mOverlayAlgorithmComboBox->setCurrentIndex(0);} //default is central point
//overlay placement algorithm
mOverlayAlgorithmComboBox->insertItem( 0, tr( "Central point (fastest)" ) );
mOverlayAlgorithmComboBox->insertItem( 1, tr( "Chain (fast)" ) );
mOverlayAlgorithmComboBox->insertItem( 2, tr( "Popmusic tabu chain (slow)" ) );
mOverlayAlgorithmComboBox->insertItem( 3, tr( "Popmusic tabu (slow)" ) );
mOverlayAlgorithmComboBox->insertItem( 4, tr( "Popmusic chain (very slow)" ) );

QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point" ).toString();
if ( overlayAlgorithmString == "Chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 1 );}
else if ( overlayAlgorithmString == "Popmusic tabu chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 2 );}
else if ( overlayAlgorithmString == "Popmusic tabu" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 3 );}
else if ( overlayAlgorithmString == "Popmusic chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 4 );}
else {mOverlayAlgorithmComboBox->setCurrentIndex( 0 );} //default is central point
}

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

//overlay placement method
int overlayIndex = mOverlayAlgorithmComboBox->currentIndex();
if(overlayIndex == 1)
if ( overlayIndex == 1 )
{
settings.setValue( "qgis/overlayPlacementAlgorithm", "Chain");
settings.setValue( "qgis/overlayPlacementAlgorithm", "Chain" );
}
else if(overlayIndex == 2)
else if ( overlayIndex == 2 )
{
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu chain");
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu chain" );
}
else if(overlayIndex == 3)
else if ( overlayIndex == 3 )
{
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu");
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic tabu" );
}
else if(overlayIndex == 4)
else if ( overlayIndex == 4 )
{
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic chain");
settings.setValue( "qgis/overlayPlacementAlgorithm", "Popmusic chain" );
}
else
{
settings.setValue( "qgis/overlayPlacementAlgorithm", "Central point" );
settings.setValue( "qgis/overlayPlacementAlgorithm", "Central point" );
}

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


QString markerComboText = mMarkerStyleComboBox->currentText();
@@ -442,11 +442,11 @@ bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName )

QList<QgsPluginMetadata*> QgsPluginRegistry::pluginData()
{
QList<QgsPluginMetadata*> resultList;
QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.begin();
for(; it != mPlugins.end(); ++it)
{
resultList.push_back(&(it.value()));
}
return resultList;
QList<QgsPluginMetadata*> resultList;
QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.begin();
for ( ; it != mPlugins.end(); ++it )
{
resultList.push_back( &( it.value() ) );
}
return resultList;
}
@@ -86,7 +86,7 @@ class QgsPluginRegistry

//! Returns metadata of all loaded plugins
QList<QgsPluginMetadata*> pluginData();

protected:
//! protected constructor
QgsPluginRegistry();
@@ -314,7 +314,7 @@ void QgsProjectProperties::apply()
{
layerIdList << layerEntryIt.key();
toleranceList << QString::number( layerEntryIt->tolerance, 'f' );
toleranceUnitList << QString::number( (int)layerEntryIt->toleranceUnit );
toleranceUnitList << QString::number(( int )layerEntryIt->toleranceUnit );
if ( layerEntryIt->checked )
{
enabledList << "enabled";
@@ -95,10 +95,10 @@ QgsSnappingDialog::QgsSnappingDialog( QgsMapCanvas* canvas, const QMap<QString,
index = snapToComboBox->findText( tr( "to vertex and segment" ) );
}
snapToComboBox->setCurrentIndex( index );
if ( settingIt.value().toleranceUnit == 0 )//map units
if ( settingIt.value().toleranceUnit == 0 )//map units
{
index = toleranceUnitsComboBox->findText( tr( "map units" ) );
}
}
else
{
index = toleranceUnitsComboBox->findText( tr( "pixels" ) );
@@ -129,13 +129,13 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
QList<QgsVectorOverlayPlugin*> overlayPluginList = overlayPlugins();
QList<QgsVectorOverlayPlugin*>::const_iterator it = overlayPluginList.constBegin();

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

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

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

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

QList<QgsPluginMetadata*> pluginData = QgsPluginRegistry::instance()->pluginData();
for(QList<QgsPluginMetadata*>::iterator it = pluginData.begin(); it != pluginData.end(); ++it)
{
if(*it)
for ( QList<QgsPluginMetadata*>::iterator it = pluginData.begin(); it != pluginData.end(); ++it )
{
if ( *it )
{
thePlugin = (*it)->plugin();
if(thePlugin && thePlugin->type() == QgisPlugin::VECTOR_OVERLAY)
{
theOverlayPlugin = dynamic_cast<QgsVectorOverlayPlugin*>(thePlugin);
if(theOverlayPlugin)
thePlugin = ( *it )->plugin();
if ( thePlugin && thePlugin->type() == QgisPlugin::VECTOR_OVERLAY )
{
theOverlayPlugin = dynamic_cast<QgsVectorOverlayPlugin*>( thePlugin );
if ( theOverlayPlugin )
{
pluginList.push_back(theOverlayPlugin);
pluginList.push_back( theOverlayPlugin );
}
}
}
}
}
}

return pluginList;
}

0 comments on commit 39b28ed

Please sign in to comment.
You can’t perform that action at this time.