automatic indentation update (r14435-r15226)

git-svn-id: http://svn.osgeo.org/qgis/trunk@15227 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 20, 2011 · dc25d45 · dc25d45
1 parent 4dc202e
commit dc25d45
Show file tree

Hide file tree

Showing 25 changed files with 150 additions and 150 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -80,7 +80,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(),
 
   QSettings settings;
   int size = settings.value( "/IconSize", 24 ).toInt();
-  setIconSize(QSize(size,size));
+  setIconSize( QSize( size, size ) );
 
   QToolButton* orderingToolButton = new QToolButton( this );
   orderingToolButton->setPopupMode( QToolButton::InstantPopup );
@@ -302,15 +302,15 @@ void QgsComposer::setupTheme()
 
 void QgsComposer::setIconSizes( int size )
 {
-    //Set the icon size of for all the toolbars created in the future.
-    setIconSize(QSize(size,size));
+  //Set the icon size of for all the toolbars created in the future.
+  setIconSize( QSize( size, size ) );
 
-    //Change all current icon sizes.
-    QList<QToolBar *> toolbars = findChildren<QToolBar *>();
-    foreach(QToolBar * toolbar, toolbars)
-    {
-        toolbar->setIconSize(QSize(size,size));
-    }
+  //Change all current icon sizes.
+  QList<QToolBar *> toolbars = findChildren<QToolBar *>();
+  foreach( QToolBar * toolbar, toolbars )
+  {
+    toolbar->setIconSize( QSize( size, size ) );
+  }
 }
 
 void QgsComposer::connectSlots()

diff --git a/src/app/composer/qgscomposerlegendlayersdialog.cpp b/src/app/composer/qgscomposerlegendlayersdialog.cpp
@@ -21,11 +21,11 @@ QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog( QList<QgsMapLayer*
   setupUi( this );
 
   QList<QgsMapLayer*>::iterator layerIt = layers.begin();
-  for (; layerIt != layers.end(); ++layerIt )
+  for ( ; layerIt != layers.end(); ++layerIt )
   {
     QListWidgetItem* item = new QListWidgetItem(( *layerIt )->name(), listMapLayers );
     mItemLayerMap.insert( item, *layerIt );
-  } 
+  }
 }
 
 QgsComposerLegendLayersDialog::QgsComposerLegendLayersDialog(): QDialog( 0 )

diff --git a/src/app/gps/qgsgpsmarker.cpp b/src/app/gps/qgsgpsmarker.cpp
@@ -24,7 +24,7 @@
 
 
 QgsGpsMarker::QgsGpsMarker( QgsMapCanvas* mapCanvas )
