Skip to content

Commit b541da5

Browse files
author
jef
committedJun 5, 2010
automatic indentation update (r12600-r13658)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13659 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 3f3efa0 commit b541da5

33 files changed

+623
-621
lines changed
 

‎python/plugins/GdalTools/tools/dialogSettings.ui

Lines changed: 178 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,178 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<ui version="4.0">
3-
<class>GdalToolsSettingsDialog</class>
4-
<widget class="QDialog" name="GdalToolsSettingsDialog">
5-
<property name="geometry">
6-
<rect>
7-
<x>0</x>
8-
<y>0</y>
9-
<width>397</width>
10-
<height>286</height>
11-
</rect>
12-
</property>
13-
<property name="windowTitle">
14-
<string>Gdal Tools settings</string>
15-
</property>
16-
<layout class="QVBoxLayout" name="verticalLayout">
17-
<item>
18-
<widget class="QLabel" name="label">
19-
<property name="text">
20-
<string>Path to the GDAL binaries</string>
21-
</property>
22-
</widget>
23-
</item>
24-
<item>
25-
<layout class="QHBoxLayout" name="horizontalLayout">
26-
<item>
27-
<widget class="QLineEdit" name="leGdalBinPath"/>
28-
</item>
29-
<item>
30-
<widget class="QPushButton" name="btnSetBinPath">
31-
<property name="text">
32-
<string>Browse</string>
33-
</property>
34-
</widget>
35-
</item>
36-
</layout>
37-
</item>
38-
<item>
39-
<widget class="QLabel" name="label_2">
40-
<property name="enabled">
41-
<bool>false</bool>
42-
</property>
43-
<property name="text">
44-
<string>GDAL data path</string>
45-
</property>
46-
</widget>
47-
</item>
48-
<item>
49-
<layout class="QHBoxLayout" name="horizontalLayout_2">
50-
<item>
51-
<widget class="QLineEdit" name="leGdalDataPath">
52-
<property name="enabled">
53-
<bool>false</bool>
54-
</property>
55-
</widget>
56-
</item>
57-
<item>
58-
<widget class="QPushButton" name="btnSetDataPath">
59-
<property name="enabled">
60-
<bool>false</bool>
61-
</property>
62-
<property name="text">
63-
<string>Browse</string>
64-
</property>
65-
</widget>
66-
</item>
67-
</layout>
68-
</item>
69-
<item>
70-
<widget class="QLabel" name="label_3">
71-
<property name="enabled">
72-
<bool>false</bool>
73-
</property>
74-
<property name="text">
75-
<string>GDAL driver path</string>
76-
</property>
77-
</widget>
78-
</item>
79-
<item>
80-
<layout class="QHBoxLayout" name="horizontalLayout_3">
81-
<item>
82-
<widget class="QLineEdit" name="leGdalDriverPath">
83-
<property name="enabled">
84-
<bool>false</bool>
85-
</property>
86-
</widget>
87-
</item>
88-
<item>
89-
<widget class="QPushButton" name="btnSetDriverPath">
90-
<property name="enabled">
91-
<bool>false</bool>
92-
</property>
93-
<property name="text">
94-
<string>Browse</string>
95-
</property>
96-
</widget>
97-
</item>
98-
</layout>
99-
</item>
100-
<item>
101-
<widget class="QLabel" name="label_4">
102-
<property name="enabled">
103-
<bool>false</bool>
104-
</property>
105-
<property name="text">
106-
<string>GDAL pymod path</string>
107-
</property>
108-
</widget>
109-
</item>
110-
<item>
111-
<layout class="QHBoxLayout" name="horizontalLayout_4">
112-
<item>
113-
<widget class="QLineEdit" name="leGdalPythonPath">
114-
<property name="enabled">
115-
<bool>false</bool>
116-
</property>
117-
</widget>
118-
</item>
119-
<item>
120-
<widget class="QPushButton" name="btnSetPythonPath">
121-
<property name="enabled">
122-
<bool>false</bool>
123-
</property>
124-
<property name="text">
125-
<string>Browse</string>
126-
</property>
127-
</widget>
128-
</item>
129-
</layout>
130-
</item>
131-
<item>
132-
<widget class="QDialogButtonBox" name="buttonBox">
133-
<property name="orientation">
134-
<enum>Qt::Horizontal</enum>
135-
</property>
136-
<property name="standardButtons">
137-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
138-
</property>
139-
</widget>
140-
</item>
141-
</layout>
142-
</widget>
143-
<resources/>
144-
<connections>
145-
<connection>
146-
<sender>buttonBox</sender>
147-
<signal>accepted()</signal>
148-
<receiver>GdalToolsSettingsDialog</receiver>
149-
<slot>accept()</slot>
150-
<hints>
151-
<hint type="sourcelabel">
152-
<x>248</x>
153-
<y>254</y>
154-
</hint>
155-
<hint type="destinationlabel">
156-
<x>157</x>
157-
<y>274</y>
158-
</hint>
159-
</hints>
160-
</connection>
161-
<connection>
162-
<sender>buttonBox</sender>
163-
<signal>rejected()</signal>
164-
<receiver>GdalToolsSettingsDialog</receiver>
165-
<slot>reject()</slot>
166-
<hints>
167-
<hint type="sourcelabel">
168-
<x>316</x>
169-
<y>260</y>
170-
</hint>
171-
<hint type="destinationlabel">
172-
<x>286</x>
173-
<y>274</y>
174-
</hint>
175-
</hints>
176-
</connection>
177-
</connections>
178-
</ui>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>GdalToolsSettingsDialog</class>
4+
<widget class="QDialog" name="GdalToolsSettingsDialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>397</width>
10+
<height>286</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Gdal Tools settings</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<item>
18+
<widget class="QLabel" name="label">
19+
<property name="text">
20+
<string>Path to the GDAL binaries</string>
21+
</property>
22+
</widget>
23+
</item>
24+
<item>
25+
<layout class="QHBoxLayout" name="horizontalLayout">
26+
<item>
27+
<widget class="QLineEdit" name="leGdalBinPath"/>
28+
</item>
29+
<item>
30+
<widget class="QPushButton" name="btnSetBinPath">
31+
<property name="text">
32+
<string>Browse</string>
33+
</property>
34+
</widget>
35+
</item>
36+
</layout>
37+
</item>
38+
<item>
39+
<widget class="QLabel" name="label_2">
40+
<property name="enabled">
41+
<bool>false</bool>
42+
</property>
43+
<property name="text">
44+
<string>GDAL data path</string>
45+
</property>
46+
</widget>
47+
</item>
48+
<item>
49+
<layout class="QHBoxLayout" name="horizontalLayout_2">
50+
<item>
51+
<widget class="QLineEdit" name="leGdalDataPath">
52+
<property name="enabled">
53+
<bool>false</bool>
54+
</property>
55+
</widget>
56+
</item>
57+
<item>
58+
<widget class="QPushButton" name="btnSetDataPath">
59+
<property name="enabled">
60+
<bool>false</bool>
61+
</property>
62+
<property name="text">
63+
<string>Browse</string>
64+
</property>
65+
</widget>
66+
</item>
67+
</layout>
68+
</item>
69+
<item>
70+
<widget class="QLabel" name="label_3">
71+
<property name="enabled">
72+
<bool>false</bool>
73+
</property>
74+
<property name="text">
75+
<string>GDAL driver path</string>
76+
</property>
77+
</widget>
78+
</item>
79+
<item>
80+
<layout class="QHBoxLayout" name="horizontalLayout_3">
81+
<item>
82+
<widget class="QLineEdit" name="leGdalDriverPath">
83+
<property name="enabled">
84+
<bool>false</bool>
85+
</property>
86+
</widget>
87+
</item>
88+
<item>
89+
<widget class="QPushButton" name="btnSetDriverPath">
90+
<property name="enabled">
91+
<bool>false</bool>
92+
</property>
93+
<property name="text">
94+
<string>Browse</string>
95+
</property>
96+
</widget>
97+
</item>
98+
</layout>
99+
</item>
100+
<item>
101+
<widget class="QLabel" name="label_4">
102+
<property name="enabled">
103+
<bool>false</bool>
104+
</property>
105+
<property name="text">
106+
<string>GDAL pymod path</string>
107+
</property>
108+
</widget>
109+
</item>
110+
<item>
111+
<layout class="QHBoxLayout" name="horizontalLayout_4">
112+
<item>
113+
<widget class="QLineEdit" name="leGdalPythonPath">
114+
<property name="enabled">
115+
<bool>false</bool>
116+
</property>
117+
</widget>
118+
</item>
119+
<item>
120+
<widget class="QPushButton" name="btnSetPythonPath">
121+
<property name="enabled">
122+
<bool>false</bool>
123+
</property>
124+
<property name="text">
125+
<string>Browse</string>
126+
</property>
127+
</widget>
128+
</item>
129+
</layout>
130+
</item>
131+
<item>
132+
<widget class="QDialogButtonBox" name="buttonBox">
133+
<property name="orientation">
134+
<enum>Qt::Horizontal</enum>
135+
</property>
136+
<property name="standardButtons">
137+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
138+
</property>
139+
</widget>
140+
</item>
141+
</layout>
142+
</widget>
143+
<resources/>
144+
<connections>
145+
<connection>
146+
<sender>buttonBox</sender>
147+
<signal>accepted()</signal>
148+
<receiver>GdalToolsSettingsDialog</receiver>
149+
<slot>accept()</slot>
150+
<hints>
151+
<hint type="sourcelabel">
152+
<x>248</x>
153+
<y>254</y>
154+
</hint>
155+
<hint type="destinationlabel">
156+
<x>157</x>
157+
<y>274</y>
158+
</hint>
159+
</hints>
160+
</connection>
161+
<connection>
162+
<sender>buttonBox</sender>
163+
<signal>rejected()</signal>
164+
<receiver>GdalToolsSettingsDialog</receiver>
165+
<slot>reject()</slot>
166+
<hints>
167+
<hint type="sourcelabel">
168+
<x>316</x>
169+
<y>260</y>
170+
</hint>
171+
<hint type="destinationlabel">
172+
<x>286</x>
173+
<y>274</y>
174+
</hint>
175+
</hints>
176+
</connection>
177+
</connections>
178+
</ui>

