Skip to content

Commit f93fce7

Browse files
committed
Avoid warnings
1 parent c6c076b commit f93fce7

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/core/symbology-ng/qgssymbollayerv2registry.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ QgsSymbolLayerV2* QgsSymbolLayerV2Registry::defaultSymbolLayer( QgsSymbolV2::Sym
108108
case QgsSymbolV2::Hybrid:
109109
return 0;
110110
}
111+
112+
return 0;
111113
}
112114

113115

src/providers/oracle/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ SET(ORACLE_MOC_HDRS
2626
qgsoracletablemodel.h
2727
qgsoraclecolumntypethread.h
2828
qgsoracleconnpool.h
29+
)
30+
31+
SET(ORACLE_HDRS
2932
qgsoracleexpressioncompiler.h
3033
)
3134

@@ -51,7 +54,7 @@ INCLUDE_DIRECTORIES(SYSTEM
5154
${QSCINTILLA_INCLUDE_DIR}
5255
)
5356

54-
ADD_LIBRARY (oracleprovider MODULE ${ORACLE_SRCS} ${ORACLE_MOC_SRCS})
57+
ADD_LIBRARY (oracleprovider MODULE ${ORACLE_SRCS} ${ORACLE_HDRS} ${ORACLE_MOC_SRCS})
5558

5659
TARGET_LINK_LIBRARIES (oracleprovider
5760
qgis_core

src/providers/oracle/qgsoraclefeatureiterator.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
180180
unsigned char *copy = new unsigned char[ba->size()];
181181
memcpy( copy, ba->constData(), ba->size() );
182182

183-
feature.setGeometryAndOwnership( copy, ba->size() );
183+
QgsGeometry *g = new QgsGeometry();
184+
g->fromWkb( copy, ba->size() );
185+
feature.setGeometry( g );
184186

185187
if (( mRequest.flags() & QgsFeatureRequest::ExactIntersect ) != 0 && ( !mConnection->hasSpatial() || !mSource->mHasSpatialIndex ) &&
186188
mRequest.filterType() == QgsFeatureRequest::FilterRect &&
@@ -194,7 +196,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
194196

195197
if (( mRequest.flags() & QgsFeatureRequest::NoGeometry ) != 0 )
196198
{
197-
feature.setGeometryAndOwnership( 0, 0 );
199+
feature.setGeometry( 0 );
198200
}
199201
}
200202

0 commit comments

Comments
 (0)