[QGIS Commit] r11371 - in trunk/qgis/src: app app/composer app/ogr
core core/composer core/renderer core/symbology plugins/grass
plugins/interpolation plugins/scale_bar providers/ogr
providers/osm providers/postgres
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Aug 14 05:20:24 EDT 2009
Author: jef
Date: 2009-08-14 05:20:23 -0400 (Fri, 14 Aug 2009)
New Revision: 11371
Modified:
trunk/qgis/src/app/composer/qgscomposerlabelwidget.cpp
trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp
trunk/qgis/src/app/composer/qgscompositionwidget.cpp
trunk/qgis/src/app/ogr/qgsopenvectorlayerdialog.cpp
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp
trunk/qgis/src/app/qgsmaptooladdvertex.h
trunk/qgis/src/app/qgsmaptooldeletepart.h
trunk/qgis/src/app/qgsmaptooldeletering.h
trunk/qgis/src/app/qgsmaptooldeletevertex.h
trunk/qgis/src/app/qgsmaptoolmovevertex.h
trunk/qgis/src/app/qgsmaptoolnodetool.cpp
trunk/qgis/src/app/qgsmeasuredialog.cpp
trunk/qgis/src/app/qgsmeasuredialog.h
trunk/qgis/src/app/qgsoptions.cpp
trunk/qgis/src/app/qgsprojectproperties.cpp
trunk/qgis/src/app/qgsprojectproperties.h
trunk/qgis/src/app/qgsuniquevaluedialog.cpp
trunk/qgis/src/app/qgsvectorlayerproperties.cpp
trunk/qgis/src/core/composer/qgscomposerlabel.cpp
trunk/qgis/src/core/composer/qgscomposerlabel.h
trunk/qgis/src/core/composer/qgscomposermap.cpp
trunk/qgis/src/core/qgis.h
trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
trunk/qgis/src/core/qgscoordinatereferencesystem.h
trunk/qgis/src/core/qgsexception.h
trunk/qgis/src/core/qgsgeometry.cpp
trunk/qgis/src/core/qgsmaplayer.cpp
trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp
trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
trunk/qgis/src/core/renderer/qgsrenderer.h
trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp
trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp
trunk/qgis/src/core/symbology/qgsmarkercatalogue.h
trunk/qgis/src/core/symbology/qgssymbol.cpp
trunk/qgis/src/core/symbology/qgssymbol.h
trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp
trunk/qgis/src/plugins/grass/qgsgrassattributes.h
trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodule.h
trunk/qgis/src/plugins/interpolation/Vector3D.h
trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp
trunk/qgis/src/plugins/scale_bar/plugin.cpp
trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
trunk/qgis/src/providers/ogr/qgsogrprovider.h
trunk/qgis/src/providers/osm/osmprovider.cpp
trunk/qgis/src/providers/osm/osmprovider.h
trunk/qgis/src/providers/osm/osmrenderer.cpp
trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
Log:
automatic indentation update (r11227-r11370)
Modified: trunk/qgis/src/app/composer/qgscomposerlabelwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerlabelwidget.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/composer/qgscomposerlabelwidget.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -50,9 +50,9 @@
if ( mComposerLabel )
{
bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
- // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
- QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), this, QString(), QFontDialog::DontUseNativeDialog );
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
+ // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
+ QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), this, QString(), QFontDialog::DontUseNativeDialog );
#else
QFont newFont = QFontDialog::getFont( &ok, mComposerLabel->font(), this );
#endif
Modified: trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -132,8 +132,8 @@
if ( mLegend )
{
bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
- // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
+ // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
QFont newFont = QFontDialog::getFont( &ok, mLegend->titleFont(), this, QString(), QFontDialog::DontUseNativeDialog );
#else
QFont newFont = QFontDialog::getFont( &ok, mLegend->titleFont() );
@@ -152,8 +152,8 @@
if ( mLegend )
{
bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
- // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
+ // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
QFont newFont = QFontDialog::getFont( &ok, mLegend->layerFont(), this, QString(), QFontDialog::DontUseNativeDialog );
#else
QFont newFont = QFontDialog::getFont( &ok, mLegend->layerFont() );
@@ -172,8 +172,8 @@
if ( mLegend )
{
bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
- // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
+#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && !defined(__LP64__)
+ // Native Mac dialog works only for 64 bit Cocoa (observed in Qt 4.5.2, probably a Qt bug)
QFont newFont = QFontDialog::getFont( &ok, mLegend->itemFont(), this, QString(), QFontDialog::DontUseNativeDialog );
#else
QFont newFont = QFontDialog::getFont( &ok, mLegend->itemFont() );
Modified: trunk/qgis/src/app/composer/qgscompositionwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscompositionwidget.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/composer/qgscompositionwidget.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -260,12 +260,12 @@
if ( mPaperUnitsComboBox->currentIndex() == 0 )
{
// mm
- le->setText( QString("%1").arg( v ) );
+ le->setText( QString( "%1" ).arg( v ) );
}
else
{
// inch (show width in inch)
- le->setText( QString("%1").arg( v / 25.4 ) );
+ le->setText( QString( "%1" ).arg( v / 25.4 ) );
}
}
Modified: trunk/qgis/src/app/ogr/qgsopenvectorlayerdialog.cpp
===================================================================
--- trunk/qgis/src/app/ogr/qgsopenvectorlayerdialog.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/ogr/qgsopenvectorlayerdialog.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -59,7 +59,7 @@
QgsDebugMsg( "Database drivers :" + QgsProviderRegistry::instance()->databaseDrivers() );
QStringList dbDrivers = QgsProviderRegistry::instance()->databaseDrivers().split( ";" );
- for ( int i = 0;i < dbDrivers.count();i++ )
+ for ( int i = 0; i < dbDrivers.count(); i++ )
{
QString dbDriver = dbDrivers.at( i );
if (( !dbDriver.isEmpty() ) && ( !dbDriver.isNull() ) )
@@ -68,7 +68,7 @@
//add directory drivers
QStringList dirDrivers = QgsProviderRegistry::instance()->directoryDrivers().split( ";" );
- for ( int i = 0;i < dirDrivers.count();i++ )
+ for ( int i = 0; i < dirDrivers.count(); i++ )
{
QString dirDriver = dirDrivers.at( i );
if (( !dirDriver.isEmpty() ) && ( !dirDriver.isNull() ) )
@@ -77,7 +77,7 @@
//add protocol drivers
QStringList proDrivers = QgsProviderRegistry::instance()->protocolDrivers().split( ";" );
- for ( int i = 0;i < proDrivers.count();i++ )
+ for ( int i = 0; i < proDrivers.count(); i++ )
{
QString proDriver = proDrivers.at( i );
if (( !proDriver.isEmpty() ) && ( !proDriver.isNull() ) )
@@ -284,7 +284,7 @@
//mType="file";
mDataSources = openFile();
filepath = "";
- for ( int i = 0;i < mDataSources.count();i++ )
+ for ( int i = 0; i < mDataSources.count(); i++ )
filepath += mDataSources.at( i ) + ";";
inputSrcDataset->setText( filepath );
}
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgisapp.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -2007,123 +2007,123 @@
abt->setVersion( versionString );
QString whatsNew = "<html><body>" ;
- whatsNew += "<h2>"+ tr( "Version" ) + " " + QString(QGis::QGIS_VERSION) + "</h2>";
+ whatsNew += "<h2>" + tr( "Version" ) + " " + QString( QGis::QGIS_VERSION ) + "</h2>";
whatsNew += "<h3>" + tr( "Whats new in Version 1.2.0?" ) + "</h3>"
- +
- "<p>"
- + tr("Please note that this is a release in our 'cutting edge' release series. As "
- "such it contains new features and extends the programmatic interface over "
- "QGIS 1.0.x and QGIS 1.1.0. If stability and long term support is more important to you "
- "then cool new and untested features, we recommend that you use a copy "
- "of QGIS from our stable 1.0.x release series.")
- +
- "</p><p>"
- +
- tr("This release includes over 140 bug fixes and enhancements "
- "over the QGIS 1.1.0 release. In addition we have added "
- "the following new features:")
- + "<pre>"
- + tr("Editing:\n"
-"\n"
-"Editing functionality in QGIS has had a major update in this release. This\n"
-"includes the addition of new vector editing tools:\n"
-"- delete part of multipart feature\n"
-"- delete hole from polygon\n"
-"- simplify feature\n"
-"- Added a new node tool (in advanced digitizing toolbar).\n"
-"- New functionality for merging features\n"
-"- Added undo/redo functionality for vector layer editing.\n"
-"- Added option to show only markers of selected features in editing mode.\n"
-"- Change layer's icon in legend to reflext that the layer is editable.\n"
-"\n"
-"In addition, there are undo/redo actions in Edit menu, in Advanced digitizing toolbar\n"
-"and there is a new dock widget displaying undo stack of active layer.\n"
-"\n"
-"About the node tool: It resembles a tool for editing paths by nodes that is\n"
-"present in every vector editor. How does it work (in QGIS)? Click on a\n"
-"feature, its nodes will be marked by small rectangles. Clicking and dragging a\n"
-"node moves it. Double clicking a segment will add a new node. Pressing delete\n"
-"key will remove active node. It's possible to select more active nodes at\n"
-"once: by clicking and dragging a rectangle. It's possible to select a segment's\n"
-"adjacent nodes by clicking on the segment. It's possible to add/remove active\n"
-"nodes by using Ctrl when clicking a node or dragging a rectangle\n"
-"\n"
-"We recommend that you turn off vertex markers in QGIS options when working with\n"
-"this tool: the redraws are much faster and the map is not cluttered with\n"
-"markers. \n"
-"\n"
-"Keyboard shortcuts:\n"
-"\n"
-"New feature: configure shortcuts for actions within main window of qgis!\n"
-"See menu Setting->Configure shortcuts\n"
-"\n"
-"Map Composer:\n"
-"\n"
-"It is now possible to lock/unlock composer item positions by right mouse click.\n"
-"The width and height of the composer map will now remain fixed if user sets the\n"
-"composer map extent to the map canvas extent. possibility to display\n"
-"current date in composer label by typing (d 'June' yyyy) or similar.\n"
-"It is now possible to keep the current layers in a composer map even if further\n"
-"layers are added to the main map. Export to PDF in composer is now possible.\n"
-"\n"
-"Attribute tables:\n"
-"\n"
-"It is now possible to search the attribute table within selected records only.\n"
-"General speedups have been made on the attribute table. Setting of field width\n"
-"and precision when adding attributes is now possible. Handling of attribute\n"
-"types in WFS provider has bee improved.\n"
-"\n"
-"Attribute aliases for vector layers are now available. The aliases are shown\n"
-"instead of the original field names in the info tool and attribute table to\n"
-"make things easier for end users. There is now a GUI for setting edit widgets\n"
-"for layer attributes. A new dialog allows loading a value map from a layer\n"
-"(could be non-spatial table too!). The edit widgets settings will also now\n"
-"be respected in the attribute table.\n"
-"\n"
-"Plugins:\n"
-"\n"
-"- The order of layers in the WMS dialog can now be changed.\n"
-"- The eVis plugin, version 1.1.0, has been added to the QGIS project and\n"
-" included as a standard plugin. More information about eVis can be found here:\n"
-" http://biodiversityinformatics.amnh.org/open_source/evis/documentation.php .\n"
-"- The interpolation plugin now has the ability to use line layers as constrains\n"
-" for triangulation in interpolation plugin. You can also now save the\n"
-" triangulation to shape file.\n"
-"- An new OpenStreetMap provider and plugin have been added to QGIS.\n"
-"\n"
-"Projects Management:\n"
-"\n"
-"QGIS now includes support for project relative position of file data sources\n"
-"and svgs. The saving of relative paths of file data sources is optional.\n"
-"\n"
-"PostGIS & the PostgreSQL Provider:\n"
-"\n"
-"You can now select the SSL mode when adding a new DB connection. Turning off\n"
-"SSL encryption can greatly improve performance of PostGIS data loading where\n"
-"connection security is not required. Support has been added for more native\n"
-"types and for setting of column comments.\n"
-"\n"
-"Symbology enhancements:\n"
-"\n"
-"- allow refresh of symbols via popup menu on the renderer's symbol selection\n"
-"- add support for data defined symbol(name)s\n"
-"- add support for font symbol markers (only data defined - no gui yet)\n"
-"- add symbol size in map units (ie. symbols that keep the size in mapunits\n"
-" independant of the mapscale)\n"
-"\n"
-"Command line arguments:\n"
-"\n"
-"Added command line argument support on windows.\n"
-"Enhancement of command line arguments:\n"
-"- allow given snapshot sizes\n"
-"- allow suppression of splash screen\n"
-"- capture map decorations from plugins on snapshots\n"
-"\n"
-"Grass:\n"
-"\n"
-"There is a new GRASS shell. Also there have been many cleanups and consistency\n"
-"updates.")
- + "</pre></body></html>";
+ +
+ "<p>"
+ + tr( "Please note that this is a release in our 'cutting edge' release series. As "
+ "such it contains new features and extends the programmatic interface over "
+ "QGIS 1.0.x and QGIS 1.1.0. If stability and long term support is more important to you "
+ "then cool new and untested features, we recommend that you use a copy "
+ "of QGIS from our stable 1.0.x release series." )
+ +
+ "</p><p>"
+ +
+ tr( "This release includes over 140 bug fixes and enhancements "
+ "over the QGIS 1.1.0 release. In addition we have added "
+ "the following new features:" )
+ + "<pre>"
+ + tr( "Editing:\n"
+ "\n"
+ "Editing functionality in QGIS has had a major update in this release. This\n"
+ "includes the addition of new vector editing tools:\n"
+ "- delete part of multipart feature\n"
+ "- delete hole from polygon\n"
+ "- simplify feature\n"
+ "- Added a new node tool (in advanced digitizing toolbar).\n"
+ "- New functionality for merging features\n"
+ "- Added undo/redo functionality for vector layer editing.\n"
+ "- Added option to show only markers of selected features in editing mode.\n"
+ "- Change layer's icon in legend to reflext that the layer is editable.\n"
+ "\n"
+ "In addition, there are undo/redo actions in Edit menu, in Advanced digitizing toolbar\n"
+ "and there is a new dock widget displaying undo stack of active layer.\n"
+ "\n"
+ "About the node tool: It resembles a tool for editing paths by nodes that is\n"
+ "present in every vector editor. How does it work (in QGIS)? Click on a\n"
+ "feature, its nodes will be marked by small rectangles. Clicking and dragging a\n"
+ "node moves it. Double clicking a segment will add a new node. Pressing delete\n"
+ "key will remove active node. It's possible to select more active nodes at\n"
+ "once: by clicking and dragging a rectangle. It's possible to select a segment's\n"
+ "adjacent nodes by clicking on the segment. It's possible to add/remove active\n"
+ "nodes by using Ctrl when clicking a node or dragging a rectangle\n"
+ "\n"
+ "We recommend that you turn off vertex markers in QGIS options when working with\n"
+ "this tool: the redraws are much faster and the map is not cluttered with\n"
+ "markers. \n"
+ "\n"
+ "Keyboard shortcuts:\n"
+ "\n"
+ "New feature: configure shortcuts for actions within main window of qgis!\n"
+ "See menu Setting->Configure shortcuts\n"
+ "\n"
+ "Map Composer:\n"
+ "\n"
+ "It is now possible to lock/unlock composer item positions by right mouse click.\n"
+ "The width and height of the composer map will now remain fixed if user sets the\n"
+ "composer map extent to the map canvas extent. possibility to display\n"
+ "current date in composer label by typing (d 'June' yyyy) or similar.\n"
+ "It is now possible to keep the current layers in a composer map even if further\n"
+ "layers are added to the main map. Export to PDF in composer is now possible.\n"
+ "\n"
+ "Attribute tables:\n"
+ "\n"
+ "It is now possible to search the attribute table within selected records only.\n"
+ "General speedups have been made on the attribute table. Setting of field width\n"
+ "and precision when adding attributes is now possible. Handling of attribute\n"
+ "types in WFS provider has bee improved.\n"
+ "\n"
+ "Attribute aliases for vector layers are now available. The aliases are shown\n"
+ "instead of the original field names in the info tool and attribute table to\n"
+ "make things easier for end users. There is now a GUI for setting edit widgets\n"
+ "for layer attributes. A new dialog allows loading a value map from a layer\n"
+ "(could be non-spatial table too!). The edit widgets settings will also now\n"
+ "be respected in the attribute table.\n"
+ "\n"
+ "Plugins:\n"
+ "\n"
+ "- The order of layers in the WMS dialog can now be changed.\n"
+ "- The eVis plugin, version 1.1.0, has been added to the QGIS project and\n"
+ " included as a standard plugin. More information about eVis can be found here:\n"
+ " http://biodiversityinformatics.amnh.org/open_source/evis/documentation.php .\n"
+ "- The interpolation plugin now has the ability to use line layers as constrains\n"
+ " for triangulation in interpolation plugin. You can also now save the\n"
+ " triangulation to shape file.\n"
+ "- An new OpenStreetMap provider and plugin have been added to QGIS.\n"
+ "\n"
+ "Projects Management:\n"
+ "\n"
+ "QGIS now includes support for project relative position of file data sources\n"
+ "and svgs. The saving of relative paths of file data sources is optional.\n"
+ "\n"
+ "PostGIS & the PostgreSQL Provider:\n"
+ "\n"
+ "You can now select the SSL mode when adding a new DB connection. Turning off\n"
+ "SSL encryption can greatly improve performance of PostGIS data loading where\n"
+ "connection security is not required. Support has been added for more native\n"
+ "types and for setting of column comments.\n"
+ "\n"
+ "Symbology enhancements:\n"
+ "\n"
+ "- allow refresh of symbols via popup menu on the renderer's symbol selection\n"
+ "- add support for data defined symbol(name)s\n"
+ "- add support for font symbol markers (only data defined - no gui yet)\n"
+ "- add symbol size in map units (ie. symbols that keep the size in mapunits\n"
+ " independant of the mapscale)\n"
+ "\n"
+ "Command line arguments:\n"
+ "\n"
+ "Added command line argument support on windows.\n"
+ "Enhancement of command line arguments:\n"
+ "- allow given snapshot sizes\n"
+ "- allow suppression of splash screen\n"
+ "- capture map decorations from plugins on snapshots\n"
+ "\n"
+ "Grass:\n"
+ "\n"
+ "There is a new GRASS shell. Also there have been many cleanups and consistency\n"
+ "updates." )
+ + "</pre></body></html>";
abt->setWhatsNew( whatsNew );
@@ -3334,9 +3334,9 @@
{
if ( ! QgsProject::instance()->read() )
{
- mMapCanvas->freeze( false );
- mMapCanvas->refresh();
- return;
+ mMapCanvas->freeze( false );
+ mMapCanvas->refresh();
+ return;
}
}
catch ( QgsProjectBadLayerException & e )
@@ -3368,7 +3368,7 @@
emit projectRead(); // let plug-ins know that we've read in a new
// project so that they can check any project
// specific plug-in state
-
+
// add this to the list of recently used project files
saveRecentProjectPath( fullPath, settings );
@@ -3405,7 +3405,7 @@
return false;
}
// Continue after last catch statement
-
+
}
catch ( QgsProjectBadLayerException & e )
{
@@ -3456,14 +3456,14 @@
QColor myColor = QColor( myRedInt, myGreenInt, myBlueInt );
mMapCanvas->setCanvasColor( myColor ); //this is fill colour before rendering starts
QgsDebugMsg( "Canvas background color restored..." );
-
+
mMapCanvas->updateScale();
QgsDebugMsg( "Scale restored..." );
-
+
emit projectRead(); // let plug-ins know that we've read in a new
// project so that they can check any project
// specific plug-in state
-
+
// add this to the list of recently used project files
QSettings settings;
saveRecentProjectPath( projectFile, settings );
Modified: trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -90,7 +90,7 @@
//display the classification field
QString classfield = "";
- for ( std::map<QString, int>::iterator it = mFieldMap.begin();it != mFieldMap.end();++it )
+ for ( std::map<QString, int>::iterator it = mFieldMap.begin(); it != mFieldMap.end(); ++it )
{
if ( it->second == renderer->classificationField() )
{
@@ -102,7 +102,7 @@
numberofclassesspinbox->setValue( list.size() );
//fill the items of the renderer into mValues
- for ( QList<QgsSymbol*>::iterator it = list.begin();it != list.end();++it )
+ for ( QList<QgsSymbol*>::iterator it = list.begin(); it != list.end(); ++it )
{
//todo: make an assignment operator and a copy constructor for QgsSymbol
QString classbreak = ( *it )->lowerValue() + " - " + ( *it )->upperValue();
@@ -187,7 +187,7 @@
//
// Now the class breaks
//
- for ( int item = 0;item < mClassListWidget->count();++item )
+ for ( int item = 0; item < mClassListWidget->count(); ++item )
{
QString classbreak = mClassListWidget->item( item )->text();
std::map<QString, QgsSymbol*>::iterator it = mEntries.find( classbreak );
@@ -268,7 +268,7 @@
double maximum = 0;
//delete all previous entries
- for ( std::map<QString, QgsSymbol*>::iterator it = mEntries.begin();it != mEntries.end();++it )
+ for ( std::map<QString, QgsSymbol*>::iterator it = mEntries.begin(); it != mEntries.end(); ++it )
{
delete it->second;
}
@@ -366,7 +366,7 @@
else if ( modeComboBox->currentText() == tr( "Equal Interval" ) )
{
std::list<QgsSymbol*>::const_iterator symbol_it = symbolList.begin();
- for ( int i = 0;i < numberofclassesspinbox->value();++i )
+ for ( int i = 0; i < numberofclassesspinbox->value(); ++i )
{
//switch if attribute is int or double
double lower = minimum + ( maximum - minimum ) / numberofclassesspinbox->value() * i;
@@ -388,7 +388,7 @@
else if ( modeComboBox->currentText() == tr( "Empty" ) )
{
std::list<QgsSymbol*>::const_iterator symbol_it = symbolList.begin();
- for ( int i = 0;i < numberofclassesspinbox->value();++i )
+ for ( int i = 0; i < numberofclassesspinbox->value(); ++i )
{
listBoxText = "Empty" + QString::number( i + 1 );
QListWidgetItem * mypItem = new QListWidgetItem( listBoxText );
Modified: trunk/qgis/src/app/qgsmaptooladdvertex.h
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdvertex.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmaptooladdvertex.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -25,7 +25,7 @@
/**Map tool to add vertices to line/polygon features*/
class QgsMapToolAddVertex: public QgsMapToolVertexEdit
{
- Q_OBJECT
+ Q_OBJECT
public:
QgsMapToolAddVertex( QgsMapCanvas* canvas );
Modified: trunk/qgis/src/app/qgsmaptooldeletepart.h
===================================================================
--- trunk/qgis/src/app/qgsmaptooldeletepart.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmaptooldeletepart.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -23,7 +23,7 @@
/**Map tool to delete vertices from line/polygon features*/
class QgsMapToolDeletePart: public QgsMapToolVertexEdit
{
- Q_OBJECT
+ Q_OBJECT
public:
QgsMapToolDeletePart( QgsMapCanvas* canvas );
Modified: trunk/qgis/src/app/qgsmaptooldeletering.h
===================================================================
--- trunk/qgis/src/app/qgsmaptooldeletering.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmaptooldeletering.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -23,7 +23,7 @@
class QgsMapToolDeleteRing : public QgsMapToolVertexEdit
{
- Q_OBJECT
+ Q_OBJECT
public:
QgsMapToolDeleteRing( QgsMapCanvas* canvas );
Modified: trunk/qgis/src/app/qgsmaptooldeletevertex.h
===================================================================
--- trunk/qgis/src/app/qgsmaptooldeletevertex.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmaptooldeletevertex.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -25,7 +25,7 @@
class QgsMapToolDeleteVertex: public QgsMapToolVertexEdit
{
- Q_OBJECT
+ Q_OBJECT
public:
QgsMapToolDeleteVertex( QgsMapCanvas* canvas );
Modified: trunk/qgis/src/app/qgsmaptoolmovevertex.h
===================================================================
--- trunk/qgis/src/app/qgsmaptoolmovevertex.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmaptoolmovevertex.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -26,7 +26,7 @@
/**A maptool to move vertices of line or polygon fetures*/
class QgsMapToolMoveVertex: public QgsMapToolVertexEdit
{
- Q_OBJECT
+ Q_OBJECT
public:
QgsMapToolMoveVertex( QgsMapCanvas* canvas );
Modified: trunk/qgis/src/app/qgsmaptoolnodetool.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolnodetool.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmaptoolnodetool.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -757,14 +757,14 @@
{
//cleanup rubber bands and list
QList<QgsRubberBand*>::iterator rb_it = mQgsRubberBands.begin();
- for ( ;rb_it != mQgsRubberBands.end(); ++rb_it )
+ for ( ; rb_it != mQgsRubberBands.end(); ++rb_it )
{
delete *rb_it;
}
mQgsRubberBands.clear();
rb_it = mTopologyRubberBand.begin();
- for ( ;rb_it != mTopologyRubberBand.end(); ++rb_it )
+ for ( ; rb_it != mTopologyRubberBand.end(); ++rb_it )
{
delete *rb_it;
}
@@ -1302,7 +1302,7 @@
void SelectionFeature::deselectAllVertexes()
{
- for ( int i = 0; i < mVertexMap.size() ;i++ )
+ for ( int i = 0; i < mVertexMap.size() ; i++ )
{
mVertexMap[i].selected = false;
mVertexMap[i].vertexMarker->setColor( Qt::red );
@@ -1345,7 +1345,7 @@
void SelectionFeature::updateVertexMarkersPosition( QgsMapCanvas* canvas )
{
//function for on-line updating vertex markers without refresh of canvas
- for ( int i = 0; i < mVertexMap.size() ;i++ )
+ for ( int i = 0; i < mVertexMap.size() ; i++ )
{
mVertexMap[i].vertexMarker->setCenter( mCanvas->mapRenderer()->layerToMapCoordinates( mVlayer, mVertexMap[i].point ) );
mVertexMap[i].vertexMarker->update();
Modified: trunk/qgis/src/app/qgsmeasuredialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsmeasuredialog.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmeasuredialog.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -197,7 +197,7 @@
{
double dummy = 1.0;
QGis::UnitType myDisplayUnits;
- // The dummy distance is ignored
+ // The dummy distance is ignored
convertMeasurement( dummy, myDisplayUnits, false );
switch ( myDisplayUnits )
@@ -228,15 +228,15 @@
}
-void QgsMeasureDialog::convertMeasurement(double &measure, QGis::UnitType &u, bool isArea)
+void QgsMeasureDialog::convertMeasurement( double &measure, QGis::UnitType &u, bool isArea )
{
// Helper for converting between meters and feet
// The parameter &u is out only...
-
+
QGis::UnitType myUnits = mTool->canvas()->mapUnits();
- if ( (myUnits == QGis::Degrees || myUnits == QGis::Feet ) &&
- mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() != "NONE" &&
- mTool->canvas()->mapRenderer()->distanceArea()->hasCrsTransformEnabled() )
+ if (( myUnits == QGis::Degrees || myUnits == QGis::Feet ) &&
+ mTool->canvas()->mapRenderer()->distanceArea()->ellipsoid() != "NONE" &&
+ mTool->canvas()->mapRenderer()->distanceArea()->hasCrsTransformEnabled() )
{
// Measuring on an ellipsoid returns meters, and so does using projections???
myUnits = QGis::Meters;
@@ -245,7 +245,7 @@
// Get the units for display
QSettings settings;
- QString myDisplayUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters").toString();
+ QString myDisplayUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters" ).toString();
// Only convert between meters and feet
if ( myUnits == QGis::Meters && myDisplayUnitsTxt == "feet" )
@@ -270,6 +270,6 @@
QgsDebugMsg( QString( "to %1 meters" ).arg( QString::number( measure ) ) );
myUnits = QGis::Meters;
}
-
+
u = myUnits;
}
Modified: trunk/qgis/src/app/qgsmeasuredialog.h
===================================================================
--- trunk/qgis/src/app/qgsmeasuredialog.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsmeasuredialog.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -74,7 +74,7 @@
void updateUi();
//! Converts the measurement, depending on settings in options and current transformation
- void convertMeasurement(double &measure, QGis::UnitType &u, bool isArea);
+ void convertMeasurement( double &measure, QGis::UnitType &u, bool isArea );
double mTotal;
Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsoptions.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -115,15 +115,17 @@
cmbEllipsoid->setItemText( cmbEllipsoid->currentIndex(), getEllipsoidName( myEllipsoidId ) );
// Set the units for measuring
- QString myUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters").toString();
+ QString myUnitsTxt = settings.value( "/qgis/measure/displayunits", "meters" ).toString();
if ( myUnitsTxt == "feet" )
{
radFeet->setChecked( true );
- } else {
+ }
+ else
+ {
radMeters->setChecked( true );
}
-
+
// add the themes to the combo box on the option dialog
QDir myThemeDir( QgsApplication::pkgDataPath() + "/themes/" );
myThemeDir.setFilter( QDir::Dirs );
Modified: trunk/qgis/src/app/qgsprojectproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsprojectproperties.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -124,8 +124,8 @@
bool layerIdListOk, enabledListOk, toleranceListOk, toleranceUnitListOk, snapToListOk;
QStringList layerIdList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingList", &layerIdListOk );
QStringList enabledList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingEnabledList", &enabledListOk );
- QStringList toleranceList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingToleranceList", & toleranceListOk);
- QStringList toleranceUnitList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingToleranceUnitList", & toleranceUnitListOk);
+ QStringList toleranceList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingToleranceList", & toleranceListOk );
+ QStringList toleranceUnitList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnappingToleranceUnitList", & toleranceUnitListOk );
QStringList snapToList = QgsProject::instance()->readListEntry( "Digitizing", "/LayerSnapToList", &snapToListOk );
QStringList::const_iterator idIter = layerIdList.constBegin();
@@ -139,7 +139,7 @@
//create the new layer entries
for ( ; idIter != layerIdList.constEnd(); ++idIter, ++enabledIter, ++tolIter, ++tolUnitIter, ++snapToIter )
{
- if(layerIdListOk)
+ if ( layerIdListOk )
{
currentLayer = QgsMapLayerRegistry::instance()->mapLayer( *idIter );
}
@@ -154,7 +154,7 @@
newEntry.layerName = currentLayer->name();
newEntry.checked = false;
- if(enabledListOk && enabledIter != enabledList.constEnd())
+ if ( enabledListOk && enabledIter != enabledList.constEnd() )
{
if (( *enabledIter ) == "enabled" )
{
@@ -163,7 +163,7 @@
}
//snap to vertex / segment / vertex and segment
- if(snapToListOk &&snapToIter != snapToList.constEnd())
+ if ( snapToListOk && snapToIter != snapToList.constEnd() )
{
if (( *snapToIter ) == "to_vertex" )
{
@@ -184,7 +184,7 @@
}
//snap tolerance
- if(toleranceListOk && tolIter != toleranceList.constEnd())
+ if ( toleranceListOk && tolIter != toleranceList.constEnd() )
{
newEntry.tolerance = tolIter->toDouble();
}
@@ -194,7 +194,7 @@
}
//snap tolerance unit
- if (toleranceUnitListOk && tolUnitIter != toleranceUnitList.constEnd())
+ if ( toleranceUnitListOk && tolUnitIter != toleranceUnitList.constEnd() )
{
newEntry.toleranceUnit = tolUnitIter->toInt();
}
@@ -432,7 +432,7 @@
}
}
-void QgsProjectProperties::on_cbxProjectionEnabled_stateChanged(int state)
+void QgsProjectProperties::on_cbxProjectionEnabled_stateChanged( int state )
{
btnGrpMapUnits->setEnabled( state == Qt::Unchecked );
}
Modified: trunk/qgis/src/app/qgsprojectproperties.h
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsprojectproperties.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -93,7 +93,7 @@
*/
void on_mSnappingOptionsPushButton_clicked();
- void on_cbxProjectionEnabled_stateChanged(int state);
+ void on_cbxProjectionEnabled_stateChanged( int state );
signals:
Modified: trunk/qgis/src/app/qgsuniquevaluedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsuniquevaluedialog.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsuniquevaluedialog.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -132,7 +132,7 @@
QgsUniqueValueRenderer *renderer = new QgsUniqueValueRenderer( mVectorLayer->geometryType() );
//go through mValues and add the entries to the renderer
- for ( QMap<QString, QgsSymbol*>::iterator it = mValues.begin();it != mValues.end();++it )
+ for ( QMap<QString, QgsSymbol*>::iterator it = mValues.begin(); it != mValues.end(); ++it )
{
QgsSymbol* symbol = it.value();
QgsSymbol* newsymbol = new QgsSymbol( mVectorLayer->geometryType(), symbol->lowerValue(), symbol->upperValue(), symbol->label() );
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -202,7 +202,7 @@
{
int index = -1;
QMap<int, QPushButton*>::iterator it = mButtonMap.begin();
- for ( ; it != mButtonMap.end() ;it++ )
+ for ( ; it != mButtonMap.end() ; it++ )
{
if ( it.value()->isDown() )
{
Modified: trunk/qgis/src/core/composer/qgscomposerlabel.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlabel.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/composer/qgscomposerlabel.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -66,11 +66,11 @@
QString QgsComposerLabel::displayText() const
{
QString displayText = mText;
- replaceDateText(displayText);
+ replaceDateText( displayText );
return displayText;
}
-void QgsComposerLabel::replaceDateText(QString& text) const
+void QgsComposerLabel::replaceDateText( QString& text ) const
{
int currentDatePos = text.indexOf( "$CURRENT_DATE" );
if ( currentDatePos != -1 )
Modified: trunk/qgis/src/core/composer/qgscomposerlabel.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlabel.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/composer/qgscomposerlabel.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -68,7 +68,7 @@
double mMargin;
/**Replaces replace '$CURRENT_DATE<(FORMAT)>' with the current date (e.g. $CURRENT_DATE(d 'June' yyyy)*/
- void replaceDateText(QString& text) const;
+ void replaceDateText( QString& text ) const;
};
#endif
Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -242,7 +242,7 @@
mDrawing = false;
}
- painter->setClipRect( thisPaintRect , Qt::NoClip);
+ painter->setClipRect( thisPaintRect , Qt::NoClip );
drawFrame( painter );
if ( isSelected() )
Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/qgis.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -120,7 +120,7 @@
inline bool doubleNear( double a, double b, double epsilon = 4 * DBL_EPSILON )
{
const double diff = a - b;
- return diff>-epsilon && diff<=epsilon;
+ return diff > -epsilon && diff <= epsilon;
}
/** Wkt string that represents a geographic coord sys */
Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -350,7 +350,7 @@
* have been set if this method has been delegated to from createFromWkt.
* Normally we wouldnt expect this to work, but its worth trying first
* as its quicker than methods below..
- */
+ */
long mySrsId = 0;
QgsCoordinateReferenceSystem::RecordMap myRecord;
@@ -448,21 +448,21 @@
// The srsid is not set, we should do that now.
if ( mIsValidFlag )
{
- myRecord = getRecord( "select * from tbl_srs where parameters='" + theProj4String.trimmed() + "'" );
- if ( !myRecord.empty() )
- {
- mySrsId = myRecord["srs_id"].toLong();
- QgsDebugMsg( "proj4string match search for srsid returned srsid: " + QString::number( mySrsId ) );
- if ( mySrsId > 0 )
- {
- createFromSrsId( mySrsId );
- }
- else
- {
- QgsDebugMsg( "Couldn't find newly added proj string?" );
- mIsValidFlag = false;
- }
- }
+ myRecord = getRecord( "select * from tbl_srs where parameters='" + theProj4String.trimmed() + "'" );
+ if ( !myRecord.empty() )
+ {
+ mySrsId = myRecord["srs_id"].toLong();
+ QgsDebugMsg( "proj4string match search for srsid returned srsid: " + QString::number( mySrsId ) );
+ if ( mySrsId > 0 )
+ {
+ createFromSrsId( mySrsId );
+ }
+ else
+ {
+ QgsDebugMsg( "Couldn't find newly added proj string?" );
+ mIsValidFlag = false;
+ }
+ }
}
}
}
@@ -508,7 +508,7 @@
QgsDebugMsg( "trying system srs.db" );
int myColumnCount = sqlite3_column_count( myPreparedStatement );
//loop through each column in the record adding its field name and vvalue to the map
- for ( int myColNo = 0;myColNo < myColumnCount;myColNo++ )
+ for ( int myColNo = 0; myColNo < myColumnCount; myColNo++ )
{
myFieldName = QString::fromUtf8(( char * )sqlite3_column_name( myPreparedStatement, myColNo ) );
myFieldValue = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, myColNo ) );
@@ -543,7 +543,7 @@
{
int myColumnCount = sqlite3_column_count( myPreparedStatement );
//loop through each column in the record adding its field name and vvalue to the map
- for ( int myColNo = 0;myColNo < myColumnCount;myColNo++ )
+ for ( int myColNo = 0; myColNo < myColumnCount; myColNo++ )
{
myFieldName = QString::fromUtf8(( char * )sqlite3_column_name( myPreparedStatement, myColNo ) );
myFieldValue = QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, myColNo ) );
@@ -1157,7 +1157,7 @@
/// Copied from QgsCustomProjectionDialog ///
/// Please refactor into SQL handler !!! ///
-bool QgsCoordinateReferenceSystem::saveAsUserCRS()
+bool QgsCoordinateReferenceSystem::saveAsUserCRS()
{
if ( ! mIsValidFlag )
@@ -1168,8 +1168,8 @@
QString mySql;
QString myName = QString( " * %1 (%2)" )
- .arg( QObject::tr( "Generated CRS", "A CRS automatically generated from layer info get this prefix for description" ))
- .arg( toProj4() );
+ .arg( QObject::tr( "Generated CRS", "A CRS automatically generated from layer info get this prefix for description" ) )
+ .arg( toProj4() );
//if this is the first record we need to ensure that its srs_id is 10000. For
//any rec after that sqlite3 will take care of the autonumering
@@ -1178,17 +1178,17 @@
if ( getRecordCount() == 0 )
{
mySql = QString( "insert into tbl_srs (srs_id,description,projection_acronym,ellipsoid_acronym,parameters,is_geo) " )
- + " values (" + QString::number( USER_CRS_START_ID ) + ",'"
- + sqlSafeString( myName ) + "','" + projectionAcronym()
- + "','" + ellipsoidAcronym() + "','" + sqlSafeString( toProj4() )
- + "',0)"; // <-- is_geo shamelessly hard coded for now
+ + " values (" + QString::number( USER_CRS_START_ID ) + ",'"
+ + sqlSafeString( myName ) + "','" + projectionAcronym()
+ + "','" + ellipsoidAcronym() + "','" + sqlSafeString( toProj4() )
+ + "',0)"; // <-- is_geo shamelessly hard coded for now
}
else
{
mySql = "insert into tbl_srs (description,projection_acronym,ellipsoid_acronym,parameters,is_geo) values ('"
- + sqlSafeString( myName ) + "','" + projectionAcronym()
- + "','" + ellipsoidAcronym() + "','" + sqlSafeString( toProj4() )
- + "',0)"; // <-- is_geo shamelessly hard coded for now
+ + sqlSafeString( myName ) + "','" + projectionAcronym()
+ + "','" + ellipsoidAcronym() + "','" + sqlSafeString( toProj4() )
+ + "',0)"; // <-- is_geo shamelessly hard coded for now
}
sqlite3 *myDatabase;
const char *myTail;
Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.h
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -387,7 +387,7 @@
//! Work out the projection units and set the appropriate local variable
void setMapUnits();
- //! Save the proj4-string as a custom CRS
+ //! Save the proj4-string as a custom CRS
bool saveAsUserCRS();
//! Helper for getting number of user CRS already in db
Modified: trunk/qgis/src/core/qgsexception.h
===================================================================
--- trunk/qgis/src/core/qgsexception.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/qgsexception.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -85,9 +85,9 @@
public:
QgsProjectBadLayerException( std::list<QDomNode> const & layers, QDomDocument const & doc = QDomDocument() )
- : QgsException( std::string( msg_ ) ),
- mBrokenLayers( layers ),
- mProjectDom ( doc )
+ : QgsException( std::string( msg_ ) ),
+ mBrokenLayers( layers ),
+ mProjectDom( doc )
{}
~QgsProjectBadLayerException() throw()
Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/qgsgeometry.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -727,7 +727,7 @@
unsigned char* ptr = mGeometry + 5;
int* npoints = ( int* )ptr;
ptr += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
tempx = ( double* )ptr;
ptr += sizeof( double );
@@ -770,11 +770,11 @@
int* nrings = ( int* )( mGeometry + 5 );
int* npoints;
unsigned char* ptr = mGeometry + 9;
- for ( int index = 0;index < *nrings;++index )
+ for ( int index = 0; index < *nrings; ++index )
{
npoints = ( int* )ptr;
ptr += sizeof( int );
- for ( int index2 = 0;index2 < *npoints;++index2 )
+ for ( int index2 = 0; index2 < *npoints; ++index2 )
{
tempx = ( double* )ptr;
ptr += sizeof( double );
@@ -819,7 +819,7 @@
unsigned char* ptr = mGeometry + 5;
int* npoints = ( int* )ptr;
ptr += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
ptr += ( 1 + sizeof( int ) ); //skip endian and point type
tempx = ( double* )ptr;
@@ -847,12 +847,12 @@
int* nlines = ( int* )ptr;
int* npoints = 0;
ptr += sizeof( int );
- for ( int index = 0;index < *nlines;++index )
+ for ( int index = 0; index < *nlines; ++index )
{
ptr += ( sizeof( int ) + 1 );
npoints = ( int* )ptr;
ptr += sizeof( int );
- for ( int index2 = 0;index2 < *npoints;++index2 )
+ for ( int index2 = 0; index2 < *npoints; ++index2 )
{
tempx = ( double* )ptr;
ptr += sizeof( double );
@@ -900,16 +900,16 @@
int* nrings;
int* npoints;
ptr += sizeof( int );
- for ( int index = 0;index < *npolys;++index )
+ for ( int index = 0; index < *npolys; ++index )
{
ptr += ( 1 + sizeof( int ) ); //skip endian and polygon type
nrings = ( int* )ptr;
ptr += sizeof( int );
- for ( int index2 = 0;index2 < *nrings;++index2 )
+ for ( int index2 = 0; index2 < *nrings; ++index2 )
{
npoints = ( int* )ptr;
ptr += sizeof( int );
- for ( int index3 = 0;index3 < *npoints;++index3 )
+ for ( int index3 = 0; index3 < *npoints; ++index3 )
{
tempx = ( double* )ptr;
ptr += sizeof( double );
@@ -2932,7 +2932,7 @@
{
int* npoints = ( int* )( &mGeometry[wkbPosition] );
wkbPosition += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
translateVertex( wkbPosition, dx, dy, hasZValue );
}
@@ -2947,11 +2947,11 @@
wkbPosition += sizeof( int );
int* npoints;
- for ( int index = 0;index < *nrings;++index )
+ for ( int index = 0; index < *nrings; ++index )
{
npoints = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index2 = 0;index2 < *npoints;++index2 )
+ for ( int index2 = 0; index2 < *npoints; ++index2 )
{
translateVertex( wkbPosition, dx, dy, hasZValue );
}
@@ -2965,7 +2965,7 @@
{
int* npoints = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
wkbPosition += ( sizeof( int ) + 1 );
translateVertex( wkbPosition, dx, dy, hasZValue );
@@ -2980,7 +2980,7 @@
int* nlines = ( int* )( &( mGeometry[wkbPosition] ) );
int* npoints = 0;
wkbPosition += sizeof( int );
- for ( int index = 0;index < *nlines;++index )
+ for ( int index = 0; index < *nlines; ++index )
{
wkbPosition += ( sizeof( int ) + 1 );
npoints = ( int* )( &( mGeometry[wkbPosition] ) );
@@ -3001,16 +3001,16 @@
int* nrings;
int* npoints;
wkbPosition += sizeof( int );
- for ( int index = 0;index < *npolys;++index )
+ for ( int index = 0; index < *npolys; ++index )
{
wkbPosition += ( 1 + sizeof( int ) ); //skip endian and polygon type
nrings = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index2 = 0;index2 < *nrings;++index2 )
+ for ( int index2 = 0; index2 < *nrings; ++index2 )
{
npoints = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index3 = 0;index3 < *npoints;++index3 )
+ for ( int index3 = 0; index3 < *npoints; ++index3 )
{
translateVertex( wkbPosition, dx, dy, hasZValue );
}
@@ -3058,7 +3058,7 @@
{
int* npoints = ( int* )( &mGeometry[wkbPosition] );
wkbPosition += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
transformVertex( wkbPosition, ct, hasZValue );
}
@@ -3073,11 +3073,11 @@
wkbPosition += sizeof( int );
int* npoints;
- for ( int index = 0;index < *nrings;++index )
+ for ( int index = 0; index < *nrings; ++index )
{
npoints = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index2 = 0;index2 < *npoints;++index2 )
+ for ( int index2 = 0; index2 < *npoints; ++index2 )
{
transformVertex( wkbPosition, ct, hasZValue );
}
@@ -3091,7 +3091,7 @@
{
int* npoints = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
wkbPosition += ( sizeof( int ) + 1 );
transformVertex( wkbPosition, ct, hasZValue );
@@ -3106,7 +3106,7 @@
int* nlines = ( int* )( &( mGeometry[wkbPosition] ) );
int* npoints = 0;
wkbPosition += sizeof( int );
- for ( int index = 0;index < *nlines;++index )
+ for ( int index = 0; index < *nlines; ++index )
{
wkbPosition += ( sizeof( int ) + 1 );
npoints = ( int* )( &( mGeometry[wkbPosition] ) );
@@ -3127,16 +3127,16 @@
int* nrings;
int* npoints;
wkbPosition += sizeof( int );
- for ( int index = 0;index < *npolys;++index )
+ for ( int index = 0; index < *npolys; ++index )
{
wkbPosition += ( 1 + sizeof( int ) ); //skip endian and polygon type
nrings = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index2 = 0;index2 < *nrings;++index2 )
+ for ( int index2 = 0; index2 < *nrings; ++index2 )
{
npoints = ( int* )( &( mGeometry[wkbPosition] ) );
wkbPosition += sizeof( int );
- for ( int index3 = 0;index3 < *npoints;++index3 )
+ for ( int index3 = 0; index3 < *npoints; ++index3 )
{
transformVertex( wkbPosition, ct, hasZValue );
}
@@ -3736,7 +3736,7 @@
ringNumPoints[idx] = *nPoints;
ptr += 4;
- for ( jdx = 0;jdx < *nPoints;jdx++ )
+ for ( jdx = 0; jdx < *nPoints; jdx++ )
{
if ( jdx != 0 )
{
@@ -3773,7 +3773,7 @@
mWkt += "MULTIPOINT(";
nPoints = ( int* )( mGeometry + 5 );
ptr = mGeometry + 5 + sizeof( int );
- for ( idx = 0;idx < *nPoints;++idx )
+ for ( idx = 0; idx < *nPoints; ++idx )
{
ptr += ( 1 + sizeof( int ) );
if ( idx != 0 )
@@ -4582,8 +4582,8 @@
}
else
{
- minDistPoint.setX( *x1 + t * ( *x2 - *x1 ) );
- minDistPoint.setY( *y1 + t * ( *y2 - *y1 ) );
+ minDistPoint.setX( *x1 + t *( *x2 - *x1 ) );
+ minDistPoint.setY( *y1 + t *( *y2 - *y1 ) );
}
return ( minDistPoint.sqrDist( point ) );
@@ -4642,8 +4642,8 @@
minDistPoint.set( xn, yn );
return (
- ( xn - point.x() ) * ( xn - point.x() ) +
- ( yn - point.y() ) * ( yn - point.y() )
+ ( xn - point.x() ) *( xn - point.x() ) +
+ ( yn - point.y() ) *( yn - point.y() )
);
#endif //0
}
Modified: trunk/qgis/src/core/qgsmaplayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/qgsmaplayer.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -288,7 +288,7 @@
QFileInfo pfi( QgsProject::instance()->fileName() );
QgsDebugMsg( "project path: " + pfi.canonicalPath() );
QgsDebugMsg( "src path: " + srcInfo.canonicalFilePath() );
- if ( srcInfo.canonicalFilePath().startsWith( pfi.canonicalPath() + "/" ) ) // QFileInfo always uses '/' for directory separator.
+ if ( srcInfo.canonicalFilePath().startsWith( pfi.canonicalPath() + "/" ) ) // QFileInfo always uses '/' for directory separator.
{
src = src.mid( pfi.canonicalPath().size() + 1 );
QgsDebugMsg( "use relative path: " + src );
Modified: trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/renderer/qgscontinuouscolorrenderer.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -148,8 +148,8 @@
brush.setStyle( Qt::SolidPattern );
*img = QgsMarkerCatalogue::instance()->imageMarker( mMinimumSymbol->pointSymbolName(),
- mMinimumSymbol->pointSize() * renderContext.scaleFactor() * renderContext.rasterScaleFactor(),
- pen, brush, opacity );
+ mMinimumSymbol->pointSize() * renderContext.scaleFactor() * renderContext.rasterScaleFactor(),
+ pen, brush, opacity );
}
else if ( mGeometryType == QGis::Line )
Modified: trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/renderer/qgsgraduatedsymbolrenderer.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -166,7 +166,7 @@
theSymbol->setNamedPointSymbol( name );
}
*img = theSymbol->getPointSymbolAsImage( renderContext.scaleFactor(), selected, mSelectionColor, fieldScale,
- rotation, renderContext.rasterScaleFactor(), opacity );
+ rotation, renderContext.rasterScaleFactor(), opacity );
if ( !oldName.isNull() )
{
Modified: trunk/qgis/src/core/renderer/qgsrenderer.h
===================================================================
--- trunk/qgis/src/core/renderer/qgsrenderer.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/renderer/qgsrenderer.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -74,7 +74,7 @@
@note added in 1.2 */
void renderFeature( QgsRenderContext &renderContext, QgsFeature& f, QImage* pic, bool selected )
{
- renderFeature( renderContext, f, pic, selected, 1.0);
+ renderFeature( renderContext, f, pic, selected, 1.0 );
}
virtual void renderFeature( QgsRenderContext &renderContext, QgsFeature& f, QImage* pic, bool selected, double opacity ) = 0;
Modified: trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -68,7 +68,7 @@
QgsUniqueValueRenderer::~QgsUniqueValueRenderer()
{
- for ( QMap<QString, QgsSymbol*>::iterator it = mSymbols.begin();it != mSymbols.end();++it )
+ for ( QMap<QString, QgsSymbol*>::iterator it = mSymbols.begin(); it != mSymbols.end(); ++it )
{
delete it.value();
}
@@ -250,7 +250,7 @@
void QgsUniqueValueRenderer::clearValues()
{
- for ( QMap<QString, QgsSymbol*>::iterator it = mSymbols.begin();it != mSymbols.end();++it )
+ for ( QMap<QString, QgsSymbol*>::iterator it = mSymbols.begin(); it != mSymbols.end(); ++it )
{
delete it.value();
}
@@ -322,7 +322,7 @@
QDomText classificationfieldtxt = document.createTextNode( classificationFieldName );
classificationfield.appendChild( classificationfieldtxt );
uniquevalue.appendChild( classificationfield );
- for ( QMap<QString, QgsSymbol*>::const_iterator it = mSymbols.begin();it != mSymbols.end();++it )
+ for ( QMap<QString, QgsSymbol*>::const_iterator it = mSymbols.begin(); it != mSymbols.end(); ++it )
{
if ( !( it.value()->writeXML( uniquevalue, document, &vl ) ) )
{
Modified: trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/symbology/qgsmarkercatalogue.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -183,7 +183,7 @@
if ( fullName.startsWith( "hard:" ) )
{
- hardMarker( &myPainter, imageSize, fullName.mid( 5 ), size, pen, brush);
+ hardMarker( &myPainter, imageSize, fullName.mid( 5 ), size, pen, brush );
#ifdef IMAGEDEBUG
QgsDebugMsg( "*** Saving hard marker to hardMarker.png ***" );
#ifdef QGISDEBUG
@@ -196,7 +196,7 @@
return QImage(); // empty
}
-QPicture QgsMarkerCatalogue::pictureMarker( QString fullName, double size, QPen pen, QBrush brush, double opacity)
+QPicture QgsMarkerCatalogue::pictureMarker( QString fullName, double size, QPen pen, QBrush brush, double opacity )
{
//
Modified: trunk/qgis/src/core/symbology/qgsmarkercatalogue.h
===================================================================
--- trunk/qgis/src/core/symbology/qgsmarkercatalogue.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/symbology/qgsmarkercatalogue.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -43,7 +43,7 @@
/** Returns pixmap of the marker
* \param fullName full name, e.g. hard:circle, svg:/home/usr1/marker1.svg
*/
- QImage imageMarker( QString fullName, double size, QPen pen, QBrush brush, double opacity = 1.0);
+ QImage imageMarker( QString fullName, double size, QPen pen, QBrush brush, double opacity = 1.0 );
/** Returns qpicture of the marker
* \param fullName full name, e.g. hard:circle, svg:/home/usr1/marker1.svg
Modified: trunk/qgis/src/core/symbology/qgssymbol.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/symbology/qgssymbol.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -359,11 +359,11 @@
{
if ( selected )
{
- cache2( widthScale, selectionColor, opacity);
+ cache2( widthScale, selectionColor, opacity );
}
else
{
-
+
cache2( widthScale, mSelectionColor, opacity );
}
}
@@ -379,7 +379,7 @@
}
QImage QgsSymbol::getPointSymbolAsImage( double widthScale, bool selected, QColor selectionColor, double scale,
-double rotation, double rasterScaleFactor, double opacity )
+ double rotation, double rasterScaleFactor, double opacity )
{
if ( 1.0 == ( scale * rasterScaleFactor ) && 0 == rotation )
@@ -453,7 +453,7 @@
pen.setWidthF( widthScale * pen.widthF() );
mPointSymbolImage2 = QgsMarkerCatalogue::instance()->imageMarker( mPointSymbolName, mSize * widthScale,
- pen, mBrush, opacity);
+ pen, mBrush, opacity );
QBrush brush = mBrush;
brush.setColor( selectionColor );
Modified: trunk/qgis/src/core/symbology/qgssymbol.h
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/core/symbology/qgssymbol.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -108,9 +108,9 @@
/** Get QImage representation of point symbol with current settings
*/
virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.0,
- bool selected = false,
- QColor selectionColor = Qt::yellow,
- double opacity = 1.0);
+ bool selected = false,
+ QColor selectionColor = Qt::yellow,
+ double opacity = 1.0 );
/** Get QImage representation of point symbol with current settings
* and scaled (can be slow when scale != 1.0)
@@ -121,7 +121,7 @@
double scale = 1.0,
double rotation = 0.0,
double rasterScaleFactor = 1.0,
- double opacity = 1.0);
+ double opacity = 1.0 );
/**Writes the contents of the symbol to a configuration file
@ return true in case of success*/
@@ -203,7 +203,7 @@
void cache( QColor selectionColor );
/* Create point symbol mPointSymbolImage2 cache */
- void cache2( double widthScale, QColor selectionColor, double opacity);
+ void cache2( double widthScale, QColor selectionColor, double opacity );
/* mPointSymbolImage/mPointSymbolImage cache updated */
bool mCacheUpToDate;
Modified: trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/grass/qgsgrassattributes.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -352,11 +352,14 @@
settings.setValue( path, newSize );
}
-void QgsGrassAttributes::setCategoryMode(QgsGrassEdit::CatMode mode, const QString &cat)
+void QgsGrassAttributes::setCategoryMode( QgsGrassEdit::CatMode mode, const QString &cat )
{
- if (mode == QgsGrassEdit::CAT_MODE_NOCAT || (mode == QgsGrassEdit::CAT_MODE_MANUAL && cat.isEmpty())){
- newButton->setEnabled(false);
- } else {
- newButton->setEnabled(true);
- }
+ if ( mode == QgsGrassEdit::CAT_MODE_NOCAT || ( mode == QgsGrassEdit::CAT_MODE_MANUAL && cat.isEmpty() ) )
+ {
+ newButton->setEnabled( false );
+ }
+ else
+ {
+ newButton->setEnabled( true );
+ }
}
Modified: trunk/qgis/src/plugins/grass/qgsgrassattributes.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassattributes.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/grass/qgsgrassattributes.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -107,7 +107,7 @@
void clear();
//! Enable/disable buttons depending on the category mode
- void setCategoryMode(QgsGrassEdit::CatMode mode, const QString &cat);
+ void setCategoryMode( QgsGrassEdit::CatMode mode, const QString &cat );
private:
//! Pointer to vector provider
Modified: trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -917,5 +917,5 @@
e->mAttributes->raise();
}
- e->mAttributes->setCategoryMode(static_cast<QgsGrassEdit::CatMode>(e->mCatModeBox->currentIndex()), e->mCatEntry->text());
+ e->mAttributes->setCategoryMode( static_cast<QgsGrassEdit::CatMode>( e->mCatModeBox->currentIndex() ), e->mCatEntry->text() );
}
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -638,7 +638,7 @@
//! Uses region
bool mUsesRegion;
-
+
//! Required field
bool mRequired;
};
Modified: trunk/qgis/src/plugins/interpolation/Vector3D.h
===================================================================
--- trunk/qgis/src/plugins/interpolation/Vector3D.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/interpolation/Vector3D.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -24,7 +24,7 @@
#endif
class 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 programms.
*/
Modified: trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -212,7 +212,7 @@
currentWkbPtr += ( 1 + sizeof( int ) );
int* npoints = ( int* )currentWkbPtr;
currentWkbPtr += sizeof( int );
- for ( int index = 0;index < *npoints;++index )
+ for ( int index = 0; index < *npoints; ++index )
{
x = *(( double * )( currentWkbPtr ) );
currentWkbPtr += sizeof( double );
Modified: trunk/qgis/src/plugins/scale_bar/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/scale_bar/plugin.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/plugins/scale_bar/plugin.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -263,22 +263,22 @@
if ( myActualSize > 5280.0 ) //5280 feet to the mile
{
myScaleBarUnitLabel = tr( " miles" );
- // Adjust scale bar width to get even numbers
+ // Adjust scale bar width to get even numbers
myActualSize = myActualSize / 5000;
- myScaleBarWidth = ( myScaleBarWidth * 5280 ) / 5000;
+ myScaleBarWidth = ( myScaleBarWidth * 5280 ) / 5000;
}
else if ( myActualSize == 5280.0 ) //5280 feet to the mile
{
myScaleBarUnitLabel = tr( " mile" );
- // Adjust scale bar width to get even numbers
+ // Adjust scale bar width to get even numbers
myActualSize = myActualSize / 5000;
- myScaleBarWidth = ( myScaleBarWidth * 5280 ) / 5000;
+ myScaleBarWidth = ( myScaleBarWidth * 5280 ) / 5000;
}
else if ( myActualSize < 1 )
{
myScaleBarUnitLabel = tr( " inches" );
myActualSize = myActualSize * 10;
- myScaleBarWidth = ( myScaleBarWidth * 10 ) / 12;
+ myScaleBarWidth = ( myScaleBarWidth * 10 ) / 12;
}
else if ( myActualSize == 1.0 )
{
Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -273,7 +273,7 @@
OGR_L_ResetReading( ogrLayer );
}
- for ( int i = 0;i < OGR_FD_GetFieldCount( fdef );++i )
+ for ( int i = 0; i < OGR_FD_GetFieldCount( fdef ); ++i )
{
OGRFieldDefnH fldDef = OGR_FD_GetFieldDefn( fdef, i );
OGRFieldType ogrType = OGR_Fld_GetType( fldDef );
Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.h
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -30,7 +30,7 @@
*/
class QgsOgrProvider : public QgsVectorDataProvider
{
- Q_OBJECT
+ Q_OBJECT
public:
Modified: trunk/qgis/src/providers/osm/osmprovider.cpp
===================================================================
--- trunk/qgis/src/providers/osm/osmprovider.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/providers/osm/osmprovider.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -532,7 +532,7 @@
case UserAttr:
feature.addAttribute( UserAttr, QString::fromUtf8( selUser ) ); break;
case TagAttr:
- feature.addAttribute(TagAttr, tagsForObject("node",selId));
+ feature.addAttribute( TagAttr, tagsForObject( "node", selId ) );
break;
default: // suppose it's a custom tag
@@ -645,7 +645,7 @@
feature.addAttribute( UserAttr, QString::fromUtf8( selUser ) );
break;
case TagAttr:
- feature.addAttribute(TagAttr, tagsForObject("way",selId));
+ feature.addAttribute( TagAttr, tagsForObject( "way", selId ) );
break;
default: // suppose it's a custom tag
if ( *iter >= CustomTagAttr && *iter < CustomTagAttr + mCustomTagsList.count() )
Modified: trunk/qgis/src/providers/osm/osmprovider.h
===================================================================
--- trunk/qgis/src/providers/osm/osmprovider.h 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/providers/osm/osmprovider.h 2009-08-14 09:20:23 UTC (rev 11371)
@@ -28,13 +28,13 @@
enum { PointType, LineType, PolygonType } mFeatureType;
//! supported feature attributes
- enum Attribute { TimestampAttr=0, UserAttr=1, TagAttr, CustomTagAttr };
+ enum Attribute { TimestampAttr = 0, UserAttr = 1, TagAttr, CustomTagAttr };
//! supported feature attributes
static const char* attr[];
//! constant that helps to set default map extent
- const static int DEFAULT_EXTENT=100;
+ const static int DEFAULT_EXTENT = 100;
//! absolute name of input OSM file
QString mFileName;
@@ -233,7 +233,7 @@
* @param mFileName name of input OSM file
* @return answer to that question
*/
- bool isDatabaseCompatibleWithInput(QString mFileName);
+ bool isDatabaseCompatibleWithInput( QString mFileName );
/**
* Finds out if database and provider versions are compatible.
@@ -369,7 +369,7 @@
* @param id feature identifier
* @return string of tags concatenation
*/
- QString tagsForObject(const char* type, int id);
+ QString tagsForObject( const char* type, int id );
/**
* Function returns one tag value of specified feature and specified key.
@@ -378,6 +378,6 @@
* @param tagKey tag key
* @return tag value
*/
- QString tagForObject(const char* type, int id, QString tagKey);
+ QString tagForObject( const char* type, int id, QString tagKey );
};
Modified: trunk/qgis/src/providers/osm/osmrenderer.cpp
===================================================================
--- trunk/qgis/src/providers/osm/osmrenderer.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/providers/osm/osmrenderer.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -117,7 +117,7 @@
else if ( mGeomType == QGis::Point )
{
*pic = osmstyle.get_image( tags );
- p->setOpacity( opacity );
+ p->setOpacity( opacity );
}
}
Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2009-08-14 09:16:16 UTC (rev 11370)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp 2009-08-14 09:20:23 UTC (rev 11371)
@@ -2184,7 +2184,7 @@
{
connectionRW->PQexecNR( "BEGIN" );
- for ( QgsFeatureIds::const_iterator it = id.begin();it != id.end();++it )
+ for ( QgsFeatureIds::const_iterator it = id.begin(); it != id.end(); ++it )
{
QString sql = QString( "DELETE FROM %1 WHERE %2" )
.arg( mSchemaTableName ).arg( whereClause( *it ) );
@@ -2222,7 +2222,7 @@
{
connectionRW->PQexecNR( "BEGIN" );
- for ( QList<QgsField>::const_iterator iter = attributes.begin();iter != attributes.end();++iter )
+ for ( QList<QgsField>::const_iterator iter = attributes.begin(); iter != attributes.end(); ++iter )
{
QString type = iter->typeName();
if ( type == "char" || type == "varchar" )
@@ -2283,7 +2283,7 @@
{
connectionRW->PQexecNR( "BEGIN" );
- for ( QgsAttributeIds::const_iterator iter = ids.begin();iter != ids.end();++iter )
+ for ( QgsAttributeIds::const_iterator iter = ids.begin(); iter != ids.end(); ++iter )
{
QgsFieldMap::const_iterator field_it = attributeFields.find( *iter );
if ( field_it == attributeFields.constEnd() )
@@ -2329,7 +2329,7 @@
connectionRW->PQexecNR( "BEGIN" );
// cycle through the features
- for ( QgsChangedAttributesMap::const_iterator iter = attr_map.begin();iter != attr_map.end();++iter )
+ for ( QgsChangedAttributesMap::const_iterator iter = attr_map.begin(); iter != attr_map.end(); ++iter )
{
int fid = iter.key();
More information about the QGIS-commit
mailing list