From 1a1bbd083875ad62f46a69ecce658937795ee045 Mon Sep 17 00:00:00 2001 From: eelke Date: Tue, 20 Oct 2026 19:30:10 +0200 Subject: [PATCH] Fix a few warnings --- pglab/BackupDialog.cpp | 2 +- pglablib/catalog/PgSequenceContainer.cpp | 2 +- tests/PgsqlTests/tst_Value.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pglab/BackupDialog.cpp b/pglab/BackupDialog.cpp index 30e5ee8..55a4404 100644 --- a/pglab/BackupDialog.cpp +++ b/pglab/BackupDialog.cpp @@ -439,7 +439,7 @@ void BackupDialog::on_btnStart_clicked() QSettings user_settings; // Default constructor is for UserScope QVariant var = user_settings.value("pg_tools_path", {}); QDir dir; - if (var.type() == QMetaType::QString) { + if (var.typeId() == QMetaType::QString) { dir.setPath(var.toString()); } if (!dir.exists() || !dir.exists("pg_dump.exe")) { diff --git a/pglablib/catalog/PgSequenceContainer.cpp b/pglablib/catalog/PgSequenceContainer.cpp index 5a31a6d..0d3604f 100644 --- a/pglablib/catalog/PgSequenceContainer.cpp +++ b/pglablib/catalog/PgSequenceContainer.cpp @@ -77,7 +77,7 @@ void PgSequenceContainer::loadAll(Pgsql::Connection &conn) q += ", start_value, increment_by, max_value, \n" " min_value, cache_value, is_cycled"; } - q += "\nFROM " + std::string(fqn.data(), static_cast(fqn.count())); + q += "\nFROM " + std::string(fqn.data(), static_cast(fqn.size())); auto && res = conn.query(q.c_str()); if (res.rows() == 1) { Pgsql::Row row(res, 0); diff --git a/tests/PgsqlTests/tst_Value.cpp b/tests/PgsqlTests/tst_Value.cpp index 6642b8e..14e690f 100644 --- a/tests/PgsqlTests/tst_Value.cpp +++ b/tests/PgsqlTests/tst_Value.cpp @@ -2,6 +2,7 @@ #include #include "Pgsql_Value.h" #include "PrintTo_Qt.h" +#include #include #include #include @@ -29,7 +30,7 @@ TEST(Pgsql_Value, test_QDateTime_2) Pgsql::Value v("2017-12-01 09:38:17.339817+02", timestamptz_oid); QDateTime dt = (QDateTime)v; QDateTime exp(QDate(2017, 12, 1), QTime(9, 38, 17, 340), - Qt::OffsetFromUTC, 2*3600); + QTimeZone::fromSecondsAheadOfUtc(2 * 3600)); ASSERT_EQ(dt, exp); }