Skip to content
Permalink
Browse files

automatic indentation update (r10918-r10980)

git-svn-id: http://svn.osgeo.org/qgis/trunk@10981 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Jun 26, 2009
1 parent 5453c87 commit a5d5cf85d35a559068baa2d34f80206475fc86c0
Showing with 1,062 additions and 1,060 deletions.
  1. +1 −1 src/app/attributetable/qgsattributetabledialog.cpp
  2. +1 −1 src/app/attributetable/qgsattributetablememorymodel.cpp
  3. +1 −1 src/app/attributetable/qgsattributetablemodel.cpp
  4. +2 −2 src/app/composer/qgscomposeritemwidget.cpp
  5. +11 −11 src/app/composer/qgscomposermapwidget.cpp
  6. +1 −1 src/app/composer/qgscomposermapwidget.h
  7. +124 −124 src/app/qgisapp.cpp
  8. +1 −1 src/app/qgisapp.h
  9. +5 −5 src/app/qgsattributedialog.cpp
  10. +3 −3 src/app/qgsmaptooladdfeature.cpp
  11. +1 −1 src/app/qgsmaptooladdisland.cpp
  12. +1 −1 src/app/qgsmaptooladdring.cpp
  13. +1 −1 src/app/qgsmaptooladdvertex.cpp
  14. +1 −1 src/app/qgsmaptooldeletepart.cpp
  15. +1 −1 src/app/qgsmaptooldeletering.cpp
  16. +1 −1 src/app/qgsmaptooldeletevertex.cpp
  17. +1 −1 src/app/qgsmaptoolidentify.cpp
  18. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  19. +1 −1 src/app/qgsmaptoolmovevertex.cpp
  20. +269 −269 src/app/qgsmaptoolnodetool.cpp
  21. +20 −20 src/app/qgsmaptoolnodetool.h
  22. +1 −1 src/app/qgsmaptoolsimplify.cpp
  23. +1 −1 src/app/qgsmaptoolsplitfeatures.cpp
  24. +330 −330 src/app/qgsmergeattributesdialog.cpp
  25. +90 −90 src/app/qgsundowidget.cpp
  26. +13 −13 src/app/qgsundowidget.h
  27. +4 −4 src/app/qgsvectorlayerproperties.cpp
  28. +8 −8 src/core/composer/qgscomposerlabel.cpp
  29. +26 −26 src/core/composer/qgscomposermap.cpp
  30. +2 −2 src/core/composer/qgscomposermap.h
  31. +3 −3 src/core/qgsgeometry.cpp
  32. +1 −1 src/core/qgsvectordataprovider.h
  33. +62 −62 src/core/qgsvectorlayer.cpp
  34. +5 −5 src/core/qgsvectorlayer.h
  35. +26 −26 src/core/qgsvectorlayerundocommand.cpp
  36. +11 −11 src/core/qgsvectorlayerundocommand.h
  37. +2 −2 src/gui/qgsmapcanvas.cpp
  38. +3 −3 src/gui/qgsmapcanvasmap.cpp
  39. +1 −1 src/plugins/grass/qgsgrassbrowser.cpp
  40. +14 −13 src/plugins/grass/qgsgrassmodel.cpp
  41. +7 −6 src/plugins/grass/qgsgrassmodule.cpp
  42. +1 −1 src/plugins/interpolation/DualEdgeTriangulation.cc
  43. +3 −3 src/providers/postgres/qgspostgresprovider.h
@@ -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()
@@ -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();
}
@@ -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();
}
@@ -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();
}
@@ -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 );
}
}

@@ -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 );
}
}
@@ -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();

0 comments on commit a5d5cf8

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