Remove unnneeded method

m-kuhn · m-kuhn · commit 456cebae9671 · 2017-11-20T20:31:39.000+01:00
diff --git a/python/gui/qgsattributeformwidget.sip b/python/gui/qgsattributeformwidget.sip
@@ -125,7 +125,6 @@ class QgsAttributeFormWidget : QWidget /Abstract/
 
 
 
-
 };
 
 /************************************************************************
diff --git a/src/gui/qgsattributeformwidget.cpp b/src/gui/qgsattributeformwidget.cpp
@@ -30,6 +30,7 @@ QgsAttributeFormWidget::QgsAttributeFormWidget( QgsWidgetWrapper *widget, QgsAtt
   mSearchPage->setLayout( l );
   l->addWidget( mSearchFrame, 1 );
   mSearchWidgetToolButton = new QgsSearchWidgetToolButton();
+  mSearchWidgetToolButton->setObjectName( QStringLiteral( "SearchWidgetToolButton" ) );
   connect( mSearchWidgetToolButton, &QgsSearchWidgetToolButton::activeFlagsChanged,
            this, &QgsAttributeFormWidget::searchWidgetFlagsChanged );
   l->addWidget( mSearchWidgetToolButton, 0 );
@@ -129,15 +130,9 @@ void QgsAttributeFormWidget::resetSearch()
   }
 }
 
-QgsSearchWidgetToolButton *QgsAttributeFormWidget::searchWidgetToolButton() SIP_SKIP
-{
-  return mSearchWidgetToolButton;
-}
-
 QgsVectorLayer *QgsAttributeFormWidget::layer()
 {
-  QgsAttributeForm *aform = form();
-  return aform ? aform->layer() : nullptr;
+  return mWidget->layer();
 }
 
 void QgsAttributeFormWidget::searchWidgetFlagsChanged( QgsSearchWidgetWrapper::FilterFlags flags )
diff --git a/src/gui/qgsattributeformwidget.h b/src/gui/qgsattributeformwidget.h
@@ -146,13 +146,6 @@ class GUI_EXPORT QgsAttributeFormWidget : public QWidget // SIP_ABSTRACT
      */
     QWidget *searchPage() const SIP_SKIP;
 
-    /**
-     * Returns a pointer to the search widget tool button in the widget.
-     * \note this method is in place for unit testing only, and is not considered
-     * stable API
-     */
-    QgsSearchWidgetToolButton *searchWidgetToolButton() SIP_SKIP;
-
   private slots:
 
     //! Triggered when search button flags are changed

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ class QgsAttributeFormWidget : QWidget /Abstract/`
`125`	`125`
`126`	`126`
`127`	`127`
`128`		`-`
`129`	`128`	`};`
`130`	`129`
`131`	`130`	`/************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ QgsAttributeFormWidget::QgsAttributeFormWidget( QgsWidgetWrapper *widget, QgsAtt`
`30`	`30`	`mSearchPage->setLayout( l );`
`31`	`31`	`l->addWidget( mSearchFrame, 1 );`
`32`	`32`	`mSearchWidgetToolButton = new QgsSearchWidgetToolButton();`
	`33`	`+ mSearchWidgetToolButton->setObjectName( QStringLiteral( "SearchWidgetToolButton" ) );`
`33`	`34`	`connect( mSearchWidgetToolButton, &QgsSearchWidgetToolButton::activeFlagsChanged,`
`34`	`35`	`this, &QgsAttributeFormWidget::searchWidgetFlagsChanged );`
`35`	`36`	`l->addWidget( mSearchWidgetToolButton, 0 );`
`@@ -129,15 +130,9 @@ void QgsAttributeFormWidget::resetSearch()`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`
`132`		`-QgsSearchWidgetToolButton *QgsAttributeFormWidget::searchWidgetToolButton() SIP_SKIP`
`133`		`-{`
`134`		`- return mSearchWidgetToolButton;`
`135`		`-}`
`136`		`-`
`137`	`133`	`QgsVectorLayer *QgsAttributeFormWidget::layer()`
`138`	`134`	`{`
`139`		`- QgsAttributeForm *aform = form();`
`140`		`- return aform ? aform->layer() : nullptr;`
	`135`	`+ return mWidget->layer();`
`141`	`136`	`}`
`142`	`137`
`143`	`138`	`void QgsAttributeFormWidget::searchWidgetFlagsChanged( QgsSearchWidgetWrapper::FilterFlags flags )`