[Releation reference widget] more coherent method names

3nids · 3nids · commit 3bb5f43da572 · 2014-09-15T11:34:46.000+02:00
diff --git a/python/gui/qgsrelationreferencewidget.sip b/python/gui/qgsrelationreferencewidget.sip
@@ -44,5 +44,5 @@ class QgsRelationReferenceWidget : QWidget
     void init();
 
    signals:
-    void relatedFeatureChanged( QVariant );
+    void foreignKeyChanged( QVariant );
 };
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -186,11 +186,11 @@ void QgsRelationReferenceWidget::setRelationEditable( bool editable )
   mMapIdentificationButton->setEnabled( editable );
 }
 
-void QgsRelationReferenceWidget::setRelatedFeature( const QVariant& value )
+void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
 {
   if ( !value.isValid() || value.isNull() )
   {
-    removeRelatedFeature();
+    deleteForeignKey();
     return;
   }
 
@@ -210,7 +210,7 @@ void QgsRelationReferenceWidget::setRelatedFeature( const QVariant& value )
 
   if ( !f.isValid() )
   {
-    removeRelatedFeature();
+    deleteForeignKey();
     return;
   }
 
@@ -236,10 +236,10 @@ void QgsRelationReferenceWidget::setRelatedFeature( const QVariant& value )
 
   highlightFeature( f );
   updateAttributeEditorFrame( f );
-  emit relatedFeatureChanged( foreignKey() );
+  emit foreignKeyChanged( foreignKey() );
 }
 
-void QgsRelationReferenceWidget::removeRelatedFeature()
+void QgsRelationReferenceWidget::deleteForeignKey()
 {
   QVariant nullValue = QSettings().value( "qgis/nullValue", "NULL" );
   if ( mReadOnlySelector )
@@ -266,7 +266,7 @@ void QgsRelationReferenceWidget::removeRelatedFeature()
   }
 
   updateAttributeEditorFrame( QgsFeature() );
-  emit relatedFeatureChanged( QVariant( QVariant::Int ) );
+  emit foreignKeyChanged( QVariant( QVariant::Int ) );
 }
 
 void QgsRelationReferenceWidget::mapToolDeactivated()
@@ -501,7 +501,7 @@ void QgsRelationReferenceWidget::mapIdentificationTriggered( QAction* action )
 {
   if ( action == mRemoveFeatureAction )
   {
-    removeRelatedFeature();
+    deleteForeignKey();
   }
 
   else if ( action == mMapIdentificationAction )
@@ -539,7 +539,7 @@ void QgsRelationReferenceWidget::comboReferenceChanged( int index )
   mReferencedLayer->getFeatures( QgsFeatureRequest().setFilterFid( fid ) ).nextFeature( feat );
   highlightFeature( feat );
   updateAttributeEditorFrame( feat );
-  emit relatedFeatureChanged( mFidFkMap.value( fid ) );
+  emit foreignKeyChanged( mFidFkMap.value( fid ) );
 }
 
 void QgsRelationReferenceWidget::updateAttributeEditorFrame( const QgsFeature feature )
@@ -569,7 +569,7 @@ void QgsRelationReferenceWidget::featureIdentified( const QgsFeature& feature )
 
   highlightFeature( feature );
   updateAttributeEditorFrame( feature );
-  emit relatedFeatureChanged( foreignKey() );
+  emit foreignKeyChanged( foreignKey() );
 
   // deactivate map tool if activate
   if ( mCanvas && mMapTool )
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h
@@ -51,7 +51,7 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
     void setRelationEditable( bool editable );
 
     //! this sets the related feature using from the foreign key
-    void setRelatedFeature( const QVariant &value );
+    void setForeignKey( const QVariant &value );
 
     //! returns the related feature foreign key
     QVariant foreignKey();
@@ -73,15 +73,15 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
     void init();
 
   signals:
