Navigation Menu

Skip to content

Commit

Permalink
Remove guard for unininitialized widgetFactory
Browse files Browse the repository at this point in the history
meanwhile we can rely on one being initialized
  • Loading branch information
m-kuhn committed May 17, 2018
1 parent 2b95031 commit 44bb21d
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/gui/attributetable/qgsattributetablemodel.cpp
Expand Up @@ -38,6 +38,7 @@
#include "qgsvectorlayerjoininfo.h"
#include "qgsvectorlayerjoinbuffer.h"
#include "qgsfieldmodel.h"
#include "qgstexteditwidgetfactory.h"

#include <QVariant>

Expand Down Expand Up @@ -375,15 +376,12 @@ void QgsAttributeTableModel::loadAttributes()
QgsEditorWidgetFactory *widgetFactory = QgsGui::editorWidgetRegistry()->factory( setup.type() );
QgsFieldFormatter *fieldFormatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );

if ( widgetFactory )
{
mWidgetFactories.append( widgetFactory );
mWidgetConfigs.append( setup.config() );
mAttributeWidgetCaches.append( fieldFormatter->createCache( layer(), idx, setup.config() ) );
mFieldFormatters.append( fieldFormatter );
mWidgetFactories.append( widgetFactory );
mWidgetConfigs.append( setup.config() );
mAttributeWidgetCaches.append( fieldFormatter->createCache( layer(), idx, setup.config() ) );
mFieldFormatters.append( fieldFormatter );

attributes << idx;
}
attributes << idx;
}

if ( mFieldCount + mExtraColumns < attributes.size() + mExtraColumns )
Expand Down

0 comments on commit 44bb21d

Please sign in to comment.