Refactor widget constraints to keep variables private

m-kuhn · m-kuhn · commit c68eaeb92923 · 2016-06-02T08:51:03.000+02:00
diff --git a/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip b/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
@@ -199,5 +199,5 @@ class QgsEditorWidgetWrapper : QgsWidgetWrapper
      * This can be overwritten in subclasses to allow individual widgets to
      * change the visual cue.
      */
-    virtual void updateConstraintWidgetStatus();
+    virtual void updateConstraintWidgetStatus( bool contraintValid );
 };
diff --git a/python/gui/editorwidgets/qgsrelationreferencewidgetwrapper.sip b/python/gui/editorwidgets/qgsrelationreferencewidgetwrapper.sip
@@ -34,5 +34,5 @@ class QgsRelationReferenceWidgetWrapper : QgsEditorWidgetWrapper
      * change the visual cue.
      * @note added in QGIS 2.16
      */
-    void updateConstraintWidgetStatus();
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 };
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
@@ -97,9 +97,9 @@ void QgsEditorWidgetWrapper::valueChanged()
   emit valueChanged( value() );
 }
 
-void QgsEditorWidgetWrapper::updateConstraintWidgetStatus()
+void QgsEditorWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
-  if ( mValidConstraint )
+  if ( constraintValid )
     widget()->setStyleSheet( QString() );
   else
     widget()->setStyleSheet( "background-color: #dd7777;" );
@@ -162,7 +162,7 @@ void QgsEditorWidgetWrapper::updateConstraint( const QgsFeature &ft )
 
   if ( toEmit )
   {
-    updateConstraintWidgetStatus();
+    updateConstraintWidgetStatus( mValidConstraint );
     emit constraintStatusChanged( expression, description, errStr, mValidConstraint );
   }
 }
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h
@@ -220,11 +220,15 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
      *
      * This can be overwritten in subclasses to allow individual widgets to
      * change the visual cue.
+     *
+     * @param constraintValid The current constraint status.
+     *
      * @note added in QGIS 2.16
      */
-    virtual void updateConstraintWidgetStatus();
+    virtual void updateConstraintWidgetStatus( bool constraintValid );
 
   private:
+
     /**
      * Boolean storing the current validity of the constraint for this widget.
      */
diff --git a/src/gui/editorwidgets/qgscolorwidgetwrapper.cpp b/src/gui/editorwidgets/qgscolorwidgetwrapper.cpp
@@ -78,7 +78,7 @@ void QgsColorWidgetWrapper::setValue( const QVariant& value )
     mColorButton->setColor( !value.isNull() ? QColor( value.toString() ) : QColor() );
 }
 
-void QgsColorWidgetWrapper::updateConstraintWidgetStatus()
+void QgsColorWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
   // nothing
 }
diff --git a/src/gui/editorwidgets/qgscolorwidgetwrapper.h b/src/gui/editorwidgets/qgscolorwidgetwrapper.h
@@ -46,7 +46,7 @@ class GUI_EXPORT  QgsColorWidgetWrapper : public QgsEditorWidgetWrapper
     void setValue( const QVariant& value ) override;
 
   private:
-    void updateConstraintWidgetStatus() override;
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 
     QgsColorButtonV2* mColorButton;
 };
diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp b/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp
@@ -188,11 +188,11 @@ void QgsExternalResourceWidgetWrapper::setEnabled( bool enabled )
     mQgsWidget->setReadOnly( !enabled );
 }
 
-void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus()
+void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
   if ( mLineEdit )
   {
-    if ( mValidConstraint )
+    if ( constraintValid )
       mLineEdit->setStyleSheet( QString() );
     else
       mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );
diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.h b/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.h
@@ -54,7 +54,7 @@ class GUI_EXPORT QgsExternalResourceWidgetWrapper : public QgsEditorWidgetWrappe
     void setEnabled( bool enabled ) override;
 
   private:
-    void updateConstraintWidgetStatus() override;
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 
     QLineEdit* mLineEdit;
     QLabel* mLabel;
diff --git a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp
@@ -152,11 +152,11 @@ void QgsFileNameWidgetWrapper::selectFileName()
     mLineEdit->setText( fileName );
 }
 
