Remove unnneeded method

qgis · Nov 20, 2017 · 456ceba · 456ceba
1 parent ddca8b6
commit 456ceba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
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