allow to reset prefixes in settings

3nids · 3nids · commit 6459d24e5ad4 · 2018-05-10T16:11:27.000-04:00
diff --git a/python/core/locator/qgslocator.sip.in b/python/core/locator/qgslocator.sip.in
@@ -73,23 +73,13 @@ deregisterFilter() to deregister their filters upon plugin unload to avoid crash
 .. seealso:: :py:func:`registerFilter`
 %End
 
-    QList< QgsLocatorFilter *> filters( const QString &prefix = QString() );
+    QList< QgsLocatorFilter *> filters();
 %Docstring
 Returns the list of filters registered in the locator.
 
 .. seealso:: :py:func:`prefixedFilters`
 %End
 
-    QStringList prefixes();
-%Docstring
-Returns the list of prefixes in use.
-A prefix can have several filters
-
-.. seealso:: :py:func:`filter`
-
-.. versionadded:: 3.2
-%End
-
 
  QMap<QString, QgsLocatorFilter *> prefixedFilters() const;
 %Docstring
diff --git a/src/app/locator/qgslocatoroptionswidget.cpp b/src/app/locator/qgslocatoroptionswidget.cpp
@@ -178,9 +178,15 @@ bool QgsLocatorFiltersModel::setData( const QModelIndex &index, const QVariant &
         case Prefix:
         {
           QString prefix = value.toString();
-          if ( prefix.isEmpty() )
-            return false;
-          mPrefixes.insert( filterForIndex( index ), prefix );
+          if ( !prefix.isEmpty() )
+          {
+            mPrefixes.insert( filterForIndex( index ), prefix );
+          }
+          else
+          {
+            // reset to the native prefix
+            mPrefixes.insert( filterForIndex( index ), filterForIndex( index )->prefix() );
+          }
           emit dataChanged( index, index );
           return true;
         }
diff --git a/src/core/locator/qgslocator.cpp b/src/core/locator/qgslocator.cpp
@@ -48,17 +48,9 @@ void QgsLocator::deregisterFilter( QgsLocatorFilter *filter )
   delete filter;
 }
 
-QList<QgsLocatorFilter *> QgsLocator::filters( const QString &prefix )
+QList<QgsLocatorFilter *> QgsLocator::filters()
 {
-  if ( !prefix.isEmpty() )
-    return mPrefixedFilters.values( prefix );
-  else
-    return mFilters;
-}
-
-QStringList QgsLocator::prefixes()
-{
-  return mPrefixedFilters.keys();
+  return mFilters;
 }
 
 QMultiMap<QString, QgsLocatorFilter *> QgsLocator::prefixedFilters() const
diff --git a/src/core/locator/qgslocator.h b/src/core/locator/qgslocator.h
@@ -60,6 +60,7 @@ class CORE_EXPORT QgsLocator : public QObject
 
   public:
 
+    //! List of core filters (i.e. not plugin filters)
     static const QList<QString> CORE_FILTERS;
 
     /**
@@ -96,15 +97,7 @@ class CORE_EXPORT QgsLocator : public QObject
      * Returns the list of filters registered in the locator.
      * \see prefixedFilters()
      */
-    QList< QgsLocatorFilter *> filters( const QString &prefix = QString() );
-
-    /**
-     * Returns the list of prefixes in use.
-     * A prefix can have several filters
-     * \see filter()
-     * \since QGIS 3.2
-     */
-    QStringList prefixes();
+    QList< QgsLocatorFilter *> filters();
 
 #ifndef SIP_RUN
 

Original file line number	Diff line number	Diff line change
`@@ -48,17 +48,9 @@ void QgsLocator::deregisterFilter( QgsLocatorFilter *filter )`
`48`	`48`	`delete filter;`
`49`	`49`	`}`
`50`	`50`
`51`		`-QList<QgsLocatorFilter *> QgsLocator::filters( const QString &prefix )`
	`51`	`+QList<QgsLocatorFilter *> QgsLocator::filters()`
`52`	`52`	`{`
`53`		`- if ( !prefix.isEmpty() )`
`54`		`- return mPrefixedFilters.values( prefix );`
`55`		`- else`
`56`		`- return mFilters;`
`57`		`-}`
`58`		`-`
`59`		`-QStringList QgsLocator::prefixes()`
`60`		`-{`
`61`		`- return mPrefixedFilters.keys();`
	`53`	`+ return mFilters;`
`62`	`54`	`}`
`63`	`55`
`64`	`56`	`QMultiMap<QString, QgsLocatorFilter *> QgsLocator::prefixedFilters() const`