‎src/analysis/interpolation/Vector3D.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#endif
2525

2626
class ANALYSIS_EXPORT Vector3D
27-
/**
28-
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.
29-
*/
27+
/**
28+
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.
29+
*/
3030

3131
{
3232
protected:

‎src/app/ogr/qgsogrsublayersdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QgsOGRSublayersDialog::QgsOGRSublayersDialog( QWidget* parent, Qt::WFlags fl )
2323
: QDialog( parent, fl )
2424
{
2525
setupUi( this );
26-
QStringList labels = QStringList() << tr("Layer ID") << tr("Layer name") << tr("Nb of features") << tr("Geometry type");
26+
QStringList labels = QStringList() << tr( "Layer ID" ) << tr( "Layer name" ) << tr( "Nb of features" ) << tr( "Geometry type" );
2727
layersTable->setHeaderLabels( labels );
2828
}
2929

‎src/app/ogr/qgsvectorlayersaveasdialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( QWidget* parent, Qt::WFl
5353
}
5454

5555
mEncodingComboBox->setCurrentIndex( idx );
56-
57-
leCRS->setText( tr("Original CRS") );
56+
57+
leCRS->setText( tr( "Original CRS" ) );
5858
}
5959

6060
QgsVectorLayerSaveAsDialog::~QgsVectorLayerSaveAsDialog()
@@ -75,7 +75,7 @@ void QgsVectorLayerSaveAsDialog::on_mFormatComboBox_currentIndexChanged( int idx
7575
browseFilename->setEnabled( true );
7676
leFilename->setEnabled( true );
7777

78-
if( format() == "KML" )
78+
if ( format() == "KML" )
7979
{
8080
mEncodingComboBox->setCurrentIndex( mEncodingComboBox->findText( "UTF-8" ) );
8181
mEncodingComboBox->setDisabled( true );
@@ -101,7 +101,7 @@ void QgsVectorLayerSaveAsDialog::on_browseFilename_clicked()
101101
void QgsVectorLayerSaveAsDialog::on_browseCRS_clicked()
102102
{
103103
QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector();
104-
if( mCRS >= 0 )
104+
if ( mCRS >= 0 )
105105
mySelector->setSelectedCrsId( mCRS );
106106
mySelector->setMessage( tr( "Select the coordinate reference system for the vector file. "
107107
"The data points will be transformed from the layer coordinate reference system." ) );

‎src/app/ogr/qgsvectorlayersaveasdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSav
3838
QString encoding() const;
3939
QString filename() const;
4040
long crs() const;
41-
41+
4242
private slots:
4343
void on_mFormatComboBox_currentIndexChanged( int idx );
4444
void on_browseFilename_clicked();

‎src/app/qgspluginmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ void QgsPluginManager::unload()
407407
{
408408
if ( mPythonUtils && mPythonUtils->isEnabled() )
409409
{
410-
if( mPythonUtils->canUninstallPlugin( baseName ) )
410+
if ( mPythonUtils->canUninstallPlugin( baseName ) )
411411
{
412412
mPythonUtils->unloadPlugin( baseName );
413413
//disable it to the qsettings file

‎src/app/qgswmssourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl )
9898

9999
mFormats << "png"; // used by french IGN geoportail
100100
mLabels << "PNG";
101-
101+
102102
mFormats << "pngt"; // used by french IGN geoportail
103103
mLabels << "PNGT";
104104
}

‎src/core/qgspluginlayerregistry.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "qgspluginlayer.h"
2323
#include "qgsmaplayerregistry.h"
2424

25-
QgsPluginLayerType::QgsPluginLayerType(QString name)
26-
: mName(name)
25+
QgsPluginLayerType::QgsPluginLayerType( QString name )
26+
: mName( name )
2727
{
2828
}
2929

@@ -41,7 +41,7 @@ QgsPluginLayer* QgsPluginLayerType::createLayer()
4141
return NULL;
4242
}
4343

44-
bool QgsPluginLayerType::showLayerProperties(QgsPluginLayer* layer)
44+
bool QgsPluginLayerType::showLayerProperties( QgsPluginLayer* layer )
4545
{
4646
return false;
4747
}
@@ -68,59 +68,59 @@ QgsPluginLayerRegistry::~QgsPluginLayerRegistry()
6868
{
6969
if ( !mPluginLayerTypes.isEmpty() )
7070
{
71-
QgsDebugMsg("QgsPluginLayerRegistry::~QgsPluginLayerRegistry(): creator list not empty");
72-
foreach (QString typeName, mPluginLayerTypes.keys())
73-
removePluginLayerType(typeName);
71+
QgsDebugMsg( "QgsPluginLayerRegistry::~QgsPluginLayerRegistry(): creator list not empty" );
72+
foreach( QString typeName, mPluginLayerTypes.keys() )
73+
removePluginLayerType( typeName );
7474
}
7575
}
7676

77-
bool QgsPluginLayerRegistry::addPluginLayerType(QgsPluginLayerType* type)
77+
bool QgsPluginLayerRegistry::addPluginLayerType( QgsPluginLayerType* type )
7878
{
79-
if (type == NULL)
79+
if ( type == NULL )
8080
return false;
81-
if (mPluginLayerTypes.contains(type->name()))
81+
if ( mPluginLayerTypes.contains( type->name() ) )
8282
return false;
8383

8484
mPluginLayerTypes[type->name()] = type;
8585
return true;
8686
}
8787

8888

89-
bool QgsPluginLayerRegistry::removePluginLayerType(QString typeName)
89+
bool QgsPluginLayerRegistry::removePluginLayerType( QString typeName )
9090
{
91-
if (!mPluginLayerTypes.contains(typeName))
91+
if ( !mPluginLayerTypes.contains( typeName ) )
9292
return false;
9393

9494
// remove all remaining layers of this type - to avoid invalid behaviour
9595
QList<QgsMapLayer*> layers = QgsMapLayerRegistry::instance()->mapLayers().values();
96-
foreach (QgsMapLayer* layer, layers)
96+
foreach( QgsMapLayer* layer, layers )
9797
{
98-
if (layer->type() == QgsMapLayer::PluginLayer)
98+
if ( layer->type() == QgsMapLayer::PluginLayer )
9999
{
100-
QgsPluginLayer* pl = qobject_cast<QgsPluginLayer*>(layer);
101-
if (pl->pluginLayerType() == typeName)
100+
QgsPluginLayer* pl = qobject_cast<QgsPluginLayer*>( layer );
101+
if ( pl->pluginLayerType() == typeName )
102102
{
103-
QgsMapLayerRegistry::instance()->removeMapLayer(layer->getLayerID());
103+
QgsMapLayerRegistry::instance()->removeMapLayer( layer->getLayerID() );
104104
}
105105
}
106106
}
107107

108-
delete mPluginLayerTypes.take(typeName);
108+
delete mPluginLayerTypes.take( typeName );
109109
return true;
110110
}
111111

112-
QgsPluginLayerType* QgsPluginLayerRegistry::pluginLayerType(QString typeName)
112+
QgsPluginLayerType* QgsPluginLayerRegistry::pluginLayerType( QString typeName )
113113
{
114-
return mPluginLayerTypes.value(typeName, NULL);
114+
return mPluginLayerTypes.value( typeName, NULL );
115115
}
116116

117117

118-
QgsPluginLayer* QgsPluginLayerRegistry::createLayer(QString typeName)
118+
QgsPluginLayer* QgsPluginLayerRegistry::createLayer( QString typeName )
119119
{
120-
QgsPluginLayerType* type = pluginLayerType(typeName);
121-
if (!type)
120+
QgsPluginLayerType* type = pluginLayerType( typeName );
121+
if ( !type )
122122
{
123-
QgsDebugMsg("Unknown plugin layer type: "+typeName);
123+
QgsDebugMsg( "Unknown plugin layer type: " + typeName );
124124
return NULL;
125125
}
126126

‎src/core/qgsproviderregistry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ QgsProviderRegistry::QgsProviderRegistry( QString pluginPath )
210210
else
211211
{
212212
myMessage += "...invalid (lib not loadable): ";
213-
myMessage += myLib->errorString ();
213+
myMessage += myLib->errorString();
214214
}
215215

216216
QgsDebugMsg( myMessage );

‎src/core/qgsvectorfilewriter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ QgsVectorFileWriter::QgsVectorFileWriter(
9595

9696
deleteShapeFile( vectorFileName );
9797
}
98-
else if( driverName == "KML" )
98+
else if ( driverName == "KML" )
9999
{
100-
if( !vectorFileName.endsWith( ".kml", Qt::CaseInsensitive ) )
100+
if ( !vectorFileName.endsWith( ".kml", Qt::CaseInsensitive ) )
101101
{
102102
vectorFileName += ".kml";
103103
}
104104

105-
if( fileEncoding.compare( "UTF-8", Qt::CaseInsensitive )!=0 )
105+
if ( fileEncoding.compare( "UTF-8", Qt::CaseInsensitive ) != 0 )
106106
{
107107
QgsDebugMsg( "forced UTF-8 encoding for KML" );
108108
fileEncoding = "UTF-8";

‎src/core/symbology-ng/qgsrendererv2registry.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ QgsRendererV2Registry::QgsRendererV2Registry()
1212
{
1313
// add default renderers
1414
addRenderer( new QgsRendererV2Metadata( "singleSymbol",
15-
QObject::tr( "Single Symbol" ),
16-
QgsSingleSymbolRendererV2::create ) );
15+
QObject::tr( "Single Symbol" ),
16+
QgsSingleSymbolRendererV2::create ) );
1717
addRenderer( new QgsRendererV2Metadata( "categorizedSymbol",
18-
QObject::tr( "Categorized" ),
19-
QgsCategorizedSymbolRendererV2::create ) );
18+
QObject::tr( "Categorized" ),
19+
QgsCategorizedSymbolRendererV2::create ) );
2020
addRenderer( new QgsRendererV2Metadata( "graduatedSymbol",
21-
QObject::tr( "Graduated" ),
22-
QgsGraduatedSymbolRendererV2::create ) );
21+
QObject::tr( "Graduated" ),
22+
QgsGraduatedSymbolRendererV2::create ) );
2323
}
2424

