Skip to content
Permalink
Browse files

automatic indentation update (r15222-r15302)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15303 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 1, 2011
1 parent 52144b4 commit 2d9e69d72a52735ca7d12922202e28fd43005321
@@ -83,7 +83,7 @@ void QgsManageConnectionsDialog::doExportImport()
if ( mDialogMode == Export )
{
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save connections" ), ".",
tr( "XML files (*.xml *.XML)" ) );
tr( "XML files (*.xml *.XML)" ) );
if ( fileName.isEmpty() )
{
return;
@@ -354,15 +354,15 @@ void QgsManageConnectionsDialog::loadWMSConnections( const QDomDocument &doc, co
{
case QMessageBox::Cancel: return;
case QMessageBox::No: child = child.nextSiblingElement();
continue;
continue;
case QMessageBox::Yes: overwrite = true;
break;
break;
case QMessageBox::YesToAll: prompt = false;
overwrite = true;
break;
overwrite = true;
break;
case QMessageBox::NoToAll: prompt = false;
overwrite = false;
break;
overwrite = false;
break;
}
}

@@ -429,15 +429,15 @@ void QgsManageConnectionsDialog::loadPgConnections( const QDomDocument &doc, con
{
case QMessageBox::Cancel: return;
case QMessageBox::No: child = child.nextSiblingElement();
continue;
continue;
case QMessageBox::Yes: overwrite = true;
break;
break;
case QMessageBox::YesToAll: prompt = false;
overwrite = true;
break;
overwrite = true;
break;
case QMessageBox::NoToAll: prompt = false;
overwrite = false;
break;
overwrite = false;
break;
}
}

@@ -79,7 +79,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
spinBoxIdentifyValue->setMinimum( 0.01 );
spinBoxIdentifyValue->setValue( identifyValue );

//local directories to search when loading c++ plugins
//local directories to search when loading c++ plugins
QString myPaths = settings.value( "plugins/searchPathsForPlugins", "" ).toString();
if ( !myPaths.isEmpty() )
{
@@ -728,8 +728,8 @@ void QgsRasterLayerProperties::sync()
{
labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) );
}
mDefaultStandardDeviation = myQSettings.value("/Raster/defaultStandardDeviation", 1.0).toDouble();
sboxThreeBandStdDev->setValue(mDefaultStandardDeviation);
mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toDouble();
sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
}

QgsDebugMsg( "populate transparency tab" );
@@ -64,14 +64,14 @@ void QgsTipGui::showTip( QgsTip myTip )
// TODO - This html construction can be simplified using QStringBuilder
// once Qt 4.6 is the minimum required version for building QGIS.
//
QString content = "<img src='"
+ QgsApplication::iconsPath()
+ "qgis-icon-60x60.png"
+ "' style='float:left;'>"
+ "<h2>"
+ myTip.title()
+ "</h2><br clear='all'/>"
+ myTip.content();
QString content = "<img src='"
+ QgsApplication::iconsPath()
+ "qgis-icon-60x60.png"
+ "' style='float:left;'>"
+ "<h2>"
+ myTip.title()
+ "</h2><br clear='all'/>"
+ myTip.content();

txtTip->setHtml( content );
}
@@ -253,7 +253,7 @@ void QgsWMSSourceSelect::saveClicked()
void QgsWMSSourceSelect::loadClicked()
{
QString fileName = QFileDialog::getOpenFileName( this, tr( "Load connections" ), ".",
tr( "XML files (*.xml *XML)" ) );
tr( "XML files (*.xml *XML)" ) );
if ( fileName.isEmpty() )
{
return;
@@ -88,7 +88,7 @@ void QgsStyleV2ExportImportDialog::doExportImport()
if ( mDialogMode == Export )
{
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save styles" ), ".",
tr( "XML files (*.xml *.XML)" ) );
tr( "XML files (*.xml *.XML)" ) );
if ( fileName.isEmpty() )
{
return;
@@ -184,7 +184,7 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
bool prompt = true;
bool overwrite = true;

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

if ( isSymbol )
{
if ( dst->symbolNames().contains( symbolName ) && prompt )
if ( dst->symbolNames().contains( symbolName ) && prompt )
{
int res = QMessageBox::warning( this, tr( "Duplicate names" ),
tr( "Symbol with name '%1' already exists.\nOverwrite?" )
@@ -208,21 +208,21 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
case QMessageBox::Cancel: return;
case QMessageBox::No: continue;
case QMessageBox::Yes: dst->addSymbol( symbolName, symbol );
continue;
continue;
case QMessageBox::YesToAll: prompt = false;
overwrite = true;
break;
overwrite = true;
break;
case QMessageBox::NoToAll: prompt = false;
overwrite = false;
break;
overwrite = false;
break;
}
}

if ( dst->symbolNames().contains( symbolName ) && overwrite )
if ( dst->symbolNames().contains( symbolName ) && overwrite )
{
dst->addSymbol( symbolName, symbol );
}
else if ( dst->symbolNames().contains( symbolName ) && !overwrite )
else if ( dst->symbolNames().contains( symbolName ) && !overwrite )
{
continue;
}
@@ -233,7 +233,7 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
}
else
{
if ( dst->colorRampNames().contains( symbolName ) && prompt )
if ( dst->colorRampNames().contains( symbolName ) && prompt )
{
int res = QMessageBox::warning( this, tr( "Duplicate names" ),
tr( "Color ramp with name '%1' already exists.\nOverwrite?" )
@@ -244,21 +244,21 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt
case QMessageBox::Cancel: return;
case QMessageBox::No: continue;
case QMessageBox::Yes: dst->addColorRamp( symbolName, ramp );
continue;
continue;
case QMessageBox::YesToAll: prompt = false;
overwrite = true;
break;
overwrite = true;
break;
case QMessageBox::NoToAll: prompt = false;
overwrite = false;
break;
overwrite = false;
break;
}
}

if ( dst->colorRampNames().contains( symbolName ) && overwrite )
if ( dst->colorRampNames().contains( symbolName ) && overwrite )
{
dst->addColorRamp( symbolName, ramp );
}
else if ( dst->colorRampNames().contains( symbolName ) && !overwrite )
else if ( dst->colorRampNames().contains( symbolName ) && !overwrite )
{
continue;
}
@@ -16,7 +16,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: qgsrubberselectid.cpp 13377 2010-04-25 01:07:36Z jef $ */
/* $Id$ */

#include "qgsrubberselectid.h"

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

void QgsRubberSelectId::reset()
{
mRubberBand->reset( mIsPolygon );
mRubberBand->reset( mIsPolygon );
} // void QgsRubberSelectId::reset()

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
void QgsRubberSelectId::addFeature( QgsVectorLayer* lyr, int fid )
{
bool isPolygon = ( lyr->geometryType() == QGis::Polygon );
if( mIsPolygon != isPolygon)
if ( mIsPolygon != isPolygon )
{
reset();
delete mRubberBand;
@@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id: qgsrubberselectid.h 13377 2010-04-25 01:07:36Z jef $ */
/* $Id$ */

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

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

0 comments on commit 2d9e69d

Please sign in to comment.
You can’t perform that action at this time.