-    void relatedFeatureChanged( QVariant );
+    void foreignKeyChanged( QVariant );
 
   private slots:
     void highlightActionTriggered( QAction* action );
     void deleteHighlight();
     void openForm();
     void mapIdentificationTriggered( QAction* action );
     void comboReferenceChanged( int index );
-    void removeRelatedFeature();
+    void deleteForeignKey();
     void featureIdentified( const QgsFeature& feature );
     void mapToolDeactivated();
 
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -71,7 +71,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget* editor )
 
   mWidget->setRelation( relation, config( "AllowNULL" ).toBool() );
 
-  connect( mWidget, SIGNAL( relatedFeatureChanged( QVariant ) ), this,  SLOT( relatedFeatureChanged( QVariant ) ) );
+  connect( mWidget, SIGNAL( foreignKeyChanged( QVariant ) ), this,  SLOT( foreignKeyChanged( QVariant ) ) );
 }
 
 QVariant QgsRelationReferenceWidgetWrapper::value()
@@ -96,7 +96,7 @@ void QgsRelationReferenceWidgetWrapper::setValue( const QVariant& value )
   if ( !mWidget )
     return;
 
-  mWidget->setRelatedFeature( value );
+  mWidget->setForeignKey( value );
 }
 
 void QgsRelationReferenceWidgetWrapper::setEnabled( bool enabled )
@@ -107,7 +107,7 @@ void QgsRelationReferenceWidgetWrapper::setEnabled( bool enabled )
   mWidget->setRelationEditable( enabled );
 }
 