2525
QgsRendererV2Registry::~QgsRendererV2Registry()
2626
{
27-
foreach (QString name, mRenderers.keys())
27+
foreach( QString name, mRenderers.keys() )
2828
{
2929
delete mRenderers[name];
3030
}
@@ -42,7 +42,7 @@ QgsRendererV2Registry* QgsRendererV2Registry::instance()
4242

4343
bool QgsRendererV2Registry::addRenderer( QgsRendererV2AbstractMetadata* metadata )
4444
{
45-
if (metadata == NULL || mRenderers.contains(metadata->name()) )
45+
if ( metadata == NULL || mRenderers.contains( metadata->name() ) )
4646
return false;
4747

4848
mRenderers[metadata->name()] = metadata;

‎src/core/symbology-ng/qgsrendererv2registry.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata
2727
QString visibleName() const { return mVisibleName; }
2828

2929
QIcon icon() const { return mIcon; }
30-
void setIcon(const QIcon& icon) { mIcon = icon; }
30+
void setIcon( const QIcon& icon ) { mIcon = icon; }
3131

3232
/** Return new instance of the renderer given the DOM element. Returns NULL on error.
3333
* Pure virtual function: must be implemented in derived classes. */
3434
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) = 0;
3535
/** Return new instance of settings widget for the renderer. Returns NULL on error. */
3636
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
37-
{ return NULL; }
37+
{ return NULL; }
3838

3939
protected:
4040
//! name used within QGIS for identification (the same what renderer's type() returns)
@@ -64,9 +64,9 @@ class CORE_EXPORT QgsRendererV2Metadata : public QgsRendererV2AbstractMetadata
6464
QgsRendererV2WidgetFunc pfWidget = NULL )
6565
: QgsRendererV2AbstractMetadata( name, visibleName, icon ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
6666

67-
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) { return mCreateFunc ? mCreateFunc(elem):NULL; }
67+
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) { return mCreateFunc ? mCreateFunc( elem ) : NULL; }
6868
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
69-
{ return mWidgetFunc ? mWidgetFunc(layer, style, renderer) : NULL; }
69+
{ return mWidgetFunc ? mWidgetFunc( layer, style, renderer ) : NULL; }
7070

