[QGIS Commit] r12601 - in trunk/qgis: src/analysis/interpolation
src/app src/app/composer src/core/raster src/core/renderer
src/helpviewer src/plugins/gps_importer src/providers/gpx
tests/src/core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Dec 23 11:41:24 EST 2009
Author: jef
Date: 2009-12-23 11:41:22 -0500 (Wed, 23 Dec 2009)
New Revision: 12601
Modified:
trunk/qgis/src/analysis/interpolation/Vector3D.h
trunk/qgis/src/app/composer/qgscomposer.cpp
trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp
trunk/qgis/src/app/main.cpp
trunk/qgis/src/app/qgisappinterface.cpp
trunk/qgis/src/core/raster/qgsrastertransparency.cpp
trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h
trunk/qgis/src/helpviewer/main.cpp
trunk/qgis/src/helpviewer/qgshelpviewer.cpp
trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp
trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp
trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
trunk/qgis/tests/src/core/testqgsmaprenderer.cpp
trunk/qgis/tests/src/core/testqgsvectorfilewriter.cpp
Log:
automatic indentation update (r12177-r12600)
Modified: trunk/qgis/src/analysis/interpolation/Vector3D.h
===================================================================
--- trunk/qgis/src/analysis/interpolation/Vector3D.h 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/analysis/interpolation/Vector3D.h 2009-12-23 16:41:22 UTC (rev 12601)
@@ -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:
Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -440,10 +440,10 @@
//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();
Modified: trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/app/composer/qgscomposerpicturewidget.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -464,7 +464,7 @@
{
//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;
}
Modified: trunk/qgis/src/app/main.cpp
===================================================================
--- trunk/qgis/src/app/main.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/app/main.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -51,7 +51,7 @@
// 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 @@
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
Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/app/qgisappinterface.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -39,8 +39,8 @@
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()
Modified: trunk/qgis/src/core/raster/qgsrastertransparency.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrastertransparency.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/core/raster/qgsrastertransparency.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -105,7 +105,7 @@
//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 @@
//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];
Modified: trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h
===================================================================
--- trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h 2009-12-23 16:41:22 UTC (rev 12601)
@@ -63,8 +63,8 @@
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:
Modified: trunk/qgis/src/helpviewer/main.cpp
===================================================================
--- trunk/qgis/src/helpviewer/main.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/helpviewer/main.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -51,7 +51,7 @@
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();
}
Modified: trunk/qgis/src/helpviewer/qgshelpviewer.cpp
===================================================================
--- trunk/qgis/src/helpviewer/qgshelpviewer.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/helpviewer/qgshelpviewer.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -107,10 +107,10 @@
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,
Modified: trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -147,9 +147,9 @@
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 @@
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 );
}
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsdevice.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -58,9 +58,9 @@
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 @@
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 );
}
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -329,8 +329,8 @@
// 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;
Modified: trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
===================================================================
--- trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -301,7 +301,7 @@
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;
Modified: trunk/qgis/tests/src/core/testqgsmaprenderer.cpp
===================================================================
--- trunk/qgis/tests/src/core/testqgsmaprenderer.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/tests/src/core/testqgsmaprenderer.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -111,9 +111,9 @@
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
Modified: trunk/qgis/tests/src/core/testqgsvectorfilewriter.cpp
===================================================================
--- trunk/qgis/tests/src/core/testqgsvectorfilewriter.cpp 2009-12-23 16:14:24 UTC (rev 12600)
+++ trunk/qgis/tests/src/core/testqgsvectorfilewriter.cpp 2009-12-23 16:41:22 UTC (rev 12601)
@@ -267,9 +267,9 @@
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 @@
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
More information about the QGIS-commit
mailing list