-  : QgsMapCanvasItem( mapCanvas )
+    : QgsMapCanvasItem( mapCanvas )
 {
   mSize = 16;
   mWgs84CRS.createFromEpsg( 4326 );
@@ -38,14 +38,14 @@ void QgsGpsMarker::setSize( int theSize )
 void QgsGpsMarker::setCenter( const QgsPoint& point )
 {
   //transform to map crs
-  if( mMapCanvas && mMapCanvas->mapRenderer() )
+  if ( mMapCanvas && mMapCanvas->mapRenderer() )
   {
     QgsCoordinateTransform t( mWgs84CRS, mMapCanvas->mapRenderer()->destinationSrs() );
     try
     {
       mCenter = t.transform( point );
     }
-    catch( QgsCsException e ) //silently ignore transformation exceptions
+    catch ( QgsCsException e ) //silently ignore transformation exceptions
     {
       return;
     }
@@ -62,7 +62,7 @@ void QgsGpsMarker::setCenter( const QgsPoint& point )
 void QgsGpsMarker::paint( QPainter* p )
 {
   QSvgRenderer mySVG;
-  if( !mySVG.load( QString( ":/images/north_arrows/gpsarrow2.svg" ) ) )
+  if ( !mySVG.load( QString( ":/images/north_arrows/gpsarrow2.svg" ) ) )
   {
     qDebug( "GPS marker not found!" );
     return;

diff --git a/src/app/gps/qwtpolar/qwt_polar_itemdict.cpp b/src/app/gps/qwtpolar/qwt_polar_itemdict.cpp
@@ -28,7 +28,7 @@ class QwtPolarItemDict::PrivateData
           // for lists in Qt4. The implementation below
           // is slow, but there shouldn't be many plot items.
 
-	  // TODO add binary search
+          // TODO add binary search
 
 #if QT_VERSION < 0x040000
           QValueListIterator<QwtPolarItem *> it;

diff --git a/src/app/legend/qgslegendgroup.cpp b/src/app/legend/qgslegendgroup.cpp
@@ -25,7 +25,7 @@
 #include <QIcon>
 
 QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName )
-  : QgsLegendItem( theItem, theName )
+    : QgsLegendItem( theItem, theName )
 {
   mType = LEGEND_GROUP;
   setFlags( Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
@@ -34,7 +34,7 @@ QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName )
   setIcon( 0, myIcon );
 }
 QgsLegendGroup::QgsLegendGroup( QTreeWidget* theListView, QString theString )
-  : QgsLegendItem( theListView, theString )
+    : QgsLegendItem( theListView, theString )
 {
   mType = LEGEND_GROUP;
   setFlags( Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -550,7 +550,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   }
   else
   {
-    QgsDebugMsg( "Tips are disabled");
+    QgsDebugMsg( "Tips are disabled" );
   }
 
   //finally show all the application settings as initialised above
@@ -1893,7 +1893,7 @@ void QgisApp::createToolBars()
   mHelpToolBar->addAction( mActionHelpContents );
   mHelpToolBar->addAction( QWhatsThis::createAction() );
   mToolbarMenu->addAction( mHelpToolBar->toggleViewAction() );
-  
+
   //
   // Raster Toolbar
   mRasterToolBar = addToolBar( tr( "Raster" ) );
@@ -2050,18 +2050,18 @@ void QgisApp::setIconSizes( int size )
   //Set the icon size of for all the toolbars created in the future.
   setIconSize( QSize( size, size ) );
 
-    //Change all current icon sizes.
-    QList<QToolBar *> toolbars = findChildren<QToolBar *>();
-    foreach( QToolBar * toolbar, toolbars )
-    {
-      toolbar->setIconSize( QSize( size, size ) );
-    }
-    
-    QSet<QgsComposer*>::iterator composerIt = mPrintComposers.begin();
-    for ( ; composerIt != mPrintComposers.end(); ++composerIt )
-    {
-      ( *composerIt )->setIconSizes(size);
-    }
+  //Change all current icon sizes.
+  QList<QToolBar *> toolbars = findChildren<QToolBar *>();
+  foreach( QToolBar * toolbar, toolbars )
+  {
+    toolbar->setIconSize( QSize( size, size ) );
+  }
+
+  QSet<QgsComposer*>::iterator composerIt = mPrintComposers.begin();
+  for ( ; composerIt != mPrintComposers.end(); ++composerIt )
+  {
+    ( *composerIt )->setIconSizes( size );
+  }
 }
 
 void QgisApp::setTheme( QString theThemeName )
@@ -5525,22 +5525,22 @@ void QgisApp::localHistogramStretch()
   }
   if ( rlayer->drawingStyle() == QgsRasterLayer::SingleBandGray ||
        rlayer->drawingStyle() == QgsRasterLayer::MultiBandSingleBandGray
-    )
+     )
   {
     rlayer->setContrastEnhancementAlgorithm( "StretchToMinimumMaximum" );
     rlayer->setMinimumMaximumUsingLastExtent();
-    rlayer->setCacheImage(NULL);
+    rlayer->setCacheImage( NULL );
     //refreshLayerSymbology( rlayer->getLayerID() );
     mMapCanvas->refresh();
     return;
   }
   else
   {
     QMessageBox::information( this,
-      tr( "No Valid Raster Layer Selected" ),
-      tr( "To perform a local histogram stretch, you need to have a grayscale "
-        "(multiband single layer, or singleband grayscale) raster layer "
-        "selected." ) );
+                              tr( "No Valid Raster Layer Selected" ),
+                              tr( "To perform a local histogram stretch, you need to have a grayscale "
+                                  "(multiband single layer, or singleband grayscale) raster layer "
+                                  "selected." ) );
     return;
   }
 }

