Skip to content

Commit 80fd596

Browse files
author
jef
committed
automatic indentation update (r10918-r10980)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10981 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d4b702e commit 80fd596

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1062
-1060
lines changed

src/app/attributetable/qgsattributetabledialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void QgsAttributeTableDialog::on_mCopySelectedRowsButton_clicked()
203203

204204
void QgsAttributeTableDialog::on_mZoomMapToSelectedRowsButton_clicked()
205205
{
206-
QgisApp::instance()->mapCanvas()->zoomToSelected(mLayer);
206+
QgisApp::instance()->mapCanvas()->zoomToSelected( mLayer );
207207
}
208208

209209
void QgsAttributeTableDialog::on_mInvertSelectionButton_clicked()

src/app/attributetable/qgsattributetablememorymodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ bool QgsAttributeTableMemoryModel::setData( const QModelIndex &index, const QVar
120120
// QgsDebugMsg(mFeatureMap[rowToId(index.row())].id());
121121
mFeatureMap[rowToId( index.row() )].changeAttribute( mAttributes[ index.column()], value );
122122
// propagate back to the layer
123-
mLayer->beginEditCommand( tr("Attribute changed") );
123+
mLayer->beginEditCommand( tr( "Attribute changed" ) );
124124
mLayer->changeAttributeValue( rowToId( index.row() ), mAttributes[ index.column()], value, true );
125125
mLayer->endEditCommand();
126126
}

src/app/attributetable/qgsattributetablemodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ bool QgsAttributeTableModel::setData( const QModelIndex &index, const QVariant &
393393
{
394394
mLastRowId = rowToId( index.row() );
395395
mLastRow = ( QgsAttributeMap * )( &( mFeat.attributeMap() ) );
396-
mLayer->beginEditCommand( tr("Attribute changed") );
396+
mLayer->beginEditCommand( tr( "Attribute changed" ) );
397397
mLayer->changeAttributeValue( rowToId( index.row() ), mAttributes[ index.column()], value, true );
398398
mLayer->endEditCommand();
399399
}

src/app/composer/qgscomposeritemwidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ void QgsComposerItemWidget::on_mBackgroundColorButton_clicked()
7777
mItem->setBrush( QBrush( QColor( newBackgroundColor ), Qt::SolidPattern ) );
7878
//if the item is a composer map, we need to regenerate the map image
7979
//because it usually is cached
80-
QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>(mItem);
81-
if(cm)
80+
QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>( mItem );
81+
if ( cm )
8282
{
8383
cm->cache();
8484
}

src/app/composer/qgscomposermapwidget.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -254,16 +254,16 @@ void QgsComposerMapWidget::updateGuiElements()
254254
mYMaxLineEdit->setText( QString::number( composerMapExtent.yMaximum(), 'f', 3 ) );
255255

256256
//keep layer list check box
257-
mKeepLayerListCheckBox->blockSignals(true);
258-
if(mComposerMap->keepLayerSet())
257+
mKeepLayerListCheckBox->blockSignals( true );
258+
if ( mComposerMap->keepLayerSet() )
259259
{
260-
mKeepLayerListCheckBox->setCheckState(Qt::Checked);
260+
mKeepLayerListCheckBox->setCheckState( Qt::Checked );
261261
}
262262
else
263263
{
264-
mKeepLayerListCheckBox->setCheckState(Qt::Unchecked);
264+
mKeepLayerListCheckBox->setCheckState( Qt::Unchecked );
265265
}
266-
mKeepLayerListCheckBox->blockSignals(false);
266+
mKeepLayerListCheckBox->blockSignals( false );
267267
}
268268
}
269269

@@ -311,22 +311,22 @@ void QgsComposerMapWidget::on_mUpdatePreviewButton_clicked()
311311
mUpdatePreviewButton->setEnabled( true );
312312
}
313313

314-
void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged(int state)
314+
void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged( int state )
315315
{
316-
if(!mComposerMap)
316+
if ( !mComposerMap )
317317
{
318318
return;
319319
}
320320

321-
if(state == Qt::Checked)
321+
if ( state == Qt::Checked )
322322
{
323323
mComposerMap->storeCurrentLayerSet();
324-
mComposerMap->setKeepLayerSet(true);
324+
mComposerMap->setKeepLayerSet( true );
325325
}
326326
else
327327
{
328328
QStringList emptyLayerSet;
329-
mComposerMap->setLayerSet(emptyLayerSet);
330-
mComposerMap->setKeepLayerSet(false);
329+
mComposerMap->setLayerSet( emptyLayerSet );
330+
mComposerMap->setKeepLayerSet( false );
331331
}
332332
}

src/app/composer/qgscomposermapwidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
4141
void on_mScaleLineEdit_editingFinished();
4242
void on_mSetToMapCanvasExtentButton_clicked();
4343
void on_mUpdatePreviewButton_clicked();
44-
void on_mKeepLayerListCheckBox_stateChanged(int state);
44+
void on_mKeepLayerListCheckBox_stateChanged( int state );
4545

4646
void on_mXMinLineEdit_editingFinished();
4747
void on_mXMaxLineEdit_editingFinished();

0 commit comments

Comments
 (0)