Skip to content
Permalink
Browse files

Update indentation, fix build

  • Loading branch information
nyalldawson committed Mar 5, 2017
1 parent ccf8e6c commit d4b16551f914c50bd36b7d7ecceb2265102e50c4
Showing with 4 additions and 5 deletions.
  1. +3 −4 src/app/qgsattributetabledialog.cpp
  2. +1 −1 src/gui/attributetable/qgsdualview.h
@@ -83,7 +83,6 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget
: QDialog( parent, flags )
, mDock( nullptr )
, mLayer( layer )
, mRubberBand( nullptr )
, mCurrentSearchWidgetWrapper( nullptr )
{
setObjectName( QStringLiteral( "QgsAttributeTableDialog/" ) + layer->id() );
@@ -145,8 +144,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget
}
else if ( initialMode == QgsAttributeTableFilterModel::ShowSelected )
{
if ( theLayer->selectedFeatureCount() > 0 )
r.setFilterFids( theLayer->selectedFeatureIds() );
if ( layer->selectedFeatureCount() > 0 )
r.setFilterFids( layer->selectedFeatureIds() );
}
if ( !needsGeom )
r.setFlags( QgsFeatureRequest::NoGeometry );
@@ -344,7 +343,7 @@ QgsAttributeTableDialog::~QgsAttributeTableDialog()
void QgsAttributeTableDialog::updateTitle()
{
QWidget *w = mDock ? qobject_cast<QWidget *>( mDock ) : qobject_cast<QWidget *>( this );
w->setWindowTitle( tr( " %1 :: Features total: %2, filtered: %3, selected: %4%5" )
w->setWindowTitle( tr( " %1 :: Features total: %2, filtered: %3, selected: %4" )
.arg( mLayer->name() )
.arg( qMax( static_cast< long >( mMainView->featureCount() ), mLayer->featureCount() ) ) // layer count may be estimated, so use larger of the two
.arg( mMainView->filteredFeatureCount() )
@@ -334,7 +334,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas

private:
void initLayerCache( bool cacheGeometry );
void initModels( QgsMapCanvas *mapCanvas, const QgsFeatureRequest &request );
void initModels( QgsMapCanvas *mapCanvas, const QgsFeatureRequest &request, bool loadFeatures );

QgsAttributeEditorContext mEditorContext;
QgsAttributeTableModel *mMasterModel = nullptr;

0 comments on commit d4b1655

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