Skip to content

Commit 5603cc0

Browse files
jef-njef-n
committedSep 6, 2012
indentation update
·
ltr-3_40Before-merge-new_vector_api
1 parent 30c7ec4 commit 5603cc0

18 files changed

+399
-393
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
511511

512512
// create the notification widget for macros
513513
mMacrosWarn = QgsMessageBar::createMessage( tr( "Security warning:" ),
514-
tr( "macros have been disabled." ),
515-
QgsApplication::getThemeIcon( "/mIconWarn.png" ),
516-
mInfoBar );
514+
tr( "macros have been disabled." ),
515+
QgsApplication::getThemeIcon( "/mIconWarn.png" ),
516+
mInfoBar );
517517

518518
QToolButton *btnEnableMacros = new QToolButton( mMacrosWarn );
519519
btnEnableMacros->setText( tr( "Enable" ) );

‎src/app/qgsattributetypedialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ void QgsAttributeTypeDialog::accept()
607607
mValueRelationData.mAllowNull = valueRelationAllowNull->isChecked();
608608
mValueRelationData.mOrderByValue = valueRelationOrderByValue->isChecked();
609609
mValueRelationData.mAllowMulti = valueRelationAllowMulti->isChecked();
610-
if( valueRelationFilterColumn->currentIndex() == 0 )
610+
if ( valueRelationFilterColumn->currentIndex() == 0 )
611611
{
612612
mValueRelationData.mFilterAttributeColumn = QString::null;
613613
mValueRelationData.mFilterAttributeValue = QString::null;
@@ -655,7 +655,7 @@ void QgsAttributeTypeDialog::updateLayerColumns( int idx )
655655
valueRelationKeyColumn->setCurrentIndex( valueRelationKeyColumn->findText( mValueRelationData.mKey ) );
656656
valueRelationValueColumn->setCurrentIndex( valueRelationValueColumn->findText( mValueRelationData.mValue ) );
657657

658-
if( mValueRelationData.mFilterAttributeColumn.isNull() )
658+
if ( mValueRelationData.mFilterAttributeColumn.isNull() )
659659
{
660660
valueRelationFilterColumn->setCurrentIndex( 0 );
661661
}
@@ -683,7 +683,7 @@ void QgsAttributeTypeDialog::updateFilterColumn( int idx )
683683
QList<QVariant> uniqueValues;
684684
vl->uniqueValues( fidx, uniqueValues );
685685

686-
foreach( const QVariant &v, uniqueValues )
686+
foreach ( const QVariant &v, uniqueValues )
687687
{
688688
valueRelationFilterValue->addItem( v.toString(), v );
689689
}

‎src/app/qgsdiagramproperties.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ void QgsDiagramProperties::on_mAddCategoryPushButton_clicked()
376376

377377
void QgsDiagramProperties::on_mAttributesTreeWidget_itemDoubleClicked( QTreeWidgetItem * item, int column )
378378
{
379+
Q_UNUSED( column );
379380
addAttribute( item );
380381
}
381382

‎src/app/qgsmeasuretool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class QgsMeasureTool : public QgsMapTool
4040
//! returns whether measuring distance or area
4141
bool measureArea() { return mMeasureArea; }
4242

43-
//! When we hvae added our last point, and not following
43+
//! When we have added our last point, and not following
4444
// Added in 2.0
4545
bool done() { return mDone; }
4646

‎src/core/composer/qgscomposerscalebar.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,15 @@ void QgsComposerScaleBar::applyDefaultSize()
242242
int nUnitsPerSegment = widthMeter / 10.0; //default scalebar width equals half the map width
243243
setNumUnitsPerSegment( nUnitsPerSegment );
244244

245-
if( nUnitsPerSegment > 1000 )
245+
if ( nUnitsPerSegment > 1000 )
246246
{
247-
setNumUnitsPerSegment( (int)( numUnitsPerSegment() / 1000.0 + 0.5 ) * 1000 );
248-
setUnitLabeling( tr("km") );
249-
setNumMapUnitsPerScaleBarUnit( 1000 );
247+
setNumUnitsPerSegment(( int )( numUnitsPerSegment() / 1000.0 + 0.5 ) * 1000 );
248+
setUnitLabeling( tr( "km" ) );
249+
setNumMapUnitsPerScaleBarUnit( 1000 );
250250
}
251251
else
252252
{
253-
setUnitLabeling( tr("m") );
253+
setUnitLabeling( tr( "m" ) );
254254
}
255255

256256
setNumSegments( 4 );

‎src/core/composer/qgscomposition.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
158158

159159
/**Load a template document
160160
@param doc template document
161-
@param substitutionMap map with text to replace. Text needs to be enclosed by brackets (e.g. '[text]' )*/
161+
@param substitutionMap map with text to replace. Text needs to be enclosed by brackets (e.g. '[text]' )
162+
@param addUndoCommands whether or not to add undo commands
163+
*/
162164
bool loadFromTemplate( const QDomDocument& doc, QMap<QString, QString>* substitutionMap = 0, bool addUndoCommands = false );
163165

164166
/**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)

‎src/core/diagram/qgstextdiagram.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
4040
{
4141
return QSizeF(); //zero size if attribute is missing
4242
}
43-
43+
4444
double scaledValue = attIt.value().toDouble();
4545
double scaledLowerValue = is.lowerValue;
4646
double scaledUpperValue = is.upperValue;
@@ -77,11 +77,11 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
7777
}
7878

7979
QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
80-
{
80+
{
8181
Q_UNUSED( c );
82-
Q_UNUSED( attributes );
82+
Q_UNUSED( attributes );
8383

84-
return s.size;
84+
return s.size;
8585
}
8686

8787
void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )
@@ -218,11 +218,11 @@ void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext
218218
mPen.setColor( s.categoryColors.at( i ) );
219219
p->setPen( mPen );
220220
QPointF position = textPositions.at( i );
221-
221+
222222
// Calculate vertical placement
223223
double xOffset = 0;
224224

225-
switch( s.labelPlacementMethod )
225+
switch ( s.labelPlacementMethod )
226226
{
227227
case QgsDiagramSettings::Height:
228228
xOffset = textHeight / 2.0;

‎src/core/qgsapplication.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ void QgsApplication::init( QString customConfigPath )
9191

9292
// check if QGIS is run from build directory (not the install directory)
9393
QFile f;
94-
foreach( QString path, QStringList() << "" << "/.." << "/bin" )
94+
foreach ( QString path, QStringList() << "" << "/.." << "/bin" )
9595
{
9696
f.setFileName( prefixPath + path + "/path.txt" );
97-
if( f.exists() )
97+
if ( f.exists() )
9898
break;
9999
}
100100
if ( f.exists() && f.open( QIODevice::ReadOnly ) )

0 commit comments

Comments
 (0)
Please sign in to comment.