Skip to content

Commit 2d9e69d

Browse files
author
jef
committed
automatic indentation update (r15222-r15302)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15303 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 52144b4 commit 2d9e69d

11 files changed

+573
-573
lines changed

‎src/app/qgsmanageconnectionsdialog.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void QgsManageConnectionsDialog::doExportImport()
8383
if ( mDialogMode == Export )
8484
{
8585
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save connections" ), ".",
86-
tr( "XML files (*.xml *.XML)" ) );
86+
tr( "XML files (*.xml *.XML)" ) );
8787
if ( fileName.isEmpty() )
8888
{
8989
return;
@@ -354,15 +354,15 @@ void QgsManageConnectionsDialog::loadWMSConnections( const QDomDocument &doc, co
354354
{
355355
case QMessageBox::Cancel: return;
356356
case QMessageBox::No: child = child.nextSiblingElement();
357-
continue;
357+
continue;
358358
case QMessageBox::Yes: overwrite = true;
359-
break;
359+
break;
360360
case QMessageBox::YesToAll: prompt = false;
361-
overwrite = true;
362-
break;
361+
overwrite = true;
362+
break;
363363
case QMessageBox::NoToAll: prompt = false;
364-
overwrite = false;
365-
break;
364+
overwrite = false;
365+
break;
366366
}
367367
}
368368

@@ -429,15 +429,15 @@ void QgsManageConnectionsDialog::loadPgConnections( const QDomDocument &doc, con
429429
{
430430
case QMessageBox::Cancel: return;
431431
case QMessageBox::No: child = child.nextSiblingElement();
432-
continue;
432+
continue;
433433
case QMessageBox::Yes: overwrite = true;
434-
break;
434+
break;
435435
case QMessageBox::YesToAll: prompt = false;
436-
overwrite = true;
437-
break;
436+
overwrite = true;
437+
break;
438438
case QMessageBox::NoToAll: prompt = false;
439-
overwrite = false;
440-
break;
439+
overwrite = false;
440+
break;
441441
}
442442
}
443443

‎src/app/qgsoptions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
7979
spinBoxIdentifyValue->setMinimum( 0.01 );
8080
spinBoxIdentifyValue->setValue( identifyValue );
8181

82-
//local directories to search when loading c++ plugins
82+
//local directories to search when loading c++ plugins
8383
QString myPaths = settings.value( "plugins/searchPathsForPlugins", "" ).toString();
8484
if ( !myPaths.isEmpty() )
8585
{

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,8 @@ void QgsRasterLayerProperties::sync()
728728
{
729729
labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) );
730730
}
731-
mDefaultStandardDeviation = myQSettings.value("/Raster/defaultStandardDeviation", 1.0).toDouble();
732-
sboxThreeBandStdDev->setValue(mDefaultStandardDeviation);
731+
mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toDouble();
732+
sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
733733
}
734734

735735
QgsDebugMsg( "populate transparency tab" );

‎src/app/qgstipgui.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ void QgsTipGui::showTip( QgsTip myTip )
6464
// TODO - This html construction can be simplified using QStringBuilder
6565
// once Qt 4.6 is the minimum required version for building QGIS.
6666
//
67-
QString content = "<img src='"
68-
+ QgsApplication::iconsPath()
69-
+ "qgis-icon-60x60.png"
70-
+ "' style='float:left;'>"
71-
+ "<h2>"
72-
+ myTip.title()
73-
+ "</h2><br clear='all'/>"
74-
+ myTip.content();
67+
QString content = "<img src='"
68+
+ QgsApplication::iconsPath()
69+
+ "qgis-icon-60x60.png"
70+
+ "' style='float:left;'>"
71+
+ "<h2>"
72+
+ myTip.title()
73+
+ "</h2><br clear='all'/>"
74+
+ myTip.content();
7575

7676
txtTip->setHtml( content );
7777
}

