also move triggering of results to core

3nids · 3nids · commit 31cd1644c343 · 2018-11-09T10:01:29.000Z
diff --git a/python/core/auto_generated/locator/qgslocatormodelbridge.sip.in b/python/core/auto_generated/locator/qgslocatormodelbridge.sip.in
@@ -53,6 +53,11 @@ Returns true if some text to be search is pending in the queue
     bool isRunning() const;
 %Docstring
 Returns true if the a search is currently running
+%End
+
+    void triggerResult( const QModelIndex &index );
+%Docstring
+Triggers the result at given index
 %End
 
   signals:
diff --git a/src/core/locator/qgslocatormodelbridge.cpp b/src/core/locator/qgslocatormodelbridge.cpp
@@ -37,6 +37,13 @@ bool QgsLocatorModelBridge::isRunning() const
   return mIsRunning;
 }
 
+void QgsLocatorModelBridge::triggerResult( const QModelIndex &index )
+{
+  mLocator->clearPreviousResults();
+  QgsLocatorResult result = mProxyModel->data( index, QgsLocatorModel::ResultDataRole ).value< QgsLocatorResult >();
+  result.filter->triggerResult( result );
+}
+
 void QgsLocatorModelBridge::setIsRunning( bool isRunning )
 {
   if ( mIsRunning == isRunning )
diff --git a/src/core/locator/qgslocatormodelbridge.h b/src/core/locator/qgslocatormodelbridge.h
@@ -60,6 +60,9 @@ class CORE_EXPORT QgsLocatorModelBridge : public QObject
     //! Returns true if the a search is currently running
     bool isRunning() const;
 
+    //! Triggers the result at given index
+    void triggerResult( const QModelIndex &index );
+
   signals:
     //! Emitted when a result is added
     void resultAdded();
diff --git a/src/gui/locator/qgslocatorwidget.cpp b/src/gui/locator/qgslocatorwidget.cpp
@@ -312,11 +312,9 @@ void QgsLocatorWidget::acceptCurrentEntry()
     if ( !index.isValid() )
       return;
 
-    QgsLocatorResult result = mModelBridge->proxyModel()->data( index, QgsLocatorModel::ResultDataRole ).value< QgsLocatorResult >();
     mResultsContainer->hide();
     mLineEdit->clearFocus();
-    mModelBridge->locator()->clearPreviousResults();
-    result.filter->triggerResult( result );
+    mModelBridge->triggerResult( index );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,13 @@ bool QgsLocatorModelBridge::isRunning() const`
`37`	`37`	`return mIsRunning;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+void QgsLocatorModelBridge::triggerResult( const QModelIndex &index )`
	`41`	`+{`
	`42`	`+ mLocator->clearPreviousResults();`
	`43`	`+ QgsLocatorResult result = mProxyModel->data( index, QgsLocatorModel::ResultDataRole ).value< QgsLocatorResult >();`
	`44`	`+ result.filter->triggerResult( result );`
	`45`	`+}`
	`46`	`+`
`40`	`47`	`void QgsLocatorModelBridge::setIsRunning( bool isRunning )`
`41`	`48`	`{`
`42`	`49`	`if ( mIsRunning == isRunning )`
Original file line number	Diff line number	Diff line change
`@@ -312,11 +312,9 @@ void QgsLocatorWidget::acceptCurrentEntry()`
`312`	`312`	`if ( !index.isValid() )`
`313`	`313`	`return;`
`314`	`314`
`315`		`- QgsLocatorResult result = mModelBridge->proxyModel()->data( index, QgsLocatorModel::ResultDataRole ).value< QgsLocatorResult >();`
`316`	`315`	`mResultsContainer->hide();`
`317`	`316`	`mLineEdit->clearFocus();`
`318`		`- mModelBridge->locator()->clearPreviousResults();`
`319`		`- result.filter->triggerResult( result );`
	`317`	`+ mModelBridge->triggerResult( index );`
`320`	`318`	`}`
`321`	`319`	`}`
`322`	`320`