fix oracle provider build

qgis · Jun 5, 2017 · 05d9f92 · 05d9f92
1 parent 63083ab
commit 05d9f92
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -1046,12 +1046,12 @@ QVariant QgsOracleProvider::minimumValue( int index ) const
 }
 
 // Returns the list of unique values of an attribute
-void QgsOracleProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, int limit ) const
+QSet<QVariant> QgsOracleProvider::uniqueValues( int index, int limit ) const
 {
-  if ( !mConnection )
-    return;
+  QSet<QVariant> uniqueValues;
 
-  uniqueValues.clear();
+  if ( !mConnection )
+    return uniqueValues;
 
   try
   {
@@ -1081,17 +1081,20 @@ void QgsOracleProvider::uniqueValues( int index, QList<QVariant> &uniqueValues,
       QgsMessageLog::logMessage( tr( "Unable to execute the query.\nThe error message from the database was:\n%1.\nSQL: %2" )
                                  .arg( qry.lastError().text() )
                                  .arg( qry.lastQuery() ), tr( "Oracle" ) );
-      return;
+      return QSet<QVariant>();
     }
 
     while ( qry.next() )
     {
-      uniqueValues.append( qry.value( 0 ) );
+      uniqueValues << qry.value( 0 );
     }
   }
   catch ( OracleFieldNotFound )
   {
+    return QSet<QVariant>();
   }
+
+  return uniqueValues;
 }
 
 // Returns the maximum value of an attribute

diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h
@@ -128,7 +128,7 @@ class QgsOracleProvider : public QgsVectorDataProvider
 
     QVariant minimumValue( int index ) const override;
     QVariant maximumValue( int index ) const override;
-    virtual void uniqueValues( int index, QList<QVariant> &uniqueValues, int limit = -1 ) const override;
+    virtual QSet<QVariant> uniqueValues( int index, int limit = -1 ) const override;
     bool isValid() const override;
     QgsAttributeList pkAttributeIndexes() const override { return mPrimaryKeyAttrs; }
     QVariant defaultValue( QString fieldName, QString tableName = QString::null, QString schemaName = QString::null );