‎src/app/qgswmssourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void QgsWMSSourceSelect::saveClicked()
253253
void QgsWMSSourceSelect::loadClicked()
254254
{
255255
QString fileName = QFileDialog::getOpenFileName( this, tr( "Load connections" ), ".",
256-
tr( "XML files (*.xml *XML)" ) );
256+
tr( "XML files (*.xml *XML)" ) );
257257
if ( fileName.isEmpty() )
258258
{
259259
return;

‎src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void QgsStyleV2ExportImportDialog::doExportImport()
8888
if ( mDialogMode == Export )
8989
{
9090
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save styles" ), ".",
91-
tr( "XML files (*.xml *.XML)" ) );
91+
tr( "XML files (*.xml *.XML)" ) );
9292
if ( fileName.isEmpty() )
9393
{
9494
return;
@@ -184,7 +184,7 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
184184
bool prompt = true;
185185
bool overwrite = true;
186186

187-
for( int i = 0; i < selection->size(); ++i )
187+
for ( int i = 0; i < selection->size(); ++i )
188188
{
189189
index = selection->at( i );
190190
symbolName = index.model()->data( index, 0 ).toString();
@@ -197,7 +197,7 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
197197

198198
if ( isSymbol )
199199
{
200-
if ( dst->symbolNames().contains( symbolName ) && prompt )
200+
if ( dst->symbolNames().contains( symbolName ) && prompt )
201201
{
202202
int res = QMessageBox::warning( this, tr( "Duplicate names" ),
203203
tr( "Symbol with name '%1' already exists.\nOverwrite?" )
@@ -208,21 +208,21 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
208208
case QMessageBox::Cancel: return;
209209
case QMessageBox::No: continue;
210210
case QMessageBox::Yes: dst->addSymbol( symbolName, symbol );
211-
continue;
211+
continue;
212212
case QMessageBox::YesToAll: prompt = false;
213-
overwrite = true;
214-
break;
213+
overwrite = true;
214+
break;
215215
case QMessageBox::NoToAll: prompt = false;
216-
overwrite = false;
217-
break;
216+
overwrite = false;
217+
break;
218218
}
219219
}
220220

221-
if ( dst->symbolNames().contains( symbolName ) && overwrite )
221+
if ( dst->symbolNames().contains( symbolName ) && overwrite )
222222
{
223223
dst->addSymbol( symbolName, symbol );
224224
}
225-
else if ( dst->symbolNames().contains( symbolName ) && !overwrite )
225+
else if ( dst->symbolNames().contains( symbolName ) && !overwrite )
226226
{
227227
continue;
228228
}
@@ -233,7 +233,7 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
233233
}
234234
else
235235
{
236-
if ( dst->colorRampNames().contains( symbolName ) && prompt )
236+
if ( dst->colorRampNames().contains( symbolName ) && prompt )
237237
{
238238
int res = QMessageBox::warning( this, tr( "Duplicate names" ),
239239
tr( "Color ramp with name '%1' already exists.\nOverwrite?" )
@@ -244,21 +244,21 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
244244
case QMessageBox::Cancel: return;
245245
case QMessageBox::No: continue;
246246
case QMessageBox::Yes: dst->addColorRamp( symbolName, ramp );
247-
continue;
247+
continue;
248248
case QMessageBox::YesToAll: prompt = false;
249-
overwrite = true;
250-
break;
249+
overwrite = true;
250+
break;
251251
case QMessageBox::NoToAll: prompt = false;
252-
overwrite = false;
253-
break;
252+
overwrite = false;
253+
break;
254254
}
255255
}
256256

257-
if ( dst->colorRampNames().contains( symbolName ) && overwrite )
257+
if ( dst->colorRampNames().contains( symbolName ) && overwrite )
258258
{
259259
dst->addColorRamp( symbolName, ramp );
260260
}
261-
else if ( dst->colorRampNames().contains( symbolName ) && !overwrite )
261+
else if ( dst->colorRampNames().contains( symbolName ) && !overwrite )
262262
{
263263
continue;
264264
}

‎src/plugins/spatialquery/qgsrubberselectid.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* (at your option) any later version. *
1717
* *
1818
***************************************************************************/
19-
/* $Id: qgsrubberselectid.cpp 13377 2010-04-25 01:07:36Z jef $ */
19+
/* $Id$ */
2020

2121
#include "qgsrubberselectid.h"
2222

@@ -43,7 +43,7 @@ QgsRubberSelectId::~QgsRubberSelectId()
4343

4444
void QgsRubberSelectId::reset()
4545
{
46-
mRubberBand->reset( mIsPolygon );
46+
mRubberBand->reset( mIsPolygon );
4747
} // void QgsRubberSelectId::reset()
4848

4949
void QgsRubberSelectId::setStyle( int colorRed, int colorGreen, int colorBlue, int width )
@@ -58,7 +58,7 @@ void QgsRubberSelectId::setStyle( int colorRed, int colorGreen, int colorBlue, i
5858
void QgsRubberSelectId::addFeature( QgsVectorLayer* lyr, int fid )
5959
{
6060
bool isPolygon = ( lyr->geometryType() == QGis::Polygon );
61-
if( mIsPolygon != isPolygon)
61+
if ( mIsPolygon != isPolygon )
6262
{
6363
reset();
6464
delete mRubberBand;

‎src/plugins/spatialquery/qgsrubberselectid.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* (at your option) any later version. *
1616
* *
1717
***************************************************************************/
18-
/* $Id: qgsrubberselectid.h 13377 2010-04-25 01:07:36Z jef $ */
18+
/* $Id$ */
1919

2020
#ifndef QGSRUBBERSELECTID_H
2121
#define QGSRUBBERSELECTID_H
@@ -52,7 +52,7 @@ class QgsRubberSelectId
5252
* \param colorGreen integer for value green (0 - 255)
5353
* \param colorBlue integer for value blue (0 - 255)
5454
*/
55-
void setStyle( int colorRed, int colorGreen, int colorBlue, int width);
55+
void setStyle( int colorRed, int colorGreen, int colorBlue, int width );
5656

5757
/**
5858
* \brief Create rubber band from geometry by feature

0 commit comments

Comments
 (0)