7171
QgsRendererV2CreateFunc createFunction() const { return mCreateFunc; }
7272
QgsRendererV2WidgetFunc widgetFunction() const { return mWidgetFunc; }

‎src/core/symbology-ng/qgssymbollayerv2registry.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ typedef QgsSymbolLayerV2Widget*( *QgsSymbolLayerV2WidgetFunc )();
3838
*/
3939
class CORE_EXPORT QgsSymbolLayerV2Metadata : public QgsSymbolLayerV2AbstractMetadata
4040
{
41-
public:
42-
QgsSymbolLayerV2Metadata( QString name, QgsSymbolV2::SymbolType type,
43-
QgsSymbolLayerV2CreateFunc pfCreate,
44-
QgsSymbolLayerV2WidgetFunc pfWidget = NULL )
45-
: QgsSymbolLayerV2AbstractMetadata( name, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
41+
public:
42+
QgsSymbolLayerV2Metadata( QString name, QgsSymbolV2::SymbolType type,
43+
QgsSymbolLayerV2CreateFunc pfCreate,
44+
QgsSymbolLayerV2WidgetFunc pfWidget = NULL )
45+
: QgsSymbolLayerV2AbstractMetadata( name, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
4646

47-
QgsSymbolLayerV2CreateFunc createFunction() const { return mCreateFunc; }
48-
QgsSymbolLayerV2WidgetFunc widgetFunction() const { return mWidgetFunc; }
47+
QgsSymbolLayerV2CreateFunc createFunction() const { return mCreateFunc; }
48+
QgsSymbolLayerV2WidgetFunc widgetFunction() const { return mWidgetFunc; }
4949

50-
void setWidgetFunction( QgsSymbolLayerV2WidgetFunc f ) { mWidgetFunc = f; }
50+
void setWidgetFunction( QgsSymbolLayerV2WidgetFunc f ) { mWidgetFunc = f; }
5151

52-
virtual QgsSymbolLayerV2* createSymbolLayer( const QgsStringMap& map ) { return mCreateFunc ? mCreateFunc(map) : NULL; }
53-
virtual QgsSymbolLayerV2Widget* createSymbolLayerWidget() { return mWidgetFunc ? mWidgetFunc() : NULL; }
52+
virtual QgsSymbolLayerV2* createSymbolLayer( const QgsStringMap& map ) { return mCreateFunc ? mCreateFunc( map ) : NULL; }
53+
virtual QgsSymbolLayerV2Widget* createSymbolLayerWidget() { return mWidgetFunc ? mWidgetFunc() : NULL; }
5454

55-
protected:
56-
QgsSymbolLayerV2CreateFunc mCreateFunc;
57-
QgsSymbolLayerV2WidgetFunc mWidgetFunc;
55+
protected:
56+
QgsSymbolLayerV2CreateFunc mCreateFunc;
57+
QgsSymbolLayerV2WidgetFunc mWidgetFunc;
5858
};
5959

6060

‎src/core/symbology/qgssymbol.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ QImage QgsSymbol::getPointSymbolAsImage( double widthScale, bool selected, QColo
412412
else
413413
{
414414
QgsDebugMsgLevel( QString( "marker:%1 mPointSize:%2 mPointSizeUnits:%3 scale:%4 widthScale:%5 rasterScaleFactor:%6 opacity:%7" )
415-
.arg( mPointSymbolName ).arg( mSize ).arg( mSizeInMapUnits ? "true" : "false" )
416-
.arg( scale ).arg( widthScale ).arg( rasterScaleFactor ).arg( opacity ), 3 );
415+
.arg( mPointSymbolName ).arg( mSize ).arg( mSizeInMapUnits ? "true" : "false" )
416+
.arg( scale ).arg( widthScale ).arg( rasterScaleFactor ).arg( opacity ), 3 );
417417

418418

419419
preRotateImage = QgsMarkerCatalogue::instance()->imageMarker(

‎src/gui/qgsprojectbadlayerguihandler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
class GUI_EXPORT QgsProjectBadLayerGuiHandler : public QObject, public QgsProjectBadLayerHandler
1414
{
15-
Q_OBJECT
15+
Q_OBJECT
1616

1717
public:
1818
QgsProjectBadLayerGuiHandler();

‎src/plugins/georeferencer/qgsmapcoordsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ QgsMapCoordsDialog::QgsMapCoordsDialog( QgsMapCanvas* qgisCanvas, QgsPoint pixel
4343
mToolEmitPoint->setButton( mPointFromCanvasPushButton );
4444

4545
QSettings s;
46-
mSnapToBackgroundLayerBox->setChecked( s.value( "/Plugin-GeoReferencer/snapToBackgroundLayers", QVariant(false) ).toBool() );
46+
mSnapToBackgroundLayerBox->setChecked( s.value( "/Plugin-GeoReferencer/snapToBackgroundLayers", QVariant( false ) ).toBool() );
4747

4848
connect( mPointFromCanvasPushButton, SIGNAL( clicked( bool ) ), this, SLOT( setToolEmitPoint( bool ) ) );
4949

‎src/plugins/gps_importer/qgsgpsplugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ void QgsGPSPlugin::createGPX()
172172
{
173173
QMessageBox::warning( NULL, tr( "Could not create file" ),
174174
tr( "Unable to create a GPX file with the given name. "
175-
"Try again with an other name or in an other "
176-
"directory." ) );
175+
"Try again with an other name or in an other "
176+
"directory." ) );
177177
return;
178178
}
179179
ofs << "<gpx></gpx>" << std::endl;

‎src/plugins/grass/qgis.g.browser.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ int main( int argc, char **argv )
1818
fprintf( stderr, "URL argument missing\n" );
1919
exit( 1 );
2020
}
21-
QString urlStr ( argv[1] );
22-
QUrl url ( urlStr );
21+
QString urlStr( argv[1] );
22+
QUrl url( urlStr );
2323
#ifdef Q_OS_WIN
2424
// openUrl on windows fails to open 'file://c:...' it must be 'file:///c:...' (3 slashes)
25-
if ( url.scheme() == "file" ) {
25+
if ( url.scheme() == "file" )
26+
{
2627
// this does not work, the drive was already removed by QT:
2728
//url.setPath ( "/" + url.path() );
28-
urlStr.replace ( "file://", "file:///" );
29-
url.setUrl ( urlStr );
30-
std::cout << "path reset to: " << qPrintable(url.path()) << std::endl;
29+
urlStr.replace( "file://", "file:///" );
30+
url.setUrl( urlStr );
31+
std::cout << "path reset to: " << qPrintable( url.path() ) << std::endl;
3132
}
3233
#endif
3334
QDesktopServices::openUrl( url );

‎src/plugins/grass/qgsgrassedittools.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ void QgsGrassEditAttributes::mouseClick( QgsPoint & point, Qt::MouseButton butto
893893
e->mAttributes->setLine( 0 );
894894
e->mAttributes->clear();
895895
e->mAttributes->raise();
896-
// Just to disable new button
896+
// Just to disable new button
897897
e->mAttributes->setCategoryMode( QgsGrassEdit::CAT_MODE_NOCAT, QString() );
898898
}
899899

‎src/plugins/grass/qgsgrassmapcalc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsGrassMapcalcView;
3131
* \brief Interface for r.mapcalc
3232
*/
3333
class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase,
34-
public QgsGrassModuleOptions
34+
public QgsGrassModuleOptions
3535
{
3636
Q_OBJECT
3737

‎src/plugins/grass/qgsgrassmodel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,12 @@ QString QgsGrassModelItem::info()
319319
str += "</table>";
320320
}
321321
Vect_close( &Map );
322-
}
322+
}
323323
catch ( QgsGrass::Exception &e )
324324
{
325325
QgsDebugMsg( QString( "Cannot open GRASS vector: %1" ).arg( e.what() ) );
326326
str += "</table>";
327-
str += QString( "%1 <br>").arg( e.what() );
327+
str += QString( "%1 <br>" ).arg( e.what() );
328328
}
329329

330330
return str;
@@ -380,7 +380,7 @@ QString QgsGrassModelItem::info()
380380
{
381381
QgsDebugMsg( QString( "Cannot open GRASS vector: %1" ).arg( e.what() ) );
382382
str += "</table>";
383-
str += QString( "%1 <br>").arg( e.what() );
383+
str += QString( "%1 <br>" ).arg( e.what() );
384384
}
385385
return str;
386386
}

‎src/plugins/grass/qgsgrassmodule.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class QgsGrassModuleOptions
193193
virtual QStringList output( int type ) { return QStringList() ; }
194194

195195
//! Has any output
196-
virtual bool hasOutput ( int type ) { return true; }
196+
virtual bool hasOutput( int type ) { return true; }
197197

198198
//! Has raster input or output
199199
virtual bool usesRegion() { return false; }
@@ -240,7 +240,7 @@ class QgsGrassModuleOptions
240240
*/
241241
class QgsGrassModuleStandardOptions: QWidget, public QgsGrassModuleOptions
242242
{
243-
Q_OBJECT
243+
Q_OBJECT
244244

245245
public:
246246
//! Constructor
@@ -268,7 +268,7 @@ class QgsGrassModuleStandardOptions: QWidget, public QgsGrassModuleOptions
268268
void thawOutput();
269269
QStringList ready() ;
270270
QStringList output( int type );
271-
bool hasOutput ( int type );
271+
bool hasOutput( int type );
272272
QStringList checkRegion();
273273
bool usesRegion();
274274
bool requestsRegion();

‎src/plugins/grass/qgsgrassplugin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,17 +308,17 @@ void QgsGrassPlugin::addVector()
308308
int level = Vect_open_old_head( &map, sel->map.toUtf8().data(),
309309
sel->mapset.toUtf8().data() );
310310

311-
if ( level == 1 )
311+
if ( level == 1 )
312312
{
313313
QgsDebugMsg( "Cannot open vector on level 2" );
314-
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 ) );
314+
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 ) );
315315
Vect_close( &map );
316316
return;
317317
}
318318
else if ( level < 1 )
319319
{
320320
QgsDebugMsg( "Cannot open vector" );
321-
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( sel->map ).arg( sel->mapset ) );
321+
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2" ).arg( sel->map ).arg( sel->mapset ) );
322322
return;
323323
}
324324