-void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus()
+void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
   if ( mLineEdit )
   {
-    if ( mValidConstraint )
+    if ( constraintValid )
       mLineEdit->setStyleSheet( QString() );
     else
     {
diff --git a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h
@@ -51,7 +51,7 @@ class GUI_EXPORT QgsFileNameWidgetWrapper : public QgsEditorWidgetWrapper
     void setValue( const QVariant& value ) override;
 
   private:
-    void updateConstraintWidgetStatus() override;
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 
     QLineEdit* mLineEdit;
     QPushButton* mPushButton;
diff --git a/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp
@@ -267,11 +267,11 @@ void QgsPhotoWidgetWrapper::setEnabled( bool enabled )
     mButton->setEnabled( enabled );
 }
 
-void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus()
+void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
   if ( mLineEdit )
   {
-    if ( mValidConstraint )
+    if ( constraintValid )
       mLineEdit->setStyleSheet( QString() );
     else
     {
diff --git a/src/gui/editorwidgets/qgsphotowidgetwrapper.h b/src/gui/editorwidgets/qgsphotowidgetwrapper.h
@@ -65,7 +65,7 @@ class GUI_EXPORT QgsPhotoWidgetWrapper : public QgsEditorWidgetWrapper
     void loadPixmap( const QString& fileName );
 
   private:
-    void updateConstraintWidgetStatus() override;
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 
     //! This label is used as a container to display the picture
     QLabel* mPhotoLabel;
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -140,11 +140,11 @@ void QgsRelationReferenceWidgetWrapper::foreignKeyChanged( QVariant value )
   emit valueChanged( value );
 }
 
-void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus()
+void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
   if ( mWidget )
   {
-    if ( mValidConstraint )
+    if ( constraintValid )
       mWidget->setStyleSheet( QString() );
     else
       mWidget->setStyleSheet( ".QComboBox { background-color: #dd7777; }" );
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h
@@ -71,7 +71,7 @@ class GUI_EXPORT QgsRelationReferenceWidgetWrapper : public QgsEditorWidgetWrapp
      * change the visual cue.
      * @note added in QGIS 2.16
      */
-    void updateConstraintWidgetStatus() override;
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 
   private:
     QgsRelationReferenceWidget* mWidget;
diff --git a/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp b/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp
@@ -189,11 +189,11 @@ void QgsWebViewWidgetWrapper::selectFileName()
     mLineEdit->setText( filePath );
 }
 
-void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus()
+void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )
 {
   if ( mLineEdit )
   {
-    if ( mValidConstraint )
+    if ( constraintValid )
       mLineEdit->setStyleSheet( QString() );
     else
     {
diff --git a/src/gui/editorwidgets/qgswebviewwidgetwrapper.h b/src/gui/editorwidgets/qgswebviewwidgetwrapper.h
@@ -53,7 +53,7 @@ class GUI_EXPORT QgsWebViewWidgetWrapper : public QgsEditorWidgetWrapper
     void selectFileName();
 
   private:
-    void updateConstraintWidgetStatus() override;
+    void updateConstraintWidgetStatus( bool constraintValid ) override;
 
     //! This label is used as a container to display the picture
     QWebView* mWebView;

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,9 @@ void QgsEditorWidgetWrapper::valueChanged()`
`97`	`97`	`emit valueChanged( value() );`
`98`	`98`	`}`
`99`	`99`
`100`		`-void QgsEditorWidgetWrapper::updateConstraintWidgetStatus()`
	`100`	`+void QgsEditorWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`101`	`101`	`{`
`102`		`- if ( mValidConstraint )`
	`102`	`+ if ( constraintValid )`
`103`	`103`	`widget()->setStyleSheet( QString() );`
`104`	`104`	`else`
`105`	`105`	`widget()->setStyleSheet( "background-color: #dd7777;" );`
`@@ -162,7 +162,7 @@ void QgsEditorWidgetWrapper::updateConstraint( const QgsFeature &ft )`
`162`	`162`
`163`	`163`	`if ( toEmit )`
`164`	`164`	`{`
`165`		`- updateConstraintWidgetStatus();`
	`165`	`+ updateConstraintWidgetStatus( mValidConstraint );`
`166`	`166`	`emit constraintStatusChanged( expression, description, errStr, mValidConstraint );`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void QgsColorWidgetWrapper::setValue( const QVariant& value )`
`78`	`78`	`mColorButton->setColor( !value.isNull() ? QColor( value.toString() ) : QColor() );`
`79`	`79`	`}`
`80`	`80`
`81`		`-void QgsColorWidgetWrapper::updateConstraintWidgetStatus()`
	`81`	`+void QgsColorWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`82`	`82`	`{`
`83`	`83`	`// nothing`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,11 +188,11 @@ void QgsExternalResourceWidgetWrapper::setEnabled( bool enabled )`
`188`	`188`	`mQgsWidget->setReadOnly( !enabled );`
`189`	`189`	`}`
`190`	`190`
`191`		`-void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus()`
	`191`	`+void QgsExternalResourceWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`192`	`192`	`{`
`193`	`193`	`if ( mLineEdit )`
`194`	`194`	`{`
`195`		`- if ( mValidConstraint )`
	`195`	`+ if ( constraintValid )`
`196`	`196`	`mLineEdit->setStyleSheet( QString() );`
`197`	`197`	`else`
`198`	`198`	`mLineEdit->setStyleSheet( "QgsFilterLineEdit { background-color: #dd7777; }" );`
Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,11 @@ void QgsFileNameWidgetWrapper::selectFileName()`
`152`	`152`	`mLineEdit->setText( fileName );`
`153`	`153`	`}`
`154`	`154`
`155`		`-void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus()`
	`155`	`+void QgsFileNameWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`156`	`156`	`{`
