[QGIS Commit] r13659 - in trunk/qgis:
python/plugins/GdalTools/tools src/analysis/interpolation
src/app src/app/ogr src/core src/core/symbology
src/core/symbology-ng src/gui src/plugins/georeferencer
src/plugins/gps_importer src/plugins/grass
src/plugins/oracle_raster src/plugins/spatialquery
src/providers/delimitedtext src/providers/grass src/python
tests/src/core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Jun 5 09:21:42 EDT 2010
Author: jef
Date: 2010-06-05 09:21:40 -0400 (Sat, 05 Jun 2010)
New Revision: 13659
Modified:
trunk/qgis/python/plugins/GdalTools/tools/dialogSettings.ui
trunk/qgis/src/analysis/interpolation/Vector3D.h
trunk/qgis/src/app/ogr/qgsogrsublayersdialog.cpp
trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp
trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.h
trunk/qgis/src/app/qgspluginmanager.cpp
trunk/qgis/src/app/qgswmssourceselect.cpp
trunk/qgis/src/core/qgspluginlayerregistry.cpp
trunk/qgis/src/core/qgsproviderregistry.cpp
trunk/qgis/src/core/qgsvectorfilewriter.cpp
trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.cpp
trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.h
trunk/qgis/src/core/symbology-ng/qgssymbollayerv2registry.h
trunk/qgis/src/core/symbology/qgssymbol.cpp
trunk/qgis/src/gui/qgsprojectbadlayerguihandler.h
trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp
trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
trunk/qgis/src/plugins/grass/qgis.g.browser.cpp
trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp
trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h
trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodule.h
trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp
trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
trunk/qgis/src/plugins/grass/qgsgrasstools.cpp
trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
trunk/qgis/src/providers/grass/qgis.d.rast.c
trunk/qgis/src/python/qgspythonutilsimpl.cpp
trunk/qgis/src/python/qgspythonutilsimpl.h
trunk/qgis/tests/src/core/testqgssearchstring.cpp
Log:
automatic indentation update (r12600-r13658)
Modified: trunk/qgis/python/plugins/GdalTools/tools/dialogSettings.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/dialogSettings.ui 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/python/plugins/GdalTools/tools/dialogSettings.ui 2010-06-05 13:21:40 UTC (rev 13659)
@@ -1,178 +1,178 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GdalToolsSettingsDialog</class>
- <widget class="QDialog" name="GdalToolsSettingsDialog">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>397</width>
- <height>286</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Gdal Tools settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Path to the GDAL binaries</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLineEdit" name="leGdalBinPath"/>
- </item>
- <item>
- <widget class="QPushButton" name="btnSetBinPath">
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>GDAL data path</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLineEdit" name="leGdalDataPath">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnSetDataPath">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="label_3">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>GDAL driver path</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLineEdit" name="leGdalDriverPath">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnSetDriverPath">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="label_4">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>GDAL pymod path</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLineEdit" name="leGdalPythonPath">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnSetPythonPath">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>accepted()</signal>
- <receiver>GdalToolsSettingsDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
- </hint>
- <hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>GdalToolsSettingsDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
- </hint>
- <hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GdalToolsSettingsDialog</class>
+ <widget class="QDialog" name="GdalToolsSettingsDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>397</width>
+ <height>286</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Gdal Tools settings</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Path to the GDAL binaries</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="leGdalBinPath"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSetBinPath">
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>GDAL data path</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLineEdit" name="leGdalDataPath">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSetDataPath">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>GDAL driver path</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLineEdit" name="leGdalDriverPath">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSetDriverPath">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>GDAL pymod path</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLineEdit" name="leGdalPythonPath">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnSetPythonPath">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>GdalToolsSettingsDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>GdalToolsSettingsDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
Modified: trunk/qgis/src/analysis/interpolation/Vector3D.h
===================================================================
--- trunk/qgis/src/analysis/interpolation/Vector3D.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/analysis/interpolation/Vector3D.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -24,9 +24,9 @@
#endif
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/ogr/qgsogrsublayersdialog.cpp
===================================================================
--- trunk/qgis/src/app/ogr/qgsogrsublayersdialog.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/app/ogr/qgsogrsublayersdialog.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -23,7 +23,7 @@
: QDialog( parent, fl )
{
setupUi( this );
- QStringList labels = QStringList() << tr("Layer ID") << tr("Layer name") << tr("Nb of features") << tr("Geometry type");
+ QStringList labels = QStringList() << tr( "Layer ID" ) << tr( "Layer name" ) << tr( "Nb of features" ) << tr( "Geometry type" );
layersTable->setHeaderLabels( labels );
}
Modified: trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp
===================================================================
--- trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -53,8 +53,8 @@
}
mEncodingComboBox->setCurrentIndex( idx );
-
- leCRS->setText( tr("Original CRS") );
+
+ leCRS->setText( tr( "Original CRS" ) );
}
QgsVectorLayerSaveAsDialog::~QgsVectorLayerSaveAsDialog()
@@ -75,7 +75,7 @@
browseFilename->setEnabled( true );
leFilename->setEnabled( true );
- if( format() == "KML" )
+ if ( format() == "KML" )
{
mEncodingComboBox->setCurrentIndex( mEncodingComboBox->findText( "UTF-8" ) );
mEncodingComboBox->setDisabled( true );
@@ -101,7 +101,7 @@
void QgsVectorLayerSaveAsDialog::on_browseCRS_clicked()
{
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector();
- if( mCRS >= 0 )
+ if ( mCRS >= 0 )
mySelector->setSelectedCrsId( mCRS );
mySelector->setMessage( tr( "Select the coordinate reference system for the vector file. "
"The data points will be transformed from the layer coordinate reference system." ) );
Modified: trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.h
===================================================================
--- trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -38,7 +38,7 @@
QString encoding() const;
QString filename() const;
long crs() const;
-
+
private slots:
void on_mFormatComboBox_currentIndexChanged( int idx );
void on_browseFilename_clicked();
Modified: trunk/qgis/src/app/qgspluginmanager.cpp
===================================================================
--- trunk/qgis/src/app/qgspluginmanager.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/app/qgspluginmanager.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -407,7 +407,7 @@
{
if ( mPythonUtils && mPythonUtils->isEnabled() )
{
- if( mPythonUtils->canUninstallPlugin( baseName ) )
+ if ( mPythonUtils->canUninstallPlugin( baseName ) )
{
mPythonUtils->unloadPlugin( baseName );
//disable it to the qsettings file
Modified: trunk/qgis/src/app/qgswmssourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgswmssourceselect.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/app/qgswmssourceselect.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -98,7 +98,7 @@
mFormats << "png"; // used by french IGN geoportail
mLabels << "PNG";
-
+
mFormats << "pngt"; // used by french IGN geoportail
mLabels << "PNGT";
}
Modified: trunk/qgis/src/core/qgspluginlayerregistry.cpp
===================================================================
--- trunk/qgis/src/core/qgspluginlayerregistry.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/qgspluginlayerregistry.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -22,8 +22,8 @@
#include "qgspluginlayer.h"
#include "qgsmaplayerregistry.h"
-QgsPluginLayerType::QgsPluginLayerType(QString name)
- : mName(name)
+QgsPluginLayerType::QgsPluginLayerType( QString name )
+ : mName( name )
{
}
@@ -41,7 +41,7 @@
return NULL;
}
-bool QgsPluginLayerType::showLayerProperties(QgsPluginLayer* layer)
+bool QgsPluginLayerType::showLayerProperties( QgsPluginLayer* layer )
{
return false;
}
@@ -68,17 +68,17 @@
{
if ( !mPluginLayerTypes.isEmpty() )
{
- QgsDebugMsg("QgsPluginLayerRegistry::~QgsPluginLayerRegistry(): creator list not empty");
- foreach (QString typeName, mPluginLayerTypes.keys())
- removePluginLayerType(typeName);
+ QgsDebugMsg( "QgsPluginLayerRegistry::~QgsPluginLayerRegistry(): creator list not empty" );
+ foreach( QString typeName, mPluginLayerTypes.keys() )
+ removePluginLayerType( typeName );
}
}
-bool QgsPluginLayerRegistry::addPluginLayerType(QgsPluginLayerType* type)
+bool QgsPluginLayerRegistry::addPluginLayerType( QgsPluginLayerType* type )
{
- if (type == NULL)
+ if ( type == NULL )
return false;
- if (mPluginLayerTypes.contains(type->name()))
+ if ( mPluginLayerTypes.contains( type->name() ) )
return false;
mPluginLayerTypes[type->name()] = type;
@@ -86,41 +86,41 @@
}
-bool QgsPluginLayerRegistry::removePluginLayerType(QString typeName)
+bool QgsPluginLayerRegistry::removePluginLayerType( QString typeName )
{
- if (!mPluginLayerTypes.contains(typeName))
+ if ( !mPluginLayerTypes.contains( typeName ) )
return false;
// remove all remaining layers of this type - to avoid invalid behaviour
QList<QgsMapLayer*> layers = QgsMapLayerRegistry::instance()->mapLayers().values();
- foreach (QgsMapLayer* layer, layers)
+ foreach( QgsMapLayer* layer, layers )
{
- if (layer->type() == QgsMapLayer::PluginLayer)
+ if ( layer->type() == QgsMapLayer::PluginLayer )
{
- QgsPluginLayer* pl = qobject_cast<QgsPluginLayer*>(layer);
- if (pl->pluginLayerType() == typeName)
+ QgsPluginLayer* pl = qobject_cast<QgsPluginLayer*>( layer );
+ if ( pl->pluginLayerType() == typeName )
{
- QgsMapLayerRegistry::instance()->removeMapLayer(layer->getLayerID());
+ QgsMapLayerRegistry::instance()->removeMapLayer( layer->getLayerID() );
}
}
}
- delete mPluginLayerTypes.take(typeName);
+ delete mPluginLayerTypes.take( typeName );
return true;
}
-QgsPluginLayerType* QgsPluginLayerRegistry::pluginLayerType(QString typeName)
+QgsPluginLayerType* QgsPluginLayerRegistry::pluginLayerType( QString typeName )
{
- return mPluginLayerTypes.value(typeName, NULL);
+ return mPluginLayerTypes.value( typeName, NULL );
}
-QgsPluginLayer* QgsPluginLayerRegistry::createLayer(QString typeName)
+QgsPluginLayer* QgsPluginLayerRegistry::createLayer( QString typeName )
{
- QgsPluginLayerType* type = pluginLayerType(typeName);
- if (!type)
+ QgsPluginLayerType* type = pluginLayerType( typeName );
+ if ( !type )
{
- QgsDebugMsg("Unknown plugin layer type: "+typeName);
+ QgsDebugMsg( "Unknown plugin layer type: " + typeName );
return NULL;
}
Modified: trunk/qgis/src/core/qgsproviderregistry.cpp
===================================================================
--- trunk/qgis/src/core/qgsproviderregistry.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/qgsproviderregistry.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -210,7 +210,7 @@
else
{
myMessage += "...invalid (lib not loadable): ";
- myMessage += myLib->errorString ();
+ myMessage += myLib->errorString();
}
QgsDebugMsg( myMessage );
Modified: trunk/qgis/src/core/qgsvectorfilewriter.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorfilewriter.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/qgsvectorfilewriter.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -95,14 +95,14 @@
deleteShapeFile( vectorFileName );
}
- else if( driverName == "KML" )
+ else if ( driverName == "KML" )
{
- if( !vectorFileName.endsWith( ".kml", Qt::CaseInsensitive ) )
+ if ( !vectorFileName.endsWith( ".kml", Qt::CaseInsensitive ) )
{
vectorFileName += ".kml";
}
- if( fileEncoding.compare( "UTF-8", Qt::CaseInsensitive )!=0 )
+ if ( fileEncoding.compare( "UTF-8", Qt::CaseInsensitive ) != 0 )
{
QgsDebugMsg( "forced UTF-8 encoding for KML" );
fileEncoding = "UTF-8";
Modified: trunk/qgis/src/core/symbology/qgssymbol.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/symbology/qgssymbol.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -412,8 +412,8 @@
else
{
QgsDebugMsgLevel( QString( "marker:%1 mPointSize:%2 mPointSizeUnits:%3 scale:%4 widthScale:%5 rasterScaleFactor:%6 opacity:%7" )
- .arg( mPointSymbolName ).arg( mSize ).arg( mSizeInMapUnits ? "true" : "false" )
- .arg( scale ).arg( widthScale ).arg( rasterScaleFactor ).arg( opacity ), 3 );
+ .arg( mPointSymbolName ).arg( mSize ).arg( mSizeInMapUnits ? "true" : "false" )
+ .arg( scale ).arg( widthScale ).arg( rasterScaleFactor ).arg( opacity ), 3 );
preRotateImage = QgsMarkerCatalogue::instance()->imageMarker(
Modified: trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -12,19 +12,19 @@
{
// add default renderers
addRenderer( new QgsRendererV2Metadata( "singleSymbol",
- QObject::tr( "Single Symbol" ),
- QgsSingleSymbolRendererV2::create ) );
+ QObject::tr( "Single Symbol" ),
+ QgsSingleSymbolRendererV2::create ) );
addRenderer( new QgsRendererV2Metadata( "categorizedSymbol",
- QObject::tr( "Categorized" ),
- QgsCategorizedSymbolRendererV2::create ) );
+ QObject::tr( "Categorized" ),
+ QgsCategorizedSymbolRendererV2::create ) );
addRenderer( new QgsRendererV2Metadata( "graduatedSymbol",
- QObject::tr( "Graduated" ),
- QgsGraduatedSymbolRendererV2::create ) );
+ QObject::tr( "Graduated" ),
+ QgsGraduatedSymbolRendererV2::create ) );
}
QgsRendererV2Registry::~QgsRendererV2Registry()
{
- foreach (QString name, mRenderers.keys())
+ foreach( QString name, mRenderers.keys() )
{
delete mRenderers[name];
}
@@ -42,7 +42,7 @@
bool QgsRendererV2Registry::addRenderer( QgsRendererV2AbstractMetadata* metadata )
{
- if (metadata == NULL || mRenderers.contains(metadata->name()) )
+ if ( metadata == NULL || mRenderers.contains( metadata->name() ) )
return false;
mRenderers[metadata->name()] = metadata;
Modified: trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/symbology-ng/qgsrendererv2registry.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -27,14 +27,14 @@
QString visibleName() const { return mVisibleName; }
QIcon icon() const { return mIcon; }
- void setIcon(const QIcon& icon) { mIcon = icon; }
+ void setIcon( const QIcon& icon ) { mIcon = icon; }
/** Return new instance of the renderer given the DOM element. Returns NULL on error.
* Pure virtual function: must be implemented in derived classes. */
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) = 0;
/** Return new instance of settings widget for the renderer. Returns NULL on error. */
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
- { return NULL; }
+ { return NULL; }
protected:
//! name used within QGIS for identification (the same what renderer's type() returns)
@@ -64,9 +64,9 @@
QgsRendererV2WidgetFunc pfWidget = NULL )
: QgsRendererV2AbstractMetadata( name, visibleName, icon ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
- virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) { return mCreateFunc ? mCreateFunc(elem):NULL; }
+ virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) { return mCreateFunc ? mCreateFunc( elem ) : NULL; }
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
- { return mWidgetFunc ? mWidgetFunc(layer, style, renderer) : NULL; }
+ { return mWidgetFunc ? mWidgetFunc( layer, style, renderer ) : NULL; }
QgsRendererV2CreateFunc createFunction() const { return mCreateFunc; }
QgsRendererV2WidgetFunc widgetFunction() const { return mWidgetFunc; }
Modified: trunk/qgis/src/core/symbology-ng/qgssymbollayerv2registry.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgssymbollayerv2registry.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/core/symbology-ng/qgssymbollayerv2registry.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -38,23 +38,23 @@
*/
class CORE_EXPORT QgsSymbolLayerV2Metadata : public QgsSymbolLayerV2AbstractMetadata
{
-public:
- QgsSymbolLayerV2Metadata( QString name, QgsSymbolV2::SymbolType type,
- QgsSymbolLayerV2CreateFunc pfCreate,
- QgsSymbolLayerV2WidgetFunc pfWidget = NULL )
- : QgsSymbolLayerV2AbstractMetadata( name, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
+ public:
+ QgsSymbolLayerV2Metadata( QString name, QgsSymbolV2::SymbolType type,
+ QgsSymbolLayerV2CreateFunc pfCreate,
+ QgsSymbolLayerV2WidgetFunc pfWidget = NULL )
+ : QgsSymbolLayerV2AbstractMetadata( name, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
- QgsSymbolLayerV2CreateFunc createFunction() const { return mCreateFunc; }
- QgsSymbolLayerV2WidgetFunc widgetFunction() const { return mWidgetFunc; }
+ QgsSymbolLayerV2CreateFunc createFunction() const { return mCreateFunc; }
+ QgsSymbolLayerV2WidgetFunc widgetFunction() const { return mWidgetFunc; }
- void setWidgetFunction( QgsSymbolLayerV2WidgetFunc f ) { mWidgetFunc = f; }
+ void setWidgetFunction( QgsSymbolLayerV2WidgetFunc f ) { mWidgetFunc = f; }
- virtual QgsSymbolLayerV2* createSymbolLayer( const QgsStringMap& map ) { return mCreateFunc ? mCreateFunc(map) : NULL; }
- virtual QgsSymbolLayerV2Widget* createSymbolLayerWidget() { return mWidgetFunc ? mWidgetFunc() : NULL; }
+ virtual QgsSymbolLayerV2* createSymbolLayer( const QgsStringMap& map ) { return mCreateFunc ? mCreateFunc( map ) : NULL; }
+ virtual QgsSymbolLayerV2Widget* createSymbolLayerWidget() { return mWidgetFunc ? mWidgetFunc() : NULL; }
-protected:
- QgsSymbolLayerV2CreateFunc mCreateFunc;
- QgsSymbolLayerV2WidgetFunc mWidgetFunc;
+ protected:
+ QgsSymbolLayerV2CreateFunc mCreateFunc;
+ QgsSymbolLayerV2WidgetFunc mWidgetFunc;
};
Modified: trunk/qgis/src/gui/qgsprojectbadlayerguihandler.h
===================================================================
--- trunk/qgis/src/gui/qgsprojectbadlayerguihandler.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/gui/qgsprojectbadlayerguihandler.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -12,7 +12,7 @@
*/
class GUI_EXPORT QgsProjectBadLayerGuiHandler : public QObject, public QgsProjectBadLayerHandler
{
- Q_OBJECT
+ Q_OBJECT
public:
QgsProjectBadLayerGuiHandler();
Modified: trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -43,7 +43,7 @@
mToolEmitPoint->setButton( mPointFromCanvasPushButton );
QSettings s;
- mSnapToBackgroundLayerBox->setChecked( s.value( "/Plugin-GeoReferencer/snapToBackgroundLayers", QVariant(false) ).toBool() );
+ mSnapToBackgroundLayerBox->setChecked( s.value( "/Plugin-GeoReferencer/snapToBackgroundLayers", QVariant( false ) ).toBool() );
connect( mPointFromCanvasPushButton, SIGNAL( clicked( bool ) ), this, SLOT( setToolEmitPoint( bool ) ) );
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -172,8 +172,8 @@
{
QMessageBox::warning( NULL, tr( "Could not create file" ),
tr( "Unable to create a GPX file with the given name. "
- "Try again with an other name or in an other "
- "directory." ) );
+ "Try again with an other name or in an other "
+ "directory." ) );
return;
}
ofs << "<gpx></gpx>" << std::endl;
Modified: trunk/qgis/src/plugins/grass/qgis.g.browser.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgis.g.browser.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgis.g.browser.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -18,16 +18,17 @@
fprintf( stderr, "URL argument missing\n" );
exit( 1 );
}
- QString urlStr ( argv[1] );
- QUrl url ( urlStr );
+ QString urlStr( argv[1] );
+ QUrl url( urlStr );
#ifdef Q_OS_WIN
// openUrl on windows fails to open 'file://c:...' it must be 'file:///c:...' (3 slashes)
- if ( url.scheme() == "file" ) {
+ if ( url.scheme() == "file" )
+ {
// this does not work, the drive was already removed by QT:
//url.setPath ( "/" + url.path() );
- urlStr.replace ( "file://", "file:///" );
- url.setUrl ( urlStr );
- std::cout << "path reset to: " << qPrintable(url.path()) << std::endl;
+ urlStr.replace( "file://", "file:///" );
+ url.setUrl( urlStr );
+ std::cout << "path reset to: " << qPrintable( url.path() ) << std::endl;
}
#endif
QDesktopServices::openUrl( url );
Modified: trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassedittools.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -893,7 +893,7 @@
e->mAttributes->setLine( 0 );
e->mAttributes->clear();
e->mAttributes->raise();
- // Just to disable new button
+ // Just to disable new button
e->mAttributes->setCategoryMode( QgsGrassEdit::CAT_MODE_NOCAT, QString() );
}
Modified: trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassmapcalc.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -31,7 +31,7 @@
* \brief Interface for r.mapcalc
*/
class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase,
- public QgsGrassModuleOptions
+ public QgsGrassModuleOptions
{
Q_OBJECT
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodel.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -319,12 +319,12 @@
str += "</table>";
}
Vect_close( &Map );
- }
+ }
catch ( QgsGrass::Exception &e )
{
QgsDebugMsg( QString( "Cannot open GRASS vector: %1" ).arg( e.what() ) );
str += "</table>";
- str += QString( "%1 <br>").arg( e.what() );
+ str += QString( "%1 <br>" ).arg( e.what() );
}
return str;
@@ -380,7 +380,7 @@
{
QgsDebugMsg( QString( "Cannot open GRASS vector: %1" ).arg( e.what() ) );
str += "</table>";
- str += QString( "%1 <br>").arg( e.what() );
+ str += QString( "%1 <br>" ).arg( e.what() );
}
return str;
}
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -193,7 +193,7 @@
virtual QStringList output( int type ) { return QStringList() ; }
//! Has any output
- virtual bool hasOutput ( int type ) { return true; }
+ virtual bool hasOutput( int type ) { return true; }
//! Has raster input or output
virtual bool usesRegion() { return false; }
@@ -240,7 +240,7 @@
*/
class QgsGrassModuleStandardOptions: QWidget, public QgsGrassModuleOptions
{
- Q_OBJECT
+ Q_OBJECT
public:
//! Constructor
@@ -268,7 +268,7 @@
void thawOutput();
QStringList ready() ;
QStringList output( int type );
- bool hasOutput ( int type );
+ bool hasOutput( int type );
QStringList checkRegion();
bool usesRegion();
bool requestsRegion();
Modified: trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -308,17 +308,17 @@
int level = Vect_open_old_head( &map, sel->map.toUtf8().data(),
sel->mapset.toUtf8().data() );
- if ( level == 1 )
+ if ( level == 1 )
{
QgsDebugMsg( "Cannot open vector on level 2" );
- QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module).").arg( sel->map ).arg( sel->mapset ) );
+ QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module)." ).arg( sel->map ).arg( sel->mapset ) );
Vect_close( &map );
return;
}
else if ( level < 1 )
{
QgsDebugMsg( "Cannot open vector" );
- QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( sel->map ).arg( sel->mapset ) );
+ QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2" ).arg( sel->map ).arg( sel->mapset ) );
return;
}
Modified: trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassselect.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassselect.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -413,18 +413,18 @@
{
QgsDebugMsg( "Cannot open vector on level 2" );
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module)." ).arg( mapName ).arg( mapset ) );
- // Vect_close here is correct, it should work, but it seems to cause
+ // Vect_close here is correct, it should work, but it seems to cause
// crash on win http://trac.osgeo.org/qgis/ticket/2003
// disabled on win test it
#if !defined(WIN32)
Vect_close( &map );
#endif
return list;
- }
+ }
else if ( level < 1 )
{
QgsDebugMsg( "Cannot open vector" );
- QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( mapName ).arg( mapset ) );
+ QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2" ).arg( mapName ).arg( mapset ) );
return list;
}
Modified: trunk/qgis/src/plugins/grass/qgsgrassshell.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassshell.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrassshell.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -57,7 +57,7 @@
*/
mTerminal->setSize( 80, 25 );
- mTerminal->setColorScheme ( COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW );
+ mTerminal->setColorScheme( COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW );
mTerminal->startShellProgram();
mTerminal->setFocus( Qt::MouseFocusReason );
}
Modified: trunk/qgis/src/plugins/grass/qgsgrasstools.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrasstools.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/grass/qgsgrasstools.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -140,7 +140,7 @@
if ( name == "shell" )
{
#ifdef WIN32
- QgsGrass::putEnv ( "GRASS_HTML_BROWSER", QgsApplication::pkgDataPath() + "/grass/bin/qgis.g.browser" );
+ QgsGrass::putEnv( "GRASS_HTML_BROWSER", QgsApplication::pkgDataPath() + "/grass/bin/qgis.g.browser" );
if ( !QProcess::startDetached( getenv( "COMSPEC" ) ) )
{
QMessageBox::warning( 0, "Warning", tr( "Cannot start command shell (%1)" ).arg( getenv( "COMSPEC" ) ) );
@@ -168,8 +168,9 @@
// Icon size in QT4 does not seem to be variable
// -> reset the width to max icon width
- if ( mTabWidget->iconSize().width() < pixmap.width() ) {
- mTabWidget->setIconSize( QSize( pixmap.width(), mTabWidget->iconSize().height() ) );
+ if ( mTabWidget->iconSize().width() < pixmap.width() )
+ {
+ mTabWidget->setIconSize( QSize( pixmap.width(), mTabWidget->iconSize().height() ) );
}
QIcon is;
Modified: trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp
===================================================================
--- trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -55,7 +55,7 @@
{
// cancel button mapped to context help - changed this to close the
// dialog instead. If context help is to be added, a Help button
- // is required. - gsherman
+ // is required. - gsherman
// helpInfo();
reject();
}
Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialquerydialogbase.ui 2010-06-05 13:21:40 UTC (rev 13659)
@@ -1,318 +1,318 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QgsSpatialQueryDialogBase</class>
- <widget class="QDialog" name="QgsSpatialQueryDialogBase">
- <property name="windowModality">
- <enum>Qt::NonModal</enum>
- </property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>532</width>
- <height>680</height>
- </rect>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="acceptDrops">
- <bool>true</bool>
- </property>
- <property name="windowTitle">
- <string>Spatial Query</string>
- </property>
- <property name="locale">
- <locale language="English" country="UnitedKingdom"/>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QGroupBox" name="grpTargetGroupBox">
- <property name="toolTip">
- <string>Layer on which the topological operation will select geometries</string>
- </property>
- <property name="title">
- <string>Target layer</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QComboBox" name="targetLayerComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>206</width>
- <height>26</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the target layer</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="usingSelectedTargetCheckBox">
- <property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html></string>
- </property>
- <property name="text">
- <string>Selected feature(s) only</string>
- </property>
- </widget>
- </item>
- </layout>
- <zorder>usingSelectedTargetCheckBox</zorder>
- <zorder>targetLayerComboBox</zorder>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QGroupBox" name="grpReferenceGroupBox">
- <property name="toolTip">
- <string>Layer whose geometries will be used as reference by the topological operation</string>
- </property>
- <property name="title">
- <string>Reference layer</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QComboBox" name="referenceLayerComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>206</width>
- <height>26</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the reference layer</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="usingSelectedReferenceCheckBox">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>18</height>
- </size>
- </property>
- <property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html></string>
- </property>
- <property name="text">
- <string>Selected feature(s) only</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="10" column="0" colspan="2">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Run query or close the window</string>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QGroupBox" name="grpOperationGroupBox">
- <property name="toolTip">
- <string>Topological operations between layers of target and reference</string>
- </property>
- <property name="title">
- <string>Topological operation</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <widget class="QComboBox" name="operantionComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>10</horstretch>
- <verstretch>116</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>206</width>
- <height>26</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the topological operation</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="9" column="0">
- <widget class="QProgressBar" name="progressBarStatus">
- <property name="value">
- <number>0</number>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="textVisible">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QGroupBox" name="grpResults">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Results (click to highlight on map)</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QListWidget" name="selectedFeatureListWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>136</width>
- <height>135</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select item to identify geometry of feature</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="showLogProcessingCheckBox">
- <property name="toolTip">
- <string>Check to show log processing of query</string>
- </property>
- <property name="text">
- <string>Show log messages</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QTextEdit" name="textEditStatus">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="textInteractionFlags">
- <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="countSelectedFeats">
- <property name="minimumSize">
- <size>
- <width>18</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>30</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Total of features from query</string>
- </property>
- <property name="text">
- <string> Total</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="7" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <resources/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QgsSpatialQueryDialogBase</class>
+ <widget class="QDialog" name="QgsSpatialQueryDialogBase">
+ <property name="windowModality">
+ <enum>Qt::NonModal</enum>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>532</width>
+ <height>680</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="acceptDrops">
+ <bool>true</bool>
+ </property>
+ <property name="windowTitle">
+ <string>Spatial Query</string>
+ </property>
+ <property name="locale">
+ <locale language="English" country="UnitedKingdom"/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="grpTargetGroupBox">
+ <property name="toolTip">
+ <string>Layer on which the topological operation will select geometries</string>
+ </property>
+ <property name="title">
+ <string>Target layer</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QComboBox" name="targetLayerComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>206</width>
+ <height>26</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the target layer</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="usingSelectedTargetCheckBox">
+ <property name="toolTip">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html></string>
+ </property>
+ <property name="text">
+ <string>Selected feature(s) only</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ <zorder>usingSelectedTargetCheckBox</zorder>
+ <zorder>targetLayerComboBox</zorder>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="grpReferenceGroupBox">
+ <property name="toolTip">
+ <string>Layer whose geometries will be used as reference by the topological operation</string>
+ </property>
+ <property name="title">
+ <string>Reference layer</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QComboBox" name="referenceLayerComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>206</width>
+ <height>26</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the reference layer</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="usingSelectedReferenceCheckBox">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html></string>
+ </property>
+ <property name="text">
+ <string>Selected feature(s) only</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="10" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Run query or close the window</string>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QGroupBox" name="grpOperationGroupBox">
+ <property name="toolTip">
+ <string>Topological operations between layers of target and reference</string>
+ </property>
+ <property name="title">
+ <string>Topological operation</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="QComboBox" name="operantionComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>10</horstretch>
+ <verstretch>116</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>206</width>
+ <height>26</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the topological operation</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QProgressBar" name="progressBarStatus">
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QGroupBox" name="grpResults">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Results (click to highlight on map)</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QListWidget" name="selectedFeatureListWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>136</width>
+ <height>135</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select item to identify geometry of feature</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="showLogProcessingCheckBox">
+ <property name="toolTip">
+ <string>Check to show log processing of query</string>
+ </property>
+ <property name="text">
+ <string>Show log messages</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="textEditStatus">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="countSelectedFeats">
+ <property name="minimumSize">
+ <size>
+ <width>18</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Total of features from query</string>
+ </property>
+ <property name="text">
+ <string> Total</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+</ui>
Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -418,13 +418,13 @@
switch ( attributeFields[*i].type() )
{
case QVariant::Int:
- if( !tokens[*i].isEmpty() )
+ if ( !tokens[*i].isEmpty() )
val = QVariant( tokens[*i].toInt() );
else
val = QVariant( attributeFields[*i].type() );
break;
case QVariant::Double:
- if( !tokens[*i].isEmpty() )
+ if ( !tokens[*i].isEmpty() )
val = QVariant( tokens[*i].toDouble() );
else
val = QVariant( attributeFields[*i].type() );
Modified: trunk/qgis/src/providers/grass/qgis.d.rast.c
===================================================================
--- trunk/qgis/src/providers/grass/qgis.d.rast.c 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/providers/grass/qgis.d.rast.c 2010-06-05 13:21:40 UTC (rev 13659)
@@ -59,7 +59,7 @@
if ( mapset == NULL )
G_fatal_error(( "Raster map <%s> not found" ), name );
- /* It can happen that GRASS data set is 'corrupted' and zone differs in WIND and
+ /* It can happen that GRASS data set is 'corrupted' and zone differs in WIND and
* cellhd, and G_open_cell_old fails, so it is better to read window from map */
/* G_get_window( &window ); */
G_get_cellhd( name, mapset, &window );
@@ -140,11 +140,11 @@
/* some buggy C libraries require BOTH setmode() and fdopen(bin) */
#ifdef WIN32
if ( _setmode( _fileno( stdout ), _O_BINARY ) == -1 )
- G_fatal_error( "Cannot set stdout mode" );
+ G_fatal_error( "Cannot set stdout mode" );
#endif
// Unfortunately this is not sufficient on Windows to switch stdout to binary mode
- fo = fdopen (fileno(stdout), "wb");
-
+ fo = fdopen( fileno( stdout ), "wb" );
+
/* loop for array rows */
for ( row = 0; row < nrows; row++ )
{
Modified: trunk/qgis/src/python/qgspythonutilsimpl.cpp
===================================================================
--- trunk/qgis/src/python/qgspythonutilsimpl.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/python/qgspythonutilsimpl.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -162,9 +162,9 @@
evalString( "sys.version", version );
QString str = "<font color=\"red\">" + msgOnError + "</font><br><br>" + traceback + "<br>"
- + QObject::tr( "Python version:" ) + "<br>" + version + "<br><br>"
- + QObject::tr( "QGIS version:" ) + "<br>" + QString( "%1 '%2', %3" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME ).arg( QGis::QGIS_SVN_VERSION ) + "<br><br>"
- + QObject::tr( "Python path:" ) + "<br>" + path;
+ + QObject::tr( "Python version:" ) + "<br>" + version + "<br><br>"
+ + QObject::tr( "QGIS version:" ) + "<br>" + QString( "%1 '%2', %3" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME ).arg( QGis::QGIS_SVN_VERSION ) + "<br><br>"
+ + QObject::tr( "Python path:" ) + "<br>" + path;
str.replace( "\n", "<br>" ).replace( " ", " " );
QgsMessageOutput* msg = QgsMessageOutput::createMessageOutput();
Modified: trunk/qgis/src/python/qgspythonutilsimpl.h
===================================================================
--- trunk/qgis/src/python/qgspythonutilsimpl.h 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/src/python/qgspythonutilsimpl.h 2010-06-05 13:21:40 UTC (rev 13659)
@@ -99,7 +99,7 @@
QString getPluginMetadata( QString pluginName, QString function );
//! confirm it is safe to uninstall the plugin
- bool canUninstallPlugin( QString packageName );
+ bool canUninstallPlugin( QString packageName );
//! unload plugin
bool unloadPlugin( QString packageName );
Modified: trunk/qgis/tests/src/core/testqgssearchstring.cpp
===================================================================
--- trunk/qgis/tests/src/core/testqgssearchstring.cpp 2010-06-05 11:47:25 UTC (rev 13658)
+++ trunk/qgis/tests/src/core/testqgssearchstring.cpp 2010-06-05 13:21:40 UTC (rev 13659)
@@ -20,7 +20,7 @@
class TestQgsSearchString : public QObject
{
- Q_OBJECT;
+ Q_OBJECT;
private slots:
//void initTestCase();// will be called before the first testfunction is executed.
//void cleanupTestCase();// will be called after the last testfunction was executed.
@@ -34,39 +34,39 @@
QString mReport;
};
-static bool evalString(QString str)
+static bool evalString( QString str )
{
QgsSearchString ss;
- ss.setString(str);
- return ss.tree()->checkAgainst(QgsFieldMap(), QgsAttributeMap());
+ ss.setString( str );
+ return ss.tree()->checkAgainst( QgsFieldMap(), QgsAttributeMap() );
}
void TestQgsSearchString::testLike()
{
- QVERIFY( evalString("'a' LIKE 'a'") );
- QVERIFY( ! evalString("'aa' LIKE 'a'") );
- QVERIFY( ! evalString("'a' LIKE 'b'") );
+ QVERIFY( evalString( "'a' LIKE 'a'" ) );
+ QVERIFY( ! evalString( "'aa' LIKE 'a'" ) );
+ QVERIFY( ! evalString( "'a' LIKE 'b'" ) );
- QVERIFY( evalString("'abba' LIKE 'a%'") );
- QVERIFY( ! evalString("'abba' LIKE 'b%'") );
- QVERIFY( evalString("'abba' LIKE '%a'") );
- QVERIFY( ! evalString("'abba' LIKE '%b'") );
+ QVERIFY( evalString( "'abba' LIKE 'a%'" ) );
+ QVERIFY( ! evalString( "'abba' LIKE 'b%'" ) );
+ QVERIFY( evalString( "'abba' LIKE '%a'" ) );
+ QVERIFY( ! evalString( "'abba' LIKE '%b'" ) );
- QVERIFY( evalString("'abba' LIKE '%bb%'") );
- QVERIFY( evalString("'abba' LIKE 'a%a'") );
- QVERIFY( ! evalString("'abba' LIKE 'b%b'") );
+ QVERIFY( evalString( "'abba' LIKE '%bb%'" ) );
+ QVERIFY( evalString( "'abba' LIKE 'a%a'" ) );
+ QVERIFY( ! evalString( "'abba' LIKE 'b%b'" ) );
}
void TestQgsSearchString::testRegexp()
{
- QVERIFY( evalString("'a' ~ 'a'") );
- QVERIFY( ! evalString("'b' ~ 'a'") );
+ QVERIFY( evalString( "'a' ~ 'a'" ) );
+ QVERIFY( ! evalString( "'b' ~ 'a'" ) );
- QVERIFY( evalString("'abba' ~ 'a'") );
- QVERIFY( ! evalString("'abba' ~ 'aba'") );
- QVERIFY( evalString("'abba' ~ 'a.*a'") );
- QVERIFY( evalString("'abba' ~ 'a[b]+a'") );
+ QVERIFY( evalString( "'abba' ~ 'a'" ) );
+ QVERIFY( ! evalString( "'abba' ~ 'aba'" ) );
+ QVERIFY( evalString( "'abba' ~ 'a.*a'" ) );
+ QVERIFY( evalString( "'abba' ~ 'a[b]+a'" ) );
}
-QTEST_MAIN(TestQgsSearchString)
+QTEST_MAIN( TestQgsSearchString )
#include "moc_testqgssearchstring.cxx"
More information about the QGIS-commit
mailing list