‎src/plugins/grass/qgsgrassselect.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,18 +413,18 @@ QStringList QgsGrassSelect::vectorLayers( QString gisdbase,
413413
{
414414
QgsDebugMsg( "Cannot open vector on level 2" );
415415
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 ) );
416-
// Vect_close here is correct, it should work, but it seems to cause
416+
// Vect_close here is correct, it should work, but it seems to cause
417417
// crash on win http://trac.osgeo.org/qgis/ticket/2003
418418
// disabled on win test it
419419
#if !defined(WIN32)
420420
Vect_close( &map );
421421
#endif
422422
return list;
423-
}
423+
}
424424
else if ( level < 1 )
425425
{
426426
QgsDebugMsg( "Cannot open vector" );
427-
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( mapName ).arg( mapset ) );
427+
QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2" ).arg( mapName ).arg( mapset ) );
428428
return list;
429429
}
430430

‎src/plugins/grass/qgsgrassshell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools, QTabWidget *parent, const ch
5757
*/
5858

5959
mTerminal->setSize( 80, 25 );
60-
mTerminal->setColorScheme ( COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW );
60+
mTerminal->setColorScheme( COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW );
6161
mTerminal->startShellProgram();
6262
mTerminal->setFocus( Qt::MouseFocusReason );
6363
}