-void QgsRelationReferenceWidgetWrapper::relatedFeatureChanged( QVariant value )
+void QgsRelationReferenceWidgetWrapper::foreignKeyChanged( QVariant value )
 {
   if ( !value.isValid() || value.isNull() )
   {
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h
@@ -39,7 +39,7 @@ class GUI_EXPORT QgsRelationReferenceWidgetWrapper : public QgsEditorWidgetWrapp
     virtual void setEnabled( bool enabled );
 
   private slots:
-    void relatedFeatureChanged( QVariant value );
+    void foreignKeyChanged( QVariant value );
 
   private:
     QgsRelationReferenceWidget* mWidget;

Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,11 @@ void QgsRelationReferenceWidget::setRelationEditable( bool editable )`
`186`	`186`	`mMapIdentificationButton->setEnabled( editable );`
`187`	`187`	`}`
`188`	`188`
`189`		`-void QgsRelationReferenceWidget::setRelatedFeature( const QVariant& value )`
	`189`	`+void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )`
`190`	`190`	`{`
`191`	`191`	`if ( !value.isValid() \|\| value.isNull() )`
`192`	`192`	`{`
`193`		`- removeRelatedFeature();`
	`193`	`+ deleteForeignKey();`
`194`	`194`	`return;`
`195`	`195`	`}`
`196`	`196`
`@@ -210,7 +210,7 @@ void QgsRelationReferenceWidget::setRelatedFeature( const QVariant& value )`
`210`	`210`
`211`	`211`	`if ( !f.isValid() )`
`212`	`212`	`{`
`213`		`- removeRelatedFeature();`
	`213`	`+ deleteForeignKey();`
`214`	`214`	`return;`
`215`	`215`	`}`
`216`	`216`
`@@ -236,10 +236,10 @@ void QgsRelationReferenceWidget::setRelatedFeature( const QVariant& value )`
`236`	`236`
`237`	`237`	`highlightFeature( f );`
`238`	`238`	`updateAttributeEditorFrame( f );`
`239`		`- emit relatedFeatureChanged( foreignKey() );`
	`239`	`+ emit foreignKeyChanged( foreignKey() );`
`240`	`240`	`}`
`241`	`241`
`242`		`-void QgsRelationReferenceWidget::removeRelatedFeature()`
	`242`	`+void QgsRelationReferenceWidget::deleteForeignKey()`
`243`	`243`	`{`
`244`	`244`	`QVariant nullValue = QSettings().value( "qgis/nullValue", "NULL" );`
`245`	`245`	`if ( mReadOnlySelector )`
`@@ -266,7 +266,7 @@ void QgsRelationReferenceWidget::removeRelatedFeature()`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`updateAttributeEditorFrame( QgsFeature() );`
`269`		`- emit relatedFeatureChanged( QVariant( QVariant::Int ) );`
	`269`	`+ emit foreignKeyChanged( QVariant( QVariant::Int ) );`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`void QgsRelationReferenceWidget::mapToolDeactivated()`
`@@ -501,7 +501,7 @@ void QgsRelationReferenceWidget::mapIdentificationTriggered( QAction* action )`
`501`	`501`	`{`
`502`	`502`	`if ( action == mRemoveFeatureAction )`
`503`	`503`	`{`
`504`		`- removeRelatedFeature();`
	`504`	`+ deleteForeignKey();`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`else if ( action == mMapIdentificationAction )`
`@@ -539,7 +539,7 @@ void QgsRelationReferenceWidget::comboReferenceChanged( int index )`
`539`	`539`	`mReferencedLayer->getFeatures( QgsFeatureRequest().setFilterFid( fid ) ).nextFeature( feat );`
`540`	`540`	`highlightFeature( feat );`
`541`	`541`	`updateAttributeEditorFrame( feat );`
`542`		`- emit relatedFeatureChanged( mFidFkMap.value( fid ) );`
	`542`	`+ emit foreignKeyChanged( mFidFkMap.value( fid ) );`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`void QgsRelationReferenceWidget::updateAttributeEditorFrame( const QgsFeature feature )`
`@@ -569,7 +569,7 @@ void QgsRelationReferenceWidget::featureIdentified( const QgsFeature& feature )`
`569`	`569`
`570`	`570`	`highlightFeature( feature );`
`571`	`571`	`updateAttributeEditorFrame( feature );`
`572`		`- emit relatedFeatureChanged( foreignKey() );`
	`572`	`+ emit foreignKeyChanged( foreignKey() );`
`573`	`573`
`574`	`574`	`// deactivate map tool if activate`
`575`	`575`	`if ( mCanvas && mMapTool )`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget* editor )`
`71`	`71`
`72`	`72`	`mWidget->setRelation( relation, config( "AllowNULL" ).toBool() );`
`73`	`73`
`74`		`- connect( mWidget, SIGNAL( relatedFeatureChanged( QVariant ) ), this, SLOT( relatedFeatureChanged( QVariant ) ) );`
	`74`	`+ connect( mWidget, SIGNAL( foreignKeyChanged( QVariant ) ), this, SLOT( foreignKeyChanged( QVariant ) ) );`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`QVariant QgsRelationReferenceWidgetWrapper::value()`
`@@ -96,7 +96,7 @@ void QgsRelationReferenceWidgetWrapper::setValue( const QVariant& value )`
`96`	`96`	`if ( !mWidget )`
`97`	`97`	`return;`
`98`	`98`
`99`		`- mWidget->setRelatedFeature( value );`
	`99`	`+ mWidget->setForeignKey( value );`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`void QgsRelationReferenceWidgetWrapper::setEnabled( bool enabled )`
`@@ -107,7 +107,7 @@ void QgsRelationReferenceWidgetWrapper::setEnabled( bool enabled )`
`107`	`107`	`mWidget->setRelationEditable( enabled );`
`108`	`108`	`}`
`109`	`109`
`110`		`-void QgsRelationReferenceWidgetWrapper::relatedFeatureChanged( QVariant value )`
	`110`	`+void QgsRelationReferenceWidgetWrapper::foreignKeyChanged( QVariant value )`
`111`	`111`	`{`
`112`	`112`	`if ( !value.isValid() \|\| value.isNull() )`
`113`	`113`	`{`