automatic indentation update (r12177-r12600)

git-svn-id: http://svn.osgeo.org/qgis/trunk@12601 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 23, 2009 · b2c10ff · b2c10ff
1 parent e5cf709
commit b2c10ff
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 38 deletions.
diff --git a/src/analysis/interpolation/Vector3D.h b/src/analysis/interpolation/Vector3D.h
@@ -25,8 +25,8 @@
 
 class ANALYSIS_EXPORT Vector3D
     /**
-        Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programs.
-        */
+          Class Vector3D represents a 3D-Vector, capable to store x-,y- and z-coordinates in double values. In fact, the class is the same as Point3D. The name 'vector' makes it easier to understand the programs.
+          */
 
 {
   protected:

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -440,10 +440,10 @@ void QgsComposer::on_mActionRefreshView_triggered()
 
   //refresh preview of all composer maps
   QMap<QgsComposerItem*, QWidget*>::iterator it = mItemWidgetMap.begin();
-  for(; it != mItemWidgetMap.end(); ++it)
+  for ( ; it != mItemWidgetMap.end(); ++it )
   {
-    QgsComposerMap* map = dynamic_cast<QgsComposerMap*>(it.key());
-    if(map && !map->isDrawing())
+    QgsComposerMap* map = dynamic_cast<QgsComposerMap*>( it.key() );
+    if ( map && !map->isDrawing() )
     {
       map->cache();
       map->update();

diff --git a/src/app/composer/qgscomposerpicturewidget.cpp b/src/app/composer/qgscomposerpicturewidget.cpp
@@ -464,7 +464,7 @@ bool QgsComposerPictureWidget::testSvgFile( const QString& filename ) const
 {
   //QSvgRenderer crashes with some (non-svg) xml documents.
   //So at least we try to sort out the ones with different suffixes
-  if(!filename.endsWith(".svg"))
+  if ( !filename.endsWith( ".svg" ) )
   {
     return false;
   }

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -51,7 +51,7 @@ int _fmode = _O_BINARY;
 // Recommended method for doing this with msvc is with a call to _set_fmode
 // which is the first thing we do in main().
 // Similarly, with MinGW set _fmode in main().
-#endif	//_MSC_VER
+#endif  //_MSC_VER
 #else
 #include <getopt.h>
 #endif
@@ -236,13 +236,13 @@ void myMessageOutput( QtMsgType type, const char *msg )
 
 int main( int argc, char *argv[] )
 {
-#ifdef WIN32	// Windows
+#ifdef WIN32  // Windows
 #ifdef _MSC_VER
   _set_fmode( _O_BINARY );
-#else	//MinGW
+#else //MinGW
   _fmode = _O_BINARY;
-#endif	// _MSC_VER
-#endif	// WIN32
+#endif  // _MSC_VER
+#endif  // WIN32
 
 #ifndef _MSC_VER
   // Set up the custom qWarning/qDebug custom handler

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -39,8 +39,8 @@ QgisAppInterface::QgisAppInterface( QgisApp * _qgis )
            this, SIGNAL( currentLayerChanged( QgsMapLayer * ) ) );
   connect( qgis, SIGNAL( currentThemeChanged( QString ) ),
            this, SIGNAL( currentThemeChanged( QString ) ) );
-  connect( qgis, SIGNAL(composerAdded(QgsComposerView*)), this, SIGNAL(composerAdded( QgsComposerView* )));
-  connect( qgis, SIGNAL(composerWillBeRemoved(QgsComposerView*)), this, SIGNAL(composerWillBeRemoved(QgsComposerView*)));
+  connect( qgis, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) );
+  connect( qgis, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );
 }
 
 QgisAppInterface::~QgisAppInterface()

diff --git a/src/core/raster/qgsrastertransparency.cpp b/src/core/raster/qgsrastertransparency.cpp
@@ -105,7 +105,7 @@ int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparenc
 
   //Search through he transparency list looking for a match
   bool myTransparentPixelFound = false;
-  TransparentSingleValuePixel myTransparentPixel = {0,100};
+  TransparentSingleValuePixel myTransparentPixel = {0, 100};
   for ( int myListRunner = 0; myListRunner < mTransparentSingleValuePixelList.count(); myListRunner++ )
   {
     myTransparentPixel = mTransparentSingleValuePixelList[myListRunner];
@@ -143,7 +143,7 @@ int QgsRasterTransparency::alphaValue( double theRedValue, double theGreenValue,
 
   //Search through he transparency list looking for a match
   bool myTransparentPixelFound = false;
-  TransparentThreeValuePixel myTransparentPixel = {0,0,0,100};
+  TransparentThreeValuePixel myTransparentPixel = {0, 0, 0, 100};
   for ( int myListRunner = 0; myListRunner < mTransparentThreeValuePixelList.count(); myListRunner++ )
   {
     myTransparentPixel = mTransparentThreeValuePixelList[myListRunner];

diff --git a/src/core/renderer/qgsuniquevaluerenderer.h b/src/core/renderer/qgsuniquevaluerenderer.h
@@ -63,8 +63,8 @@ class CORE_EXPORT QgsUniqueValueRenderer: public QgsRenderer
     int classificationField() const;
     /**Return symbology items*/
     const QList<QgsSymbol*> symbols() const { return mSymbols.values(); }
-    /**Return the classification map 
-       @note added in 1.4 */ 
+    /**Return the classification map
+       @note added in 1.4 */
     const QMap<QString, QgsSymbol*> symbolMap() const { return mSymbols; }
     QgsRenderer* clone() const;
   protected:

diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -51,7 +51,7 @@ int main( int argc, char ** argv )
     myTranslationCode = QLocale::system().name();
 
     QSettings settings;
-    if( settings.value( "locale/overrideFlag", false ).toBool() )
+    if ( settings.value( "locale/overrideFlag", false ).toBool() )
     {
       myTranslationCode = settings.value( "locale/userLocale", "en_US" ).toString();
     }

diff --git a/src/helpviewer/qgshelpviewer.cpp b/src/helpviewer/qgshelpviewer.cpp
@@ -107,10 +107,10 @@ void QgsHelpViewer::loadContext( const QString &contextId )
     QString lang = QLocale::system().name();
 
     QSettings settings;
-    if( settings.value( "locale/overrideFlag", false ).toBool() )
+    if ( settings.value( "locale/overrideFlag", false ).toBool() )
     {
-       QLocale l( settings.value( "locale/userLocale", "en_US" ).toString() );
-       lang = l.name();
+      QLocale l( settings.value( "locale/userLocale", "en_US" ).toString() );
+      lang = l.name();
     }
     /*
      * If the language isn't set on the system, assume en_US,

diff --git a/src/plugins/gps_importer/qgsbabelformat.cpp b/src/plugins/gps_importer/qgsbabelformat.cpp
@@ -147,9 +147,9 @@ QStringList QgsBabelCommand::importCommand( const QString& babel,
     else if ( *iter == "%type" )
       copy.append( featuretype );
     else if ( *iter == "%in" )
-      copy.append( QString("\"%1\"").arg( input ) );
+      copy.append( QString( "\"%1\"" ).arg( input ) );
     else if ( *iter == "%out" )
-      copy.append( QString("\"%1\"").arg( output ) );
+      copy.append( QString( "\"%1\"" ).arg( output ) );
     else
       copy.append( *iter );
   }
@@ -171,9 +171,9 @@ QStringList QgsBabelCommand::exportCommand( const QString& babel,
     else if ( *iter == "%type" )
       copy.append( featuretype );
     else if ( *iter == "%in" )
-      copy.append( QString("\"%1\"").arg( input ) );
+      copy.append( QString( "\"%1\"" ).arg( input ) );
     else if ( *iter == "%out" )
-      copy.append( QString("\"%1\"").arg( output ) );
+      copy.append( QString( "\"%1\"" ).arg( output ) );
     else
       copy.append( *iter );
   }

diff --git a/src/plugins/gps_importer/qgsgpsdevice.cpp b/src/plugins/gps_importer/qgsgpsdevice.cpp
@@ -58,9 +58,9 @@ QStringList QgsGPSDevice::importCommand( const QString& babel,
     else if ( *iter == "%type" )
       copy.append( type );
     else if ( *iter == "%in" )
-      copy.append( QString( "\"%1\"").arg( in ) );
+      copy.append( QString( "\"%1\"" ).arg( in ) );
     else if ( *iter == "%out" )
-      copy.append( QString( "\"%1\"").arg( out ) );
+      copy.append( QString( "\"%1\"" ).arg( out ) );
     else
       copy.append( *iter );
   }
@@ -90,9 +90,9 @@ QStringList QgsGPSDevice::exportCommand( const QString& babel,
     else if ( *iter == "%type" )
       copy.append( type );
     else if ( *iter == "%in" )
-      copy.append( QString("\"%1\"").arg( in ) );
+      copy.append( QString( "\"%1\"" ).arg( in ) );
     else if ( *iter == "%out" )
-      copy.append( QString("\"%1\"").arg( out ) );
+      copy.append( QString( "\"%1\"" ).arg( out ) );
     else
       copy.append( *iter );
   }

diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -329,8 +329,8 @@ void QgsGPSPlugin::convertGPSFile( QString inputFileName,
 
   // try to start the gpsbabel process
   QStringList babelArgs;
-  babelArgs << mBabelPath << "-i" << "gpx" << "-f" << QString("\"%1\"").arg( inputFileName )
-  << convertStrings << "-o" << "gpx" << "-F" << QString("\"%1\"").arg( outputFileName );
+  babelArgs << mBabelPath << "-i" << "gpx" << "-f" << QString( "\"%1\"" ).arg( inputFileName )
+  << convertStrings << "-o" << "gpx" << "-F" << QString( "\"%1\"" ).arg( outputFileName );
   QgsDebugMsg( QString( "Conversion command: " ) + babelArgs.join( "|" ) );
 
   QProcess babelProcess;

diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
@@ -301,7 +301,7 @@ bool QgsGPXProvider::nextFeature( QgsFeature& feature )
       const QgsTrack* trk;
       trk = &( *mTrkIter );
 
-      QgsDebugMsg( QString("GPX feature track segments: %1").arg( trk->segments.size() ) );
+      QgsDebugMsg( QString( "GPX feature track segments: %1" ).arg( trk->segments.size() ) );
       if ( trk->segments.size() == 0 )
         continue;
 

diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
@@ -111,9 +111,9 @@ void TestQgsMapRenderer::initTestCase()
                                   QGis::WKBPolygon,
                                   &mCRS );
     double myInterval = 0.5;
-    for ( double i = -180.0;i <= 180.0;i += myInterval )
+    for ( double i = -180.0; i <= 180.0; i += myInterval )
     {
-      for ( double j = -90.0;j <= 90.0;j += myInterval )
+      for ( double j = -90.0; j <= 90.0; j += myInterval )
       {
         //
         // Create a polygon feature

diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp
@@ -267,9 +267,9 @@ void TestQgsVectorFileWriter::polygonGridTest()
                                 QGis::WKBPolygon,
                                 &mCRS );
   double myInterval = 5.0;
-  for ( double i = -180.0;i <= 180.0;i += myInterval )
+  for ( double i = -180.0; i <= 180.0; i += myInterval )
   {
-    for ( double j = -90.0;j <= 90.0;j += myInterval )
+    for ( double j = -90.0; j <= 90.0; j += myInterval )
     {
       //
       // Create a polygon feature
@@ -340,9 +340,9 @@ void TestQgsVectorFileWriter::projectedPlygonGridTest()
                                 QGis::WKBPolygon,
                                 &mCRS );
   double myInterval = 1000.0; //1km2
-  for ( double i = 0.0;i <= 10000.0;i += myInterval ) //10km
+  for ( double i = 0.0; i <= 10000.0; i += myInterval ) //10km
   {
-    for ( double j = 0.0;j <= 10000.0;j += myInterval )//10km
+    for ( double j = 0.0; j <= 10000.0; j += myInterval )//10km
     {
       //
       // Create a polygon feature