diff --git a/src/app/qgsdisplayangle.cpp b/src/app/qgsdisplayangle.cpp
@@ -27,10 +27,10 @@ QgsDisplayAngle::QgsDisplayAngle( QWidget * parent, Qt::WindowFlags f ): QDialog
   else
     mcbProjectionEnabled->setCheckState( Qt::Unchecked );
 
-  connect( mcbProjectionEnabled, SIGNAL( stateChanged(int) ),
-      this, SLOT( changeState() ) );
-  connect( mcbProjectionEnabled, SIGNAL( stateChanged(int) ), 
-      this, SIGNAL( changeProjectionEnabledState() ) );
+  connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ),
+           this, SLOT( changeState() ) );
+  connect( mcbProjectionEnabled, SIGNAL( stateChanged( int ) ),
+           this, SIGNAL( changeProjectionEnabledState() ) );
 }
 
 QgsDisplayAngle::~QgsDisplayAngle()
@@ -65,7 +65,7 @@ void QgsDisplayAngle::changeState()
 {
   QSettings settings;
   if ( mcbProjectionEnabled->isChecked() )
-    settings.setValue( "/qgis/measure/projectionEnabled", 2);
+    settings.setValue( "/qgis/measure/projectionEnabled", 2 );
   else
-    settings.setValue( "/qgis/measure/projectionEnabled", 0);
+    settings.setValue( "/qgis/measure/projectionEnabled", 0 );
 }
diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h
@@ -34,7 +34,7 @@ class QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
 
   signals:
     void changeProjectionEnabledState();
-  
+
   private slots:
     void changeState();
 

diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h
@@ -28,7 +28,7 @@ class QgsMapRenderer;
 /**A dialog to enter data defined label attributes*/
 class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialogBase
 {
-  Q_OBJECT
+    Q_OBJECT
   public:
     QgsLabelPropertyDialog( const QString& layerId, int featureId, QgsMapRenderer* renderer, QWidget * parent = 0, Qt::WindowFlags f = 0 );
     ~QgsLabelPropertyDialog();
@@ -48,7 +48,7 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
     void on_mBufferColorButton_clicked();
     void on_mHaliComboBox_currentIndexChanged( const QString& text );
     void on_mValiComboBox_currentIndexChanged( const QString& text );
-    void on_mLabelTextLineEdit_textChanged ( const QString& text );
+    void on_mLabelTextLineEdit_textChanged( const QString& text );
 
   private:
     /**Sets activation / values to the gui elements depending on the label settings and feature values*/

diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
@@ -29,15 +29,15 @@
 
 
 QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas )
-  : QgsMapTool( canvas )
+    : QgsMapTool( canvas )
 {
   mCursor = Qt::ArrowCursor;
 }
 
 void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
 {
   QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( mCanvas );
-  if( vlayer == NULL )
+  if ( vlayer == NULL )
   {
     return;
   }

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -99,30 +99,30 @@ bool QgsCoordinateReferenceSystem::createFromId( const long theId, CrsType theTy
 bool QgsCoordinateReferenceSystem::createFromString( const QString theDefinition )
 {
   bool result = false;
-  QRegExp reCrsId("^(epsg|postgis|internal)\\:(\\d+)$",Qt::CaseInsensitive);
-  if( reCrsId.indexIn(theDefinition) == 0)
+  QRegExp reCrsId( "^(epsg|postgis|internal)\\:(\\d+)$", Qt::CaseInsensitive );
+  if ( reCrsId.indexIn( theDefinition ) == 0 )
   {
-      QString authName = reCrsId.cap(1).toLower();
-      CrsType type = InternalCrsId;
-      if( authName == "epsg" ) type = EpsgCrsId;
-      if( authName == "postgis" ) type = PostgisCrsId;
-      long id = reCrsId.cap(2).toLong();
-      result = createFromId(id,type);
+    QString authName = reCrsId.cap( 1 ).toLower();
+    CrsType type = InternalCrsId;
+    if ( authName == "epsg" ) type = EpsgCrsId;
+    if ( authName == "postgis" ) type = PostgisCrsId;
+    long id = reCrsId.cap( 2 ).toLong();
+    result = createFromId( id, type );
   }
   else
   {
-      QRegExp reCrsStr("^(?:(wkt|proj4)\\:)?(.+)$",Qt::CaseInsensitive);
-      if( reCrsStr.indexIn(theDefinition) == 0 )
+    QRegExp reCrsStr( "^(?:(wkt|proj4)\\:)?(.+)$", Qt::CaseInsensitive );
+    if ( reCrsStr.indexIn( theDefinition ) == 0 )
+    {
+      if ( reCrsStr.cap( 1 ).toLower() == "proj4" )
       {
-          if( reCrsStr.cap(1).toLower() == "proj4" )
-          {
-             result = createFromProj4(reCrsStr.cap(2));
-          }
-          else
-          {
-              result = createFromWkt(reCrsStr.cap(2));
-          }
+        result = createFromProj4( reCrsStr.cap( 2 ) );
       }
+      else
+      {
+        result = createFromWkt( reCrsStr.cap( 2 ) );
+      }
+    }
   }
   return result;
 }

diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -57,7 +57,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
     ~QgsCoordinateReferenceSystem();
 
     /*!
-     * Constructs a CRS object from a string definition as defined in the createFromString 
+     * Constructs a CRS object from a string definition as defined in the createFromString
      * member function (by default a WKT definition).
      * @param theDefinition A String containing a coordinate reference system definition.
      */
@@ -162,7 +162,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
      * @return bool TRUE if sucess else false
      */
     bool createFromProj4( const QString theProjString );
-    
+
     /*! Set up this srs from a string definition, by default a WKT definition.  Otherwise
      * the string defines a authority, followed by a colon, followed by the definition.
      * The authority can be one of "epsg", "postgis", "internal" for integer definitions,

diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -235,13 +235,13 @@ void QgsMapRenderer::render( QPainter* painter )
   }
 
   // wait
-  if( mDrawing )
+  if ( mDrawing )
   {
     QgsDebugMsg( "already rendering" );
     QCoreApplication::processEvents();
   }
 
-  if( mDrawing )
+  if ( mDrawing )
   {
     QgsDebugMsg( "still rendering - skipping" );
     return;
@@ -381,7 +381,7 @@ void QgsMapRenderer::render( QPainter* painter )
         split = splitLayersExtent( ml, r1, r2 );
         ct = new QgsCoordinateTransform( ml->srs(), *mDestCRS );
         mRenderContext.setExtent( r1 );
-        if( !r1.isFinite() || !r2.isFinite() ) //there was a problem transforming the extent. Skip the layer
+        if ( !r1.isFinite() || !r2.isFinite() ) //there was a problem transforming the extent. Skip the layer
         {
           continue;
         }

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -578,7 +578,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
 
   if ( distance != 0 )
   {
-    if( distInMapUnits ) //convert distance from mm/map units to pixels
+    if ( distInMapUnits ) //convert distance from mm/map units to pixels
     {
       distance /= context.mapToPixel().mapUnitsPerPixel();
     }

diff --git a/src/core/spatialindex/include/Tools.h b/src/core/spatialindex/include/Tools.h
@@ -316,7 +316,7 @@ namespace Tools
 
     // since all base classes are interfaces (there is no state involved) all
     // inheritance can be virtual for efficiency.
-  interface IShape : public virtual ISerializable
+    interface IShape : public virtual ISerializable
     {
     public:
       virtual bool intersectsShape( const IShape& in ) const = 0;
@@ -332,7 +332,7 @@ namespace Tools
 
     // since all base classes are interfaces (there is no state involved) all
     // inheritance can be virtual for efficiency.
-  interface ITimeShape : public virtual IShape, public virtual IInterval
+    interface ITimeShape : public virtual IShape, public virtual IInterval
     {
     public:
       virtual bool intersectsShapeInTime( const ITimeShape& in ) const = 0;
@@ -350,7 +350,7 @@ namespace Tools
 
     // since all base classes are interfaces (there is no state involved) all
     // inheritance can be virtual for efficiency.
-  interface IEvolvingShape : public virtual IShape
+    interface IEvolvingShape : public virtual IShape
     {
     public:
       virtual void getVMBR( Region& out ) const = 0;