`157`	`157`	`if ( mLineEdit )`
`158`	`158`	`{`
`159`		`- if ( mValidConstraint )`
	`159`	`+ if ( constraintValid )`
`160`	`160`	`mLineEdit->setStyleSheet( QString() );`
`161`	`161`	`else`
`162`	`162`	`{`
Original file line number	Diff line number	Diff line change
`@@ -267,11 +267,11 @@ void QgsPhotoWidgetWrapper::setEnabled( bool enabled )`
`267`	`267`	`mButton->setEnabled( enabled );`
`268`	`268`	`}`
`269`	`269`
`270`		`-void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus()`
	`270`	`+void QgsPhotoWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`271`	`271`	`{`
`272`	`272`	`if ( mLineEdit )`
`273`	`273`	`{`
`274`		`- if ( mValidConstraint )`
	`274`	`+ if ( constraintValid )`
`275`	`275`	`mLineEdit->setStyleSheet( QString() );`
`276`	`276`	`else`
`277`	`277`	`{`
Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,11 @@ void QgsRelationReferenceWidgetWrapper::foreignKeyChanged( QVariant value )`
`140`	`140`	`emit valueChanged( value );`
`141`	`141`	`}`
`142`	`142`
`143`		`-void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus()`
	`143`	`+void QgsRelationReferenceWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`144`	`144`	`{`
`145`	`145`	`if ( mWidget )`
`146`	`146`	`{`
`147`		`- if ( mValidConstraint )`
	`147`	`+ if ( constraintValid )`
`148`	`148`	`mWidget->setStyleSheet( QString() );`
`149`	`149`	`else`
`150`	`150`	`mWidget->setStyleSheet( ".QComboBox { background-color: #dd7777; }" );`
Original file line number	Diff line number	Diff line change
`@@ -189,11 +189,11 @@ void QgsWebViewWidgetWrapper::selectFileName()`
`189`	`189`	`mLineEdit->setText( filePath );`
`190`	`190`	`}`
`191`	`191`
`192`		`-void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus()`
	`192`	`+void QgsWebViewWidgetWrapper::updateConstraintWidgetStatus( bool constraintValid )`
`193`	`193`	`{`
`194`	`194`	`if ( mLineEdit )`
`195`	`195`	`{`
`196`		`- if ( mValidConstraint )`
	`196`	`+ if ( constraintValid )`
`197`	`197`	`mLineEdit->setStyleSheet( QString() );`
`198`	`198`	`else`
`199`	`199`	`{`