remove redundant code

signedav · signedav · commit 73e774b75a31 · 2019-01-21T17:26:08.000+01:00
diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -218,6 +218,7 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )
       }
     }
     mComboBox->setCurrentIndex( idx );
+    mComboBox->setEnabled( mEnabled );
   }
   else if ( mLineEdit )
   {
@@ -229,6 +230,7 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )
         break;
       }
     }
+    mLineEdit->setEnabled( mEnabled );
   }
 }
 
@@ -387,27 +389,4 @@ void QgsValueRelationWidgetWrapper::setEnabled( bool enabled )
     return;
 
   mEnabled = enabled;
-
-  if ( mTableWidget )
-  {
-    auto signalBlockedTableWidget = whileBlocking( mTableWidget );
-    Q_UNUSED( signalBlockedTableWidget )
-
-    for ( int j = 0; j < mTableWidget->rowCount(); j++ )
-    {
-      for ( int i = 0; i < mTableWidget->columnCount(); ++i )
-      {
-        QTableWidgetItem *item = mTableWidget->item( j, i );
-        if ( item )
-        {
-          if ( enabled )
-            item->setFlags( item->flags() | Qt::ItemIsEnabled );
-          else
-            item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
-        }
-      }
-    }
-  }
-  else
-    QgsEditorWidgetWrapper::setEnabled( enabled );
 }

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`mComboBox->setCurrentIndex( idx );`
	`221`	`+ mComboBox->setEnabled( mEnabled );`
`221`	`222`	`}`
`222`	`223`	`else if ( mLineEdit )`
`223`	`224`	`{`
`@@ -229,6 +230,7 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )`
`229`	`230`	`break;`
`230`	`231`	`}`
`231`	`232`	`}`
	`233`	`+ mLineEdit->setEnabled( mEnabled );`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`
`@@ -387,27 +389,4 @@ void QgsValueRelationWidgetWrapper::setEnabled( bool enabled )`
`387`	`389`	`return;`
`388`	`390`
`389`	`391`	`mEnabled = enabled;`
`390`		`-`
`391`		`- if ( mTableWidget )`
`392`		`- {`
`393`		`- auto signalBlockedTableWidget = whileBlocking( mTableWidget );`
`394`		`- Q_UNUSED( signalBlockedTableWidget )`
`395`		`-`
`396`		`- for ( int j = 0; j < mTableWidget->rowCount(); j++ )`
`397`		`- {`
`398`		`- for ( int i = 0; i < mTableWidget->columnCount(); ++i )`
`399`		`- {`
`400`		`- QTableWidgetItem *item = mTableWidget->item( j, i );`
`401`		`- if ( item )`
`402`		`- {`
`403`		`- if ( enabled )`
`404`		`- item->setFlags( item->flags() \| Qt::ItemIsEnabled );`
`405`		`- else`
`406`		`- item->setFlags( item->flags() & ~Qt::ItemIsEnabled );`
`407`		`- }`
`408`		`- }`
`409`		`- }`
`410`		`- }`
`411`		`- else`
`412`		`- QgsEditorWidgetWrapper::setEnabled( enabled );`
`413`	`392`	`}`