Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
automatic indentation update (r10918-r10980)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10981 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jun 26, 2009
1 parent d4b702e commit 80fd596
Show file tree
Hide file tree
Showing 43 changed files with 1,062 additions and 1,060 deletions.
2 changes: 1 addition & 1 deletion src/app/attributetable/qgsattributetabledialog.cpp
Expand Up @@ -203,7 +203,7 @@ void QgsAttributeTableDialog::on_mCopySelectedRowsButton_clicked()

void QgsAttributeTableDialog::on_mZoomMapToSelectedRowsButton_clicked()
{
QgisApp::instance()->mapCanvas()->zoomToSelected(mLayer);
QgisApp::instance()->mapCanvas()->zoomToSelected( mLayer );
}

void QgsAttributeTableDialog::on_mInvertSelectionButton_clicked()
Expand Down
2 changes: 1 addition & 1 deletion src/app/attributetable/qgsattributetablememorymodel.cpp
Expand Up @@ -120,7 +120,7 @@ bool QgsAttributeTableMemoryModel::setData( const QModelIndex &index, const QVar
// QgsDebugMsg(mFeatureMap[rowToId(index.row())].id());
mFeatureMap[rowToId( index.row() )].changeAttribute( mAttributes[ index.column()], value );
// propagate back to the layer
mLayer->beginEditCommand( tr("Attribute changed") );
mLayer->beginEditCommand( tr( "Attribute changed" ) );
mLayer->changeAttributeValue( rowToId( index.row() ), mAttributes[ index.column()], value, true );
mLayer->endEditCommand();
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/attributetable/qgsattributetablemodel.cpp
Expand Up @@ -393,7 +393,7 @@ bool QgsAttributeTableModel::setData( const QModelIndex &index, const QVariant &
{
mLastRowId = rowToId( index.row() );
mLastRow = ( QgsAttributeMap * )( &( mFeat.attributeMap() ) );
mLayer->beginEditCommand( tr("Attribute changed") );
mLayer->beginEditCommand( tr( "Attribute changed" ) );
mLayer->changeAttributeValue( rowToId( index.row() ), mAttributes[ index.column()], value, true );
mLayer->endEditCommand();
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/composer/qgscomposeritemwidget.cpp
Expand Up @@ -77,8 +77,8 @@ void QgsComposerItemWidget::on_mBackgroundColorButton_clicked()
mItem->setBrush( QBrush( QColor( newBackgroundColor ), Qt::SolidPattern ) );
//if the item is a composer map, we need to regenerate the map image
//because it usually is cached
QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>(mItem);
if(cm)
QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>( mItem );
if ( cm )
{
cm->cache();
}
Expand Down
22 changes: 11 additions & 11 deletions src/app/composer/qgscomposermapwidget.cpp
Expand Up @@ -254,16 +254,16 @@ void QgsComposerMapWidget::updateGuiElements()
mYMaxLineEdit->setText( QString::number( composerMapExtent.yMaximum(), 'f', 3 ) );

//keep layer list check box
mKeepLayerListCheckBox->blockSignals(true);
if(mComposerMap->keepLayerSet())
mKeepLayerListCheckBox->blockSignals( true );
if ( mComposerMap->keepLayerSet() )
{
mKeepLayerListCheckBox->setCheckState(Qt::Checked);
mKeepLayerListCheckBox->setCheckState( Qt::Checked );
}
else
{
mKeepLayerListCheckBox->setCheckState(Qt::Unchecked);
mKeepLayerListCheckBox->setCheckState( Qt::Unchecked );
}
mKeepLayerListCheckBox->blockSignals(false);
mKeepLayerListCheckBox->blockSignals( false );
}
}

Expand Down Expand Up @@ -311,22 +311,22 @@ void QgsComposerMapWidget::on_mUpdatePreviewButton_clicked()
mUpdatePreviewButton->setEnabled( true );
}

void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged(int state)
void QgsComposerMapWidget::on_mKeepLayerListCheckBox_stateChanged( int state )
{
if(!mComposerMap)
if ( !mComposerMap )
{
return;
}

if(state == Qt::Checked)
if ( state == Qt::Checked )
{
mComposerMap->storeCurrentLayerSet();
mComposerMap->setKeepLayerSet(true);
mComposerMap->setKeepLayerSet( true );
}
else
{
QStringList emptyLayerSet;
mComposerMap->setLayerSet(emptyLayerSet);
mComposerMap->setKeepLayerSet(false);
mComposerMap->setLayerSet( emptyLayerSet );
mComposerMap->setKeepLayerSet( false );
}
}
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposermapwidget.h
Expand Up @@ -41,7 +41,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
void on_mScaleLineEdit_editingFinished();
void on_mSetToMapCanvasExtentButton_clicked();
void on_mUpdatePreviewButton_clicked();
void on_mKeepLayerListCheckBox_stateChanged(int state);
void on_mKeepLayerListCheckBox_stateChanged( int state );

void on_mXMinLineEdit_editingFinished();
void on_mXMaxLineEdit_editingFinished();
Expand Down

0 comments on commit 80fd596

Please sign in to comment.