Avoid warnings

qgis · Dec 10, 2015 · f93fce739005ccc5d031a8970448563f7e5c18c9 · f93fce7
1 parent c6c076b
commit f93fce739005ccc5d031a8970448563f7e5c18c9
Showing with 10 additions and 3 deletions.

+2 −0 src/core/symbology-ng/qgssymbollayerv2registry.cpp

+4 −1 src/providers/oracle/CMakeLists.txt

+4 −2 src/providers/oracle/qgsoraclefeatureiterator.cpp
diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.cpp b/src/core/symbology-ng/qgssymbollayerv2registry.cpp
@@ -108,6 +108,8 @@ QgsSymbolLayerV2* QgsSymbolLayerV2Registry::defaultSymbolLayer( QgsSymbolV2::Sym
     case QgsSymbolV2::Hybrid:
       return 0;
   }
+
+  return 0;
 }
 
 

diff --git a/src/providers/oracle/CMakeLists.txt b/src/providers/oracle/CMakeLists.txt
@@ -26,6 +26,9 @@ SET(ORACLE_MOC_HDRS
   qgsoracletablemodel.h
   qgsoraclecolumntypethread.h
   qgsoracleconnpool.h
+)
+
+SET(ORACLE_HDRS
   qgsoracleexpressioncompiler.h
 )
 
@@ -51,7 +54,7 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QSCINTILLA_INCLUDE_DIR}
 )
 
-ADD_LIBRARY (oracleprovider MODULE ${ORACLE_SRCS} ${ORACLE_MOC_SRCS})
+ADD_LIBRARY (oracleprovider MODULE ${ORACLE_SRCS} ${ORACLE_HDRS} ${ORACLE_MOC_SRCS})
 
 TARGET_LINK_LIBRARIES (oracleprovider
   qgis_core

diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -180,7 +180,9 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
       unsigned char *copy = new unsigned char[ba->size()];
       memcpy( copy, ba->constData(), ba->size() );
 
-      feature.setGeometryAndOwnership( copy, ba->size() );
+      QgsGeometry *g = new QgsGeometry();
+      g->fromWkb( copy, ba->size() );
+      feature.setGeometry( g );
 
       if (( mRequest.flags() & QgsFeatureRequest::ExactIntersect ) != 0 && ( !mConnection->hasSpatial() || !mSource->mHasSpatialIndex ) &&
           mRequest.filterType() == QgsFeatureRequest::FilterRect &&
@@ -194,7 +196,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
 
       if (( mRequest.flags() & QgsFeatureRequest::NoGeometry ) != 0 )
       {
-        feature.setGeometryAndOwnership( 0, 0 );
+        feature.setGeometry( 0 );
       }
     }