Skip to content

Commit 5a8c9bf

Browse files
committed
fix windows build
1 parent b6d9e0b commit 5a8c9bf

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

src/app/qgsdatumtransformtablewidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class APP_EXPORT QgsDatumTransformTableModel : public QAbstractTableModel
4444
};
4545

4646
QgsDatumTransformTableModel( QObject *parent = nullptr );
47+
~QgsDatumTransformTableModel() {}
4748

4849
void setTransformContext( const QgsCoordinateTransformContext &context );
4950

src/providers/ogr/qgsgeopackagedataitems.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,12 @@ bool QgsGeoPackageAbstractLayerItem::executeDeleteLayer( QString &errCause )
743743
return false;
744744
}
745745

746+
static int collect_strings( void *names, int argc, char **argv, char ** )
747+
{
748+
*static_cast<QList<QString>*>( names ) << QString::fromUtf8( argv[ 0 ] );
749+
return 0;
750+
}
751+
746752
QList<QString> QgsGeoPackageAbstractLayerItem::tableNames()
747753
{
748754
QList<QString> names;
@@ -758,15 +764,11 @@ QList<QString> QgsGeoPackageAbstractLayerItem::tableNames()
758764
{
759765
char *sql = sqlite3_mprintf( "SELECT table_name FROM gpkg_contents;" );
760766
status = sqlite3_exec(
761-
database.get(), /* An open database */
762-
sql, /* SQL to be evaluated */
763-
+[]( void *names, int, char **argv, char ** )
764-
{
765-
*static_cast<QList<QString>*>( names ) << QString( argv[ 0 ] );
766-
return 0;
767-
}, /* Callback function */
768-
&names, /* 1st argument to callback */
769-
&errmsg /* Error msg written here */
767+
database.get(), /* An open database */
768+
sql, /* SQL to be evaluated */
769+
collect_strings, /* Callback function */
770+
&names, /* 1st argument to callback */
771+
&errmsg /* Error msg written here */
770772
);
771773
sqlite3_free( sql );
772774
if ( status != SQLITE_OK )

src/ui/qgsrasterlayersaveasdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ datasets with maximum width and height specified below.</string>
646646
</widget>
647647
</item>
648648
<item>
649-
<spacer name="horizontalSpacer">
649+
<spacer name="horizontalSpacer1">
650650
<property name="orientation">
651651
<enum>Qt::Horizontal</enum>
652652
</property>

src/ui/qgsvectorlayersaveasdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@
407407
</widget>
408408
</item>
409409
<item>
410-
<layout class="QHBoxLayout" name="horizontalLayout">
410+
<layout class="QHBoxLayout" name="horizontalLayout1">
411411
<item>
412412
<widget class="QDialogButtonBox" name="mHelpButtonBox">
413413
<property name="orientation">

0 commit comments

Comments
 (0)