‎src/plugins/grass/qgsgrasstools.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void QgsGrassTools::runModule( QString name )
140140
if ( name == "shell" )
141141
{
142142
#ifdef WIN32
143-
QgsGrass::putEnv ( "GRASS_HTML_BROWSER", QgsApplication::pkgDataPath() + "/grass/bin/qgis.g.browser" );
143+
QgsGrass::putEnv( "GRASS_HTML_BROWSER", QgsApplication::pkgDataPath() + "/grass/bin/qgis.g.browser" );
144144
if ( !QProcess::startDetached( getenv( "COMSPEC" ) ) )
145145
{
146146
QMessageBox::warning( 0, "Warning", tr( "Cannot start command shell (%1)" ).arg( getenv( "COMSPEC" ) ) );
@@ -168,8 +168,9 @@ void QgsGrassTools::runModule( QString name )
168168

169169
// Icon size in QT4 does not seem to be variable
170170
// -> reset the width to max icon width
171-
if ( mTabWidget->iconSize().width() < pixmap.width() ) {
172-
mTabWidget->setIconSize( QSize( pixmap.width(), mTabWidget->iconSize().height() ) );
171+
if ( mTabWidget->iconSize().width() < pixmap.width() )
172+
{
173+
mTabWidget->setIconSize( QSize( pixmap.width(), mTabWidget->iconSize().height() ) );
173174
}
174175

175176
QIcon is;

‎src/plugins/oracle_raster/qgsoracleconnect_ui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void QgsOracleConnect::on_buttonBox_rejected()
5555
{
5656
// cancel button mapped to context help - changed this to close the
5757
// dialog instead. If context help is to be added, a Help button
58-
// is required. - gsherman
58+
// is required. - gsherman
5959
// helpInfo();
6060
reject();
6161
}

‎src/plugins/spatialquery/qgsspatialquerydialogbase.ui

Lines changed: 318 additions & 318 deletions
Large diffs are not rendered by default.

‎src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature )
418418
switch ( attributeFields[*i].type() )
419419
{
420420
case QVariant::Int:
421-
if( !tokens[*i].isEmpty() )
421+
if ( !tokens[*i].isEmpty() )
422422
val = QVariant( tokens[*i].toInt() );
423423
else
424424
val = QVariant( attributeFields[*i].type() );
425425
break;
426426
case QVariant::Double:
427-
if( !tokens[*i].isEmpty() )
427+
if ( !tokens[*i].isEmpty() )
428428
val = QVariant( tokens[*i].toDouble() );
429429
else
430430
val = QVariant( attributeFields[*i].type() );

‎src/providers/grass/qgis.d.rast.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int main( int argc, char **argv )
5959
if ( mapset == NULL )
6060
G_fatal_error(( "Raster map <%s> not found" ), name );
6161

62-
/* It can happen that GRASS data set is 'corrupted' and zone differs in WIND and
62+
/* It can happen that GRASS data set is 'corrupted' and zone differs in WIND and
6363
* cellhd, and G_open_cell_old fails, so it is better to read window from map */
6464
/* G_get_window( &window ); */
6565
G_get_cellhd( name, mapset, &window );
@@ -140,11 +140,11 @@ static int cell_draw( char *name,
140140
/* some buggy C libraries require BOTH setmode() and fdopen(bin) */
141141
#ifdef WIN32
142142
if ( _setmode( _fileno( stdout ), _O_BINARY ) == -1 )
143-
G_fatal_error( "Cannot set stdout mode" );
143+
G_fatal_error( "Cannot set stdout mode" );
144144
#endif
145145
// Unfortunately this is not sufficient on Windows to switch stdout to binary mode
146-
fo = fdopen (fileno(stdout), "wb");
147-
146+
fo = fdopen( fileno( stdout ), "wb" );
147+
148148
/* loop for array rows */
149149
for ( row = 0; row < nrows; row++ )
150150
{

‎src/python/qgspythonutilsimpl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ bool QgsPythonUtilsImpl::runString( const QString& command, QString msgOnError )
162162
evalString( "sys.version", version );
163163

164164
QString str = "<font color=\"red\">" + msgOnError + "</font><br><br>" + traceback + "<br>"
165-
+ QObject::tr( "Python version:" ) + "<br>" + version + "<br><br>"
166-
+ 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>"
167-
+ QObject::tr( "Python path:" ) + "<br>" + path;
165+
+ QObject::tr( "Python version:" ) + "<br>" + version + "<br><br>"
166+
+ 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>"
167+
+ QObject::tr( "Python path:" ) + "<br>" + path;
168168
str.replace( "\n", "<br>" ).replace( " ", "&nbsp; " );
169169

170170
QgsMessageOutput* msg = QgsMessageOutput::createMessageOutput();

‎src/python/qgspythonutilsimpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
9999
QString getPluginMetadata( QString pluginName, QString function );
100100

101101
//! confirm it is safe to uninstall the plugin
102-
bool canUninstallPlugin( QString packageName );
102+
bool canUninstallPlugin( QString packageName );
103103

104104
//! unload plugin
105105
bool unloadPlugin( QString packageName );

‎tests/src/core/testqgssearchstring.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
class TestQgsSearchString : public QObject
2222
{
23-
Q_OBJECT;
23+
Q_OBJECT;
2424
private slots:
2525
//void initTestCase();// will be called before the first testfunction is executed.
2626
//void cleanupTestCase();// will be called after the last testfunction was executed.
@@ -34,39 +34,39 @@ class TestQgsSearchString : public QObject
3434
QString mReport;
3535
};
3636

37-
static bool evalString(QString str)
37+
static bool evalString( QString str )
3838
{
3939
QgsSearchString ss;
40-
ss.setString(str);
41-
return ss.tree()->checkAgainst(QgsFieldMap(), QgsAttributeMap());
40+
ss.setString( str );
41+
return ss.tree()->checkAgainst( QgsFieldMap(), QgsAttributeMap() );
4242
}
4343

4444
void TestQgsSearchString::testLike()
4545
{
46-
QVERIFY( evalString("'a' LIKE 'a'") );
47-
QVERIFY( ! evalString("'aa' LIKE 'a'") );
48-
QVERIFY( ! evalString("'a' LIKE 'b'") );
46+
QVERIFY( evalString( "'a' LIKE 'a'" ) );
47+
QVERIFY( ! evalString( "'aa' LIKE 'a'" ) );
48+
QVERIFY( ! evalString( "'a' LIKE 'b'" ) );
4949

50-
QVERIFY( evalString("'abba' LIKE 'a%'") );
51-
QVERIFY( ! evalString("'abba' LIKE 'b%'") );
52-
QVERIFY( evalString("'abba' LIKE '%a'") );
53-
QVERIFY( ! evalString("'abba' LIKE '%b'") );
50+
QVERIFY( evalString( "'abba' LIKE 'a%'" ) );
51+
QVERIFY( ! evalString( "'abba' LIKE 'b%'" ) );
52+
QVERIFY( evalString( "'abba' LIKE '%a'" ) );
53+
QVERIFY( ! evalString( "'abba' LIKE '%b'" ) );
5454

55-
QVERIFY( evalString("'abba' LIKE '%bb%'") );
56-
QVERIFY( evalString("'abba' LIKE 'a%a'") );
57-
QVERIFY( ! evalString("'abba' LIKE 'b%b'") );
55+
QVERIFY( evalString( "'abba' LIKE '%bb%'" ) );
56+
QVERIFY( evalString( "'abba' LIKE 'a%a'" ) );
57+
QVERIFY( ! evalString( "'abba' LIKE 'b%b'" ) );
5858
}
5959

6060
void TestQgsSearchString::testRegexp()
6161
{
62-
QVERIFY( evalString("'a' ~ 'a'") );
63-
QVERIFY( ! evalString("'b' ~ 'a'") );
62+
QVERIFY( evalString( "'a' ~ 'a'" ) );
63+
QVERIFY( ! evalString( "'b' ~ 'a'" ) );
6464

65-
QVERIFY( evalString("'abba' ~ 'a'") );
66-
QVERIFY( ! evalString("'abba' ~ 'aba'") );
67-
QVERIFY( evalString("'abba' ~ 'a.*a'") );
68-
QVERIFY( evalString("'abba' ~ 'a[b]+a'") );
65+
QVERIFY( evalString( "'abba' ~ 'a'" ) );
66+
QVERIFY( ! evalString( "'abba' ~ 'aba'" ) );
67+
QVERIFY( evalString( "'abba' ~ 'a.*a'" ) );
68+
QVERIFY( evalString( "'abba' ~ 'a[b]+a'" ) );
6969
}
7070

71-
QTEST_MAIN(TestQgsSearchString)
71+
QTEST_MAIN( TestQgsSearchString )
7272
#include "moc_testqgssearchstring.cxx"

0 commit comments

Comments
 (0)
Please sign in to comment.