diff --git a/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip b/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip index 929c6d61ec2..3e15ca2e61b 100644 --- a/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip +++ b/python/gui/editorwidgets/core/qgseditorwidgetfactory.sip @@ -67,28 +67,6 @@ class QgsEditorWidgetFactory */ virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const = 0 /Factory/; - /** - * Read the config from an XML file and map it to a proper {@link QVariantMap}. - * - * @param configElement The configuration element from the project file - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - * - * @return A configuration object. This will be passed to your widget wrapper later on - */ - QVariantMap readEditorConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ); - - /** - * Serialize your configuration and save it in a xml doc. - * - * @param config The configuration to serialize - * @param configElement The element, where you can write your configuration into - * @param doc The document. You can use this to create new nodes - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - */ - virtual void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ); - /** * Check if this editor widget type supports a certain field. * @@ -110,17 +88,6 @@ class QgsEditorWidgetFactory */ //virtual QHash supportedWidgetTypes(); - /** - * Read the config from an XML file and map it to a proper {@link QVariantMap}. - * - * @param configElement The configuration element from the project file - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - * - * @return A configuration object. This will be passed to your widget wrapper later on - */ - virtual QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ); - /** * This method allows disabling this editor widget type for a certain field. * By default, it returns 5 for every fields. @@ -140,16 +107,4 @@ class QgsEditorWidgetFactory * @see supportsField( QgsVectorLayer* vl, fieldIdx ) */ virtual unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const; - - protected: - - /** - * Copy the given config element to a XML attribute. - */ - static void config2xml( const QVariantMap& config, QDomElement& configElement, const QString& fieldName ); - - /** - * Copy the given XML attribute to the configuration element. - */ - static void xml2config( const QDomElement& configElement, QVariantMap& config, const QString& fieldName ); }; diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 14730237fa7..8b3221c9807 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -1977,9 +1977,8 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString& { ( void )writeStyle( node, doc, errorMessage ); - QgsFields dataProviderFields = mDataProvider->fields(); - QDomElement fieldConfigurationElement = doc.createElement( QStringLiteral( "fieldConfiguration" ) ); + node.appendChild( fieldConfigurationElement ); int index = 0; Q_FOREACH ( const QgsField& field, mFields ) diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp index b17bb591928..0309278fc1b 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp @@ -46,57 +46,9 @@ QString QgsEditorWidgetFactory::name() return mName; } -QVariantMap QgsEditorWidgetFactory::readEditorConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - return readConfig( configElement, layer, fieldIdx ); -} - -void QgsEditorWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( config ); - Q_UNUSED( configElement ); - Q_UNUSED( doc ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); -} - -QVariantMap QgsEditorWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( configElement ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - - return QVariantMap(); -} - unsigned int QgsEditorWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const { Q_UNUSED( vl ) Q_UNUSED( fieldIdx ) return 5; } - -void QgsEditorWidgetFactory::config2xml( const QVariantMap& config, QDomElement& configElement, const QString& fieldName ) -{ - const QVariant value = config.value( fieldName ); - if ( value.isValid() ) - { - if ( value.type() == QVariant::Bool ) - { - configElement.setAttribute( fieldName, value.toBool() ? "1" : "0" ); - } - else - { - configElement.setAttribute( fieldName, value.toString() ); - } - } -} - -void QgsEditorWidgetFactory::xml2config( const QDomElement& configElement, QVariantMap& config, const QString& fieldName ) -{ - const QString value = configElement.attribute( fieldName ); - if ( !value.isNull() ) - { - config.insert( fieldName, value ); - } -} diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h index 31085980f77..9046a000f33 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h @@ -84,28 +84,6 @@ class GUI_EXPORT QgsEditorWidgetFactory */ virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const = 0; - /** - * Read the config from an XML file and map it to a proper {@link QVariantMap}. - * - * @param configElement The configuration element from the project file - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - * - * @return A configuration object. This will be passed to your widget wrapper later on - */ - QVariantMap readEditorConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ); - - /** - * Serialize your configuration and save it in a xml doc. - * - * @param config The configuration to serialize - * @param configElement The element, where you can write your configuration into - * @param doc The document. You can use this to create new nodes - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - */ - virtual void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ); - /** * Check if this editor widget type supports a certain field. * @@ -127,17 +105,6 @@ class GUI_EXPORT QgsEditorWidgetFactory */ virtual QHash supportedWidgetTypes() { return QHash(); } - /** - * Read the config from an XML file and map it to a proper {@link QVariantMap}. - * - * @param configElement The configuration element from the project file - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - * - * @return A configuration object. This will be passed to your widget wrapper later on - */ - virtual QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ); - /** * This method allows disabling this editor widget type for a certain field. * By default, it returns 5 for every fields. @@ -158,18 +125,6 @@ class GUI_EXPORT QgsEditorWidgetFactory */ virtual unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const; - protected: - - /** - * Copy the given config element to a XML attribute. - */ - static void config2xml( const QVariantMap& config, QDomElement& configElement, const QString& fieldName ); - - /** - * Copy the given XML attribute to the configuration element. - */ - static void xml2config( const QDomElement& configElement, QVariantMap& config, const QString& fieldName ); - private: QString mName; }; diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp index fe72d8ca7d5..d87470b843b 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp @@ -80,11 +80,6 @@ void QgsEditorWidgetRegistry::initEditors( QgsMapCanvas *mapCanvas, QgsMessageBa QgsEditorWidgetRegistry::QgsEditorWidgetRegistry() { - // connect( QgsProject::instance(), SIGNAL( readMapLayer( QgsMapLayer*, const QDomElement& ) ), this, SLOT( readMapLayer( QgsMapLayer*, const QDomElement& ) ) ); - // connect( QgsProject::instance(), SIGNAL( writeMapLayer( QgsMapLayer*, QDomElement&, QDomDocument& ) ), this, SLOT( writeMapLayer( QgsMapLayer*, QDomElement&, QDomDocument& ) ) ); - - connect( QgsProject::instance(), SIGNAL( layerWillBeRemoved( QgsMapLayer* ) ), this, SLOT( mapLayerWillBeRemoved( QgsMapLayer* ) ) ); - connect( QgsProject::instance(), SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( mapLayerAdded( QgsMapLayer* ) ) ); } QgsEditorWidgetRegistry::~QgsEditorWidgetRegistry() @@ -222,164 +217,6 @@ bool QgsEditorWidgetRegistry::registerWidget( const QString& widgetId, QgsEditor } } -void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomElement& layerElem ) -{ - if ( mapLayer->type() != QgsMapLayer::VectorLayer ) - { - return; - } - - QgsVectorLayer* vectorLayer = qobject_cast( mapLayer ); - Q_ASSERT( vectorLayer ); - - QDomNodeList editTypeNodes = layerElem.namedItem( QStringLiteral( "edittypes" ) ).childNodes(); - - QgsEditFormConfig formConfig = vectorLayer->editFormConfig(); - - for ( int i = 0; i < editTypeNodes.size(); i++ ) - { - QDomNode editTypeNode = editTypeNodes.at( i ); - QDomElement editTypeElement = editTypeNode.toElement(); - - QString name = editTypeElement.attribute( QStringLiteral( "name" ) ); - - int idx = vectorLayer->fields().lookupField( name ); - if ( idx == -1 ) - continue; - - QString ewv2Type = editTypeElement.attribute( QStringLiteral( "widgetv2type" ) ); - QVariantMap cfg; - - if ( mWidgetFactories.contains( ewv2Type ) ) - { - formConfig.setWidgetType( name, ewv2Type ); - QDomElement ewv2CfgElem = editTypeElement.namedItem( QStringLiteral( "widgetv2config" ) ).toElement(); - - if ( !ewv2CfgElem.isNull() ) - { - cfg = mWidgetFactories[ewv2Type]->readEditorConfig( ewv2CfgElem, vectorLayer, idx ); - } - - formConfig.setReadOnly( idx, ewv2CfgElem.attribute( QStringLiteral( "fieldEditable" ), QStringLiteral( "1" ) ) != QLatin1String( "1" ) ); - formConfig.setLabelOnTop( idx, ewv2CfgElem.attribute( QStringLiteral( "labelOnTop" ), QStringLiteral( "0" ) ) == QLatin1String( "1" ) ); - if ( ewv2CfgElem.attribute( QStringLiteral( "notNull" ), QStringLiteral( "0" ) ) == QLatin1String( "1" ) ) - { - // upgrade from older config - vectorLayer->setFieldConstraint( idx, QgsFieldConstraints::ConstraintNotNull ); - } - if ( !ewv2CfgElem.attribute( QStringLiteral( "constraint" ), QString() ).isEmpty() ) - { - // upgrade from older config - vectorLayer->setConstraintExpression( idx, ewv2CfgElem.attribute( QStringLiteral( "constraint" ), QString() ), - ewv2CfgElem.attribute( QStringLiteral( "constraintDescription" ), QString() ) ); - } - - formConfig.setWidgetConfig( name, cfg ); - } - else - { - QgsMessageLog::logMessage( tr( "Unknown attribute editor widget '%1'" ).arg( ewv2Type ) ); - } - } - - vectorLayer->setEditFormConfig( formConfig ); -} - -void QgsEditorWidgetRegistry::writeMapLayer( QgsMapLayer* mapLayer, QDomElement& layerElem, QDomDocument& doc ) const -{ - if ( mapLayer->type() != QgsMapLayer::VectorLayer ) - { - return; - } - - QgsVectorLayer* vectorLayer = qobject_cast( mapLayer ); - if ( !vectorLayer ) - { - return; - } - - QDomNode editTypesNode = doc.createElement( QStringLiteral( "edittypes" ) ); - - QgsFields fields = vectorLayer->fields(); - for ( int idx = 0; idx < fields.count(); ++idx ) - { - const QgsField field = fields.at( idx ); - const QString& widgetType = vectorLayer->editFormConfig().widgetType( field.name() ); - if ( widgetType.isNull() ) - { - // Don't save widget config if it is not manually edited - continue; - } - if ( !mWidgetFactories.contains( widgetType ) ) - { - QgsMessageLog::logMessage( tr( "Could not save unknown editor widget type '%1'." ).arg( widgetType ) ); - continue; - } - - - QDomElement editTypeElement = doc.createElement( QStringLiteral( "edittype" ) ); - editTypeElement.setAttribute( QStringLiteral( "name" ), field.name() ); - editTypeElement.setAttribute( QStringLiteral( "widgetv2type" ), widgetType ); - - if ( mWidgetFactories.contains( widgetType ) ) - { - QDomElement ewv2CfgElem = doc.createElement( QStringLiteral( "widgetv2config" ) ); - ewv2CfgElem.setAttribute( QStringLiteral( "fieldEditable" ), !vectorLayer->editFormConfig().readOnly( idx ) ); - ewv2CfgElem.setAttribute( QStringLiteral( "labelOnTop" ), vectorLayer->editFormConfig().labelOnTop( idx ) ); - - mWidgetFactories[widgetType]->writeConfig( vectorLayer->editFormConfig().widgetConfig( field.name() ), ewv2CfgElem, doc, vectorLayer, idx ); - - editTypeElement.appendChild( ewv2CfgElem ); - } - - editTypesNode.appendChild( editTypeElement ); - } - - layerElem.appendChild( editTypesNode ); -} - -void QgsEditorWidgetRegistry::mapLayerWillBeRemoved( QgsMapLayer* mapLayer ) -{ - QgsVectorLayer* vl = qobject_cast( mapLayer ); - - if ( vl ) - { - disconnect( vl, SIGNAL( readCustomSymbology( const QDomElement&, QString& ) ), this, SLOT( readSymbology( const QDomElement&, QString& ) ) ); - disconnect( vl, SIGNAL( writeCustomSymbology( QDomElement&, QDomDocument&, QString& ) ), this, SLOT( writeSymbology( QDomElement&, QDomDocument&, QString& ) ) ); - } -} - -void QgsEditorWidgetRegistry::mapLayerAdded( QgsMapLayer* mapLayer ) -{ - QgsVectorLayer* vl = qobject_cast( mapLayer ); - - if ( vl ) - { - connect( vl, SIGNAL( readCustomSymbology( const QDomElement&, QString& ) ), this, SLOT( readSymbology( const QDomElement&, QString& ) ) ); - connect( vl, SIGNAL( writeCustomSymbology( QDomElement&, QDomDocument&, QString& ) ), this, SLOT( writeSymbology( QDomElement&, QDomDocument&, QString& ) ) ); - } -} - -void QgsEditorWidgetRegistry::readSymbology( const QDomElement& element, QString& errorMessage ) -{ - Q_UNUSED( errorMessage ) - QgsVectorLayer* vl = qobject_cast( sender() ); - - Q_ASSERT( vl ); - - readMapLayer( vl, element ); -} - -void QgsEditorWidgetRegistry::writeSymbology( QDomElement& element, QDomDocument& doc, QString& errorMessage ) -{ - Q_UNUSED( errorMessage ) - QgsVectorLayer* vl = qobject_cast( sender() ); - - Q_ASSERT( vl ); - - writeMapLayer( vl, element, doc ); -} - QString QgsEditorWidgetRegistry::findSuitableWrapper( QWidget* editor, const QString& defaultWidget ) { QMap >::ConstIterator it; diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h index 0bcd857f8b1..ddccffd6c31 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h @@ -180,57 +180,6 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject protected: QgsEditorWidgetRegistry(); - private slots: - - /** - * Read all the editor widget information from a map layer XML node - * @param mapLayer - * @param layerElem - */ - void readMapLayer( QgsMapLayer* mapLayer, const QDomElement& layerElem ); - - /** - * Write all the widget config to a layer XML node - * - * @param mapLayer The layer for which the config is being written - * @param layerElem The XML element to which the config will be written - * @param doc The document from which to create elements - */ - void writeMapLayer( QgsMapLayer* mapLayer, QDomElement& layerElem, QDomDocument& doc ) const; - - /** - * Will connect to appropriate signals from map layers to load and save style - * - * @param mapLayer The layer to connect - */ - void mapLayerAdded( QgsMapLayer* mapLayer ); - - /** - * Will disconnect to appropriate signals from map layers to load and save style - * - * @param mapLayer The layer to disconnect - */ - void mapLayerWillBeRemoved( QgsMapLayer* mapLayer ); - - /** - * Loads layer symbology for the layer that emitted the signal - * - * @param element The XML element containing the style information - * - * @param errorMessage Errors will be written into this string (unused) - */ - void readSymbology( const QDomElement& element, QString& errorMessage ); - - /** - * Saves layer symbology for the layer that emitted the signal - * - * @param element The XML element where the style information be written to - * @param doc The XML document where the style information be written to - * - * @param errorMessage Errors will be written into this string (unused) - */ - void writeSymbology( QDomElement& element, QDomDocument& doc, QString& errorMessage ); - private: QString findSuitableWrapper( QWidget* editor , const QString& defaultWidget ); diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp index fea3b6c25a1..2eb8b48971d 100644 --- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp @@ -38,29 +38,6 @@ QgsEditorConfigWidget* QgsCheckboxWidgetFactory::configWidget( QgsVectorLayer* v return new QgsCheckBoxConfigDlg( vl, fieldIdx, parent ); } -QVariantMap QgsCheckboxWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "CheckedState" ) ); - xml2config( configElement, cfg, QStringLiteral( "UncheckedState" ) ); - - return cfg; -} - -void QgsCheckboxWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - config2xml( config, configElement, QStringLiteral( "CheckedState" ) ); - config2xml( config, configElement, QStringLiteral( "UncheckedState" ) ); -} - QHash QgsCheckboxWidgetFactory::supportedWidgetTypes() { QHash map = QHash(); diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.h b/src/gui/editorwidgets/qgscheckboxwidgetfactory.h index 152d9d10c41..bf701b4fb31 100644 --- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.h +++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.h @@ -33,8 +33,6 @@ class GUI_EXPORT QgsCheckboxWidgetFactory : public QgsEditorWidgetFactory QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; QHash supportedWidgetTypes() override; unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override; }; diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp index 4fcf3b17a5a..dae78cec2cd 100644 --- a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp @@ -34,52 +34,6 @@ QgsEditorConfigWidget* QgsExternalResourceWidgetFactory::configWidget( QgsVector return new QgsExternalResourceConfigDlg( vl, fieldIdx, parent ); } -void QgsExternalResourceWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - config2xml( config, configElement, QStringLiteral( "FileWidget" ) ); - config2xml( config, configElement, QStringLiteral( "FileWidgetButton" ) ); - config2xml( config, configElement, QStringLiteral( "UseLink" ) ); - config2xml( config, configElement, QStringLiteral( "FullUrl" ) ); - config2xml( config, configElement, QStringLiteral( "DefaultRoot" ) ); - config2xml( config, configElement, QStringLiteral( "RelativeStorage" ) ); - config2xml( config, configElement, QStringLiteral( "DocumentViewer" ) ); - config2xml( config, configElement, QStringLiteral( "DocumentViewerWidth" ) ); - config2xml( config, configElement, QStringLiteral( "DocumentViewerHeight" ) ); - config2xml( config, configElement, QStringLiteral( "FileWidgetFilter" ) ); - config2xml( config, configElement, QStringLiteral( "StorageMode" ) ); -} - -QVariantMap QgsExternalResourceWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "FileWidget" ) ); - xml2config( configElement, cfg, QStringLiteral( "FileWidgetButton" ) ); - xml2config( configElement, cfg, QStringLiteral( "UseLink" ) ); - xml2config( configElement, cfg, QStringLiteral( "FullUrl" ) ); - xml2config( configElement, cfg, QStringLiteral( "DefaultRoot" ) ); - if ( configElement.hasAttribute( QStringLiteral( "RelativeStorage" ) ) ) - { - if (( configElement.attribute( QStringLiteral( "RelativeStorage" ) ).toInt() == QgsFileWidget::RelativeDefaultPath && configElement.hasAttribute( QStringLiteral( "DefaultRoot" ) ) ) || - configElement.attribute( QStringLiteral( "RelativeStorage" ) ).toInt() == QgsFileWidget::RelativeProject ) - xml2config( configElement, cfg, QStringLiteral( "RelativeStorage" ) ); - } - xml2config( configElement, cfg, QStringLiteral( "DocumentViewer" ) ); - xml2config( configElement, cfg, QStringLiteral( "DocumentViewerWidth" ) ); - xml2config( configElement, cfg, QStringLiteral( "DocumentViewerHeight" ) ); - xml2config( configElement, cfg, QStringLiteral( "FileWidgetFilter" ) ); - xml2config( configElement, cfg, QStringLiteral( "StorageMode" ) ); - - return cfg; -} - unsigned int QgsExternalResourceWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const { if ( vl->fields().at( fieldIdx ).type() == QVariant::String ) diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h index bd21d136f20..a069eaa1b63 100644 --- a/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h +++ b/src/gui/editorwidgets/qgsexternalresourcewidgetfactory.h @@ -34,12 +34,7 @@ class GUI_EXPORT QgsExternalResourceWidgetFactory : public QgsEditorWidgetFactor public: QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override; - - private: - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; }; #endif // QGSEXTERNALRESOURCEWIDGETFACTORY_H diff --git a/src/gui/editorwidgets/qgskeyvaluewidgetfactory.cpp b/src/gui/editorwidgets/qgskeyvaluewidgetfactory.cpp index 184bb54d84f..c9b83a89b45 100644 --- a/src/gui/editorwidgets/qgskeyvaluewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgskeyvaluewidgetfactory.cpp @@ -40,23 +40,6 @@ QgsEditorConfigWidget* QgsKeyValueWidgetFactory::configWidget( QgsVectorLayer *v return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "Key/Value field" ) ); } -QVariantMap QgsKeyValueWidgetFactory::readConfig( const QDomElement &configElement, QgsVectorLayer *layer, int fieldIdx ) -{ - Q_UNUSED( configElement ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - return QVariantMap(); -} - -void QgsKeyValueWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( config ); - Q_UNUSED( configElement ); - Q_UNUSED( doc ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); -} - unsigned int QgsKeyValueWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const { const QgsField field = vl->fields().field( fieldIdx ); diff --git a/src/gui/editorwidgets/qgskeyvaluewidgetfactory.h b/src/gui/editorwidgets/qgskeyvaluewidgetfactory.h index 294e6fa4e04..8fa52f7a2cf 100644 --- a/src/gui/editorwidgets/qgskeyvaluewidgetfactory.h +++ b/src/gui/editorwidgets/qgskeyvaluewidgetfactory.h @@ -37,8 +37,6 @@ class GUI_EXPORT QgsKeyValueWidgetFactory : public QgsEditorWidgetFactory QgsEditorWidgetWrapper* create( QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QWidget *parent ) const override; //QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer *vl, int fieldIdx, QWidget *parent ) const override; - QVariantMap readConfig( const QDomElement &configElement, QgsVectorLayer *layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override; }; diff --git a/src/gui/editorwidgets/qgslistwidgetfactory.cpp b/src/gui/editorwidgets/qgslistwidgetfactory.cpp index 0a35ed5ae9e..ea9f706f6e8 100644 --- a/src/gui/editorwidgets/qgslistwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgslistwidgetfactory.cpp @@ -41,23 +41,6 @@ QgsEditorConfigWidget* QgsListWidgetFactory::configWidget( QgsVectorLayer *vl, i return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "List field" ) ); } -QVariantMap QgsListWidgetFactory::readConfig( const QDomElement &configElement, QgsVectorLayer *layer, int fieldIdx ) -{ - Q_UNUSED( configElement ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - return QVariantMap(); -} - -void QgsListWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( config ); - Q_UNUSED( configElement ); - Q_UNUSED( doc ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); -} - unsigned int QgsListWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const { const QgsField field = vl->fields().field( fieldIdx ); diff --git a/src/gui/editorwidgets/qgslistwidgetfactory.h b/src/gui/editorwidgets/qgslistwidgetfactory.h index 96887e9f157..33b3d7f7004 100644 --- a/src/gui/editorwidgets/qgslistwidgetfactory.h +++ b/src/gui/editorwidgets/qgslistwidgetfactory.h @@ -37,8 +37,6 @@ class GUI_EXPORT QgsListWidgetFactory : public QgsEditorWidgetFactory QgsEditorWidgetWrapper* create( QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QWidget *parent ) const override; //QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer *vl, int fieldIdx, QWidget *parent ) const override; - QVariantMap readConfig( const QDomElement &configElement, QgsVectorLayer *layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override; }; diff --git a/src/gui/editorwidgets/qgsphotowidgetfactory.cpp b/src/gui/editorwidgets/qgsphotowidgetfactory.cpp index 3ec7e2de4cf..3439183229e 100644 --- a/src/gui/editorwidgets/qgsphotowidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsphotowidgetfactory.cpp @@ -33,26 +33,3 @@ QgsEditorConfigWidget* QgsPhotoWidgetFactory::configWidget( QgsVectorLayer* vl, { return new QgsPhotoConfigDlg( vl, fieldIdx, parent ); } - -QVariantMap QgsPhotoWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "Height" ) ); - xml2config( configElement, cfg, QStringLiteral( "Width" ) ); - - return cfg; -} - -void QgsPhotoWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - config2xml( config, configElement, QStringLiteral( "Height" ) ); - config2xml( config, configElement, QStringLiteral( "Width" ) ); -} diff --git a/src/gui/editorwidgets/qgsphotowidgetfactory.h b/src/gui/editorwidgets/qgsphotowidgetfactory.h index ed4e3230392..c0c4760004b 100644 --- a/src/gui/editorwidgets/qgsphotowidgetfactory.h +++ b/src/gui/editorwidgets/qgsphotowidgetfactory.h @@ -27,14 +27,8 @@ class GUI_EXPORT QgsPhotoWidgetFactory : public QgsEditorWidgetFactory { public: explicit QgsPhotoWidgetFactory( const QString& name ); - - - // QgsEditorWidgetFactory interface - public: QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; }; #endif // QGSPHOTOWIDGETFACTORY_H diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp index 49587e2c0b2..1a0e230650e 100644 --- a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp @@ -34,36 +34,6 @@ QgsEditorConfigWidget* QgsRangeWidgetFactory::configWidget( QgsVectorLayer* vl, return new QgsRangeConfigDlg( vl, fieldIdx, parent ); } -QVariantMap QgsRangeWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "Style" ) ); - xml2config( configElement, cfg, QStringLiteral( "Min" ) ); - xml2config( configElement, cfg, QStringLiteral( "Max" ) ); - xml2config( configElement, cfg, QStringLiteral( "Step" ) ); - xml2config( configElement, cfg, QStringLiteral( "AllowNull" ) ); - xml2config( configElement, cfg, QStringLiteral( "Suffix" ) ); - - return cfg; -} - -void QgsRangeWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - - config2xml( config, configElement, QStringLiteral( "Style" ) ); - config2xml( config, configElement, QStringLiteral( "Min" ) ); - config2xml( config, configElement, QStringLiteral( "Max" ) ); - config2xml( config, configElement, QStringLiteral( "Step" ) ); - config2xml( config, configElement, QStringLiteral( "AllowNull" ) ); - config2xml( config, configElement, QStringLiteral( "Suffix" ) ); -} - unsigned int QgsRangeWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const { const QgsField field = vl->fields().at( fieldIdx ); diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.h b/src/gui/editorwidgets/qgsrangewidgetfactory.h index a01d590488e..7262e813698 100644 --- a/src/gui/editorwidgets/qgsrangewidgetfactory.h +++ b/src/gui/editorwidgets/qgsrangewidgetfactory.h @@ -32,8 +32,6 @@ class GUI_EXPORT QgsRangeWidgetFactory : public QgsEditorWidgetFactory public: virtual QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - virtual QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - virtual void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; virtual QHash supportedWidgetTypes() override; private: diff --git a/src/gui/editorwidgets/qgsrelationreferencefactory.cpp b/src/gui/editorwidgets/qgsrelationreferencefactory.cpp index fc898c85648..328dbafe67e 100644 --- a/src/gui/editorwidgets/qgsrelationreferencefactory.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencefactory.cpp @@ -47,68 +47,6 @@ QgsEditorConfigWidget* QgsRelationReferenceFactory::configWidget( QgsVectorLayer return new QgsRelationReferenceConfigDlg( vl, fieldIdx, parent ); } -QVariantMap QgsRelationReferenceFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "AllowNULL" ) ); - xml2config( configElement, cfg, QStringLiteral( "OrderByValue" ) ); - xml2config( configElement, cfg, QStringLiteral( "ShowForm" ) ); - xml2config( configElement, cfg, QStringLiteral( "Relation" ) ); - xml2config( configElement, cfg, QStringLiteral( "MapIdentification" ) ); - xml2config( configElement, cfg, QStringLiteral( "ReadOnly" ) ); - xml2config( configElement, cfg, QStringLiteral( "AllowAddFeatures" ) ); - - QDomNode filterNode = configElement.elementsByTagName( QStringLiteral( "FilterFields" ) ).at( 0 ); - if ( !filterNode.isNull() ) - { - QStringList filterFields; - QDomNodeList fieldNodes = filterNode.toElement().elementsByTagName( QStringLiteral( "field" ) ); - filterFields.reserve( fieldNodes.size() ); - for ( int i = 0; i < fieldNodes.size(); i++ ) - { - QDomElement fieldElement = fieldNodes.at( i ).toElement(); - filterFields << fieldElement.attribute( QStringLiteral( "name" ) ); - } - cfg.insert( QStringLiteral( "FilterFields" ), filterFields ); - - xml2config( configElement, cfg , QStringLiteral( "ChainFilters" ) ); - } - return cfg; -} - -void QgsRelationReferenceFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ); - Q_UNUSED( layer ); - Q_UNUSED( fieldIdx ); - - config2xml( config, configElement, QStringLiteral( "AllowNULL" ) ); - config2xml( config, configElement, QStringLiteral( "OrderByValue" ) ); - config2xml( config, configElement, QStringLiteral( "ShowForm" ) ); - config2xml( config, configElement, QStringLiteral( "Relation" ) ); - config2xml( config, configElement, QStringLiteral( "MapIdentification" ) ); - config2xml( config, configElement, QStringLiteral( "ReadOnly" ) ); - config2xml( config, configElement, QStringLiteral( "AllowAddFeatures" ) ); - - if ( config.contains( QStringLiteral( "FilterFields" ) ) ) - { - QDomElement filterFields = doc.createElement( QStringLiteral( "FilterFields" ) ); - - Q_FOREACH ( const QString& field, config["FilterFields"].toStringList() ) - { - QDomElement fieldElem = doc.createElement( QStringLiteral( "field" ) ); - fieldElem.setAttribute( QStringLiteral( "name" ), field ); - filterFields.appendChild( fieldElem ); - } - configElement.appendChild( filterFields ); - - config2xml( config, configElement, QStringLiteral( "ChainFilters" ) ); - } -} - QHash QgsRelationReferenceFactory::supportedWidgetTypes() { QHash map = QHash(); diff --git a/src/gui/editorwidgets/qgsrelationreferencefactory.h b/src/gui/editorwidgets/qgsrelationreferencefactory.h index 647c945273e..720fc54dd8a 100644 --- a/src/gui/editorwidgets/qgsrelationreferencefactory.h +++ b/src/gui/editorwidgets/qgsrelationreferencefactory.h @@ -60,28 +60,6 @@ class GUI_EXPORT QgsRelationReferenceFactory : public QgsEditorWidgetFactory */ virtual QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - /** - * Read the config from an XML file and map it to a proper {@link QVariantMap}. - * - * @param configElement The configuration element from the project file - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - * - * @return A configuration object. This will be passed to your widget wrapper later on - */ - virtual QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - - /** - * Serialize your configuration and save it in a xml doc. - * - * @param config The configuration to serialize - * @param configElement The element, where you can write your configuration into - * @param doc The document. You can use this to create new nodes - * @param layer The layer for which this configuration applies - * @param fieldIdx The field on the layer for which this configuration applies - */ - virtual void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; - virtual QHash supportedWidgetTypes() override; virtual unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override; diff --git a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp index 98f29a11e88..4d98099c9ce 100644 --- a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp @@ -39,33 +39,9 @@ QgsEditorConfigWidget* QgsTextEditWidgetFactory::configWidget( QgsVectorLayer* v return new QgsTextEditConfigDlg( vl, fieldIdx, parent ); } - -void QgsTextEditWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - config2xml( config, configElement, QStringLiteral( "IsMultiline" ) ); - config2xml( config, configElement, QStringLiteral( "UseHtml" ) ); -} - -QVariantMap QgsTextEditWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "IsMultiline" ) ); - xml2config( configElement, cfg, QStringLiteral( "UseHtml" ) ); - - return cfg; -} - unsigned int QgsTextEditWidgetFactory::fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const { Q_UNUSED( vl ) Q_UNUSED( fieldIdx ) return 10; -} \ No newline at end of file +} diff --git a/src/gui/editorwidgets/qgstexteditwidgetfactory.h b/src/gui/editorwidgets/qgstexteditwidgetfactory.h index 17a6bf43fb4..1d7d75bf8e0 100644 --- a/src/gui/editorwidgets/qgstexteditwidgetfactory.h +++ b/src/gui/editorwidgets/qgstexteditwidgetfactory.h @@ -27,18 +27,11 @@ class GUI_EXPORT QgsTextEditWidgetFactory : public QgsEditorWidgetFactory { public: QgsTextEditWidgetFactory( const QString& name ); - - // QgsEditorWidgetFactory interface - public: QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; unsigned int fieldScore( const QgsVectorLayer* vl, int fieldIdx ) const override; - - private: - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; }; #endif // QGSTEXTEDITWIDGETFACTORY_H diff --git a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp index 42367537588..6e25ad8a6f9 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp @@ -33,23 +33,3 @@ QgsEditorConfigWidget* QgsUniqueValueWidgetFactory::configWidget( QgsVectorLayer { return new QgsUniqueValuesConfigDlg( vl, fieldIdx, parent ); } - -QVariantMap QgsUniqueValueWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "Editable" ) ); - - return cfg; -} - -void QgsUniqueValueWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - config2xml( config, configElement, QStringLiteral( "Editable" ) ); -} diff --git a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.h b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.h index 6290c45ffb6..ed7d1e8c533 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.h +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.h @@ -33,8 +33,6 @@ class GUI_EXPORT QgsUniqueValueWidgetFactory : public QgsEditorWidgetFactory public: QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; }; #endif // QGSUNIQUEVALUEWIDGETFACTORY_H diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp index 092f9d478ce..8774da6c756 100644 --- a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp @@ -44,44 +44,6 @@ QgsEditorConfigWidget* QgsValueMapWidgetFactory::configWidget( QgsVectorLayer* v return new QgsValueMapConfigDlg( vl, fieldIdx, parent ); } -QVariantMap QgsValueMapWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - QDomNodeList nodes = configElement.elementsByTagName( QStringLiteral( "value" ) ); - - for ( int i = 0; i < nodes.size(); ++i ) - { - QDomElement elem = nodes.at( i ).toElement(); - cfg.insert( elem.attribute( QStringLiteral( "key" ) ), elem.attribute( QStringLiteral( "value" ) ) ); - } - - return cfg; -} - -void QgsValueMapWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap::ConstIterator it = config.constBegin(); - - while ( it != config.constEnd() ) - { - QDomElement elem = doc.createElement( QStringLiteral( "value" ) ); - - elem.setAttribute( QStringLiteral( "key" ), it.key() ); - elem.setAttribute( QStringLiteral( "value" ), it.value().toString() ); - - configElement.appendChild( elem ); - - ++it; - } -} - QHash QgsValueMapWidgetFactory::supportedWidgetTypes() { QHash map = QHash(); diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.h b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.h index c9ba1fdaa5e..ca5870eded1 100644 --- a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.h +++ b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.h @@ -27,14 +27,9 @@ class GUI_EXPORT QgsValueMapWidgetFactory : public QgsEditorWidgetFactory { public: QgsValueMapWidgetFactory( const QString& name ); - - // QgsEditorWidgetFactory interface - public: QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; virtual QHash supportedWidgetTypes() override; }; diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp index 893ae5f9a1f..3342ac89549 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp @@ -43,38 +43,3 @@ QgsEditorConfigWidget* QgsValueRelationWidgetFactory::configWidget( QgsVectorLay { return new QgsValueRelationConfigDlg( vl, fieldIdx, parent ); } - -QVariantMap QgsValueRelationWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "Layer" ) ); - xml2config( configElement, cfg, QStringLiteral( "Key" ) ); - xml2config( configElement, cfg, QStringLiteral( "Value" ) ); - xml2config( configElement, cfg, QStringLiteral( "FilterExpression" ) ); - xml2config( configElement, cfg, QStringLiteral( "OrderByValue" ) ); - xml2config( configElement, cfg, QStringLiteral( "AllowMulti" ) ); - xml2config( configElement, cfg, QStringLiteral( "AllowNull" ) ); - xml2config( configElement, cfg, QStringLiteral( "UseCompleter" ) ); - - return cfg; -} - -void QgsValueRelationWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - config2xml( config, configElement, QStringLiteral( "Layer" ) ); - config2xml( config, configElement, QStringLiteral( "Key" ) ); - config2xml( config, configElement, QStringLiteral( "Value" ) ); - config2xml( config, configElement, QStringLiteral( "FilterExpression" ) ); - config2xml( config, configElement, QStringLiteral( "OrderByValue" ) ); - config2xml( config, configElement, QStringLiteral( "AllowMulti" ) ); - config2xml( config, configElement, QStringLiteral( "AllowNull" ) ); - config2xml( config, configElement, QStringLiteral( "UseCompleter" ) ); -} diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h index 7876f7ebe69..3254f7a32d4 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetfactory.h @@ -35,8 +35,6 @@ class GUI_EXPORT QgsValueRelationWidgetFactory : public QgsEditorWidgetFactory QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsSearchWidgetWrapper* createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; }; #endif // QGSVALUERELATIONWIDGETFACTORY_H diff --git a/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp b/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp index 27b969c1f84..ae312e42805 100644 --- a/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp @@ -33,26 +33,3 @@ QgsEditorConfigWidget* QgsWebViewWidgetFactory::configWidget( QgsVectorLayer* vl { return new QgsWebViewWidgetConfigDlg( vl, fieldIdx, parent ); } - -QVariantMap QgsWebViewWidgetFactory::readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - QVariantMap cfg; - - xml2config( configElement, cfg, QStringLiteral( "Height" ) ); - xml2config( configElement, cfg, QStringLiteral( "Width" ) ); - - return cfg; -} - -void QgsWebViewWidgetFactory::writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) -{ - Q_UNUSED( doc ) - Q_UNUSED( layer ) - Q_UNUSED( fieldIdx ) - - config2xml( config, configElement, QStringLiteral( "Height" ) ); - config2xml( config, configElement, QStringLiteral( "Width" ) ); -} diff --git a/src/gui/editorwidgets/qgswebviewwidgetfactory.h b/src/gui/editorwidgets/qgswebviewwidgetfactory.h index 54e813b26c4..0e5fe2c78e9 100644 --- a/src/gui/editorwidgets/qgswebviewwidgetfactory.h +++ b/src/gui/editorwidgets/qgswebviewwidgetfactory.h @@ -27,13 +27,8 @@ class GUI_EXPORT QgsWebViewWidgetFactory : public QgsEditorWidgetFactory { public: explicit QgsWebViewWidgetFactory( const QString& name ); - - // QgsEditorWidgetFactory interface - public: QgsEditorWidgetWrapper* create( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) const override; QgsEditorConfigWidget* configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const override; - QVariantMap readConfig( const QDomElement& configElement, QgsVectorLayer* layer, int fieldIdx ) override; - void writeConfig( const QVariantMap& config, QDomElement& configElement, QDomDocument& doc, const QgsVectorLayer* layer, int fieldIdx ) override; }; #endif // QGSWEBVIEWWIDGETFACTORY_H