Skip to content

Commit 48e8656

Browse files
committedNov 15, 2017
Code improvement
1 parent 4d20a39 commit 48e8656

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed
 

‎src/core/qgsspatialiteutils.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
int spatialite_database_unique_ptr::open( const QString &path )
2626
{
2727
#if defined(SPATIALITE_HAS_INIT_EX)
28-
get_deleter().mSpatialiteContext = spatialite_alloc_connection();
28+
auto &deleter = get_deleter();
29+
deleter.mSpatialiteContext = spatialite_alloc_connection();
2930
#else
3031
spatialite_init( 0 );
3132
#endif
@@ -36,7 +37,7 @@ int spatialite_database_unique_ptr::open( const QString &path )
3637

3738
#if defined(SPATIALITE_HAS_INIT_EX)
3839
if ( result == SQLITE_OK )
39-
spatialite_init_ex( database, get_deleter().mSpatialiteContext, 0 );
40+
spatialite_init_ex( database, deleter.mSpatialiteContext, 0 );
4041
#endif
4142

4243
return result;
@@ -45,7 +46,8 @@ int spatialite_database_unique_ptr::open( const QString &path )
4546
int spatialite_database_unique_ptr::open_v2( const QString &path, int flags, const char *zVfs )
4647
{
4748
#if defined(SPATIALITE_HAS_INIT_EX)
48-
get_deleter().mSpatialiteContext = spatialite_alloc_connection();
49+
auto &deleter = get_deleter();
50+
deleter.mSpatialiteContext = spatialite_alloc_connection();
4951
#else
5052
spatialite_init( 0 );
5153
#endif
@@ -56,7 +58,7 @@ int spatialite_database_unique_ptr::open_v2( const QString &path, int flags, con
5658

5759
#if defined(SPATIALITE_HAS_INIT_EX)
5860
if ( result == SQLITE_OK )
59-
spatialite_init_ex( database, get_deleter().mSpatialiteContext, 0 );
61+
spatialite_init_ex( database, deleter.mSpatialiteContext, 0 );
6062
#endif
6163

6264
return result;
@@ -80,7 +82,6 @@ sqlite3_statement_unique_ptr spatialite_database_unique_ptr::prepare( const QStr
8082

8183
void QgsSpatialiteCloser::operator()( sqlite3 *handle )
8284
{
83-
8485
#if defined(SPATIALITE_HAS_INIT_EX)
8586
spatialite_cleanup_ex( mSpatialiteContext );
8687
mSpatialiteContext = nullptr;

0 commit comments

Comments
 (0)
Please sign in to comment.