From eb58b6469f990c601d008801ff07e204ba2924ca Mon Sep 17 00:00:00 2001 From: Begasus Date: Mon, 19 Feb 2024 13:43:10 +0100 Subject: python3 changes Silence deprecated warnings diff --git a/CMakeLists.txt b/CMakeLists.txt index 940acba..c035b16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,10 @@ get_git_revision_and_branch() add_unfinished_features_option() add_pc_file(${PROJECT_NAME}) +if(HAIKU) + add_definitions(-Wno-deprecated-copy -Wno-deprecated-declarations) +endif() + add_subdirectory(src) add_subdirectory(tools) diff --git a/tools/sdc.py b/tools/sdc.py index 70f386e..0a69a94 100755 --- a/tools/sdc.py +++ b/tools/sdc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from __future__ import print_function, unicode_literals # -- 2.50.1 From 0503606d30d93436d37d43c9048c0aff34458281 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 29 Oct 2019 07:52:32 +0100 Subject: PgSQL driver: fix build with PostgreSQL 12+ diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp index ea576d6..0697129 100644 --- a/src/drivers/postgresql/PostgresqlTypes.cpp +++ b/src/drivers/postgresql/PostgresqlTypes.cpp @@ -36,6 +36,7 @@ #endif #include #include // needed for BOOLOID, etc. +#include // needed for PG_VERSION_NUM #ifdef _MSC_VER #pragma warning( pop ) @@ -70,8 +71,10 @@ void PostgresqlDriver::initPgsqlToKDbMap() //! @todo POLYGONOID geometric polygon '(pt1,...)' m_pgsqlToKDbTypes.insert(FLOAT4OID, KDbField::Double); m_pgsqlToKDbTypes.insert(FLOAT8OID, KDbField::Double); +#if PG_VERSION_NUM < 120000 m_pgsqlToKDbTypes.insert(ABSTIMEOID, KDbField::Date); m_pgsqlToKDbTypes.insert(RELTIMEOID, KDbField::Date); +#endif //! @todo TINTERVALOID (abstime,abstime), time interval //! @todo CIRCLEOID geometric circle '(center,radius)' //! @todo CASHOID monetary amounts, $d,ddd.cc -- 2.50.1 From 863f48c984338b14e11c8c8308c53e38fbe348a5 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 16 Nov 2020 16:41:27 +0100 Subject: Fix build with newer Qt diff --git a/src/KDb.cpp b/src/KDb.cpp index 5c3b601..ee92c2e 100644 --- a/src/KDb.cpp +++ b/src/KDb.cpp @@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type) for (int i = 0; i < size; i++) { const unsigned char val = array[i]; if (val < 32 || val >= 127 || val == 39 || val == 92) { - str[new_length++] = '\\'; - str[new_length++] = '\\'; - str[new_length++] = '0' + val / 64; - str[new_length++] = '0' + (val % 64) / 8; - str[new_length++] = '0' + val % 8; + str[new_length++] = QLatin1Char('\\'); + str[new_length++] = QLatin1Char('\\'); + str[new_length++] = QChar::fromLatin1('0' + val / 64); + str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8); + str[new_length++] = QChar::fromLatin1('0' + val % 8); } else { - str[new_length++] = val; + str[new_length++] = QChar::fromLatin1(val); } } } else { for (int i = 0; i < size; i++) { const unsigned char val = array[i]; - str[new_length++] = intToHexDigit(val / 16); - str[new_length++] = intToHexDigit(val % 16); + str[new_length++] = QChar::fromLatin1(intToHexDigit(val / 16)); + str[new_length++] = QChar::fromLatin1(intToHexDigit(val % 16)); } } if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) { - str[new_length++] = '\''; + str[new_length++] = QLatin1Char('\''); } else if (type == BLOBEscapingType::ByteaHex) { - str[new_length++] = '\''; - str[new_length++] = ':'; - str[new_length++] = ':'; - str[new_length++] = 'b'; - str[new_length++] = 'y'; - str[new_length++] = 't'; - str[new_length++] = 'e'; - str[new_length++] = 'a'; + str[new_length++] = QLatin1Char('\''); + str[new_length++] = QLatin1Char(':'); + str[new_length++] = QLatin1Char(':'); + str[new_length++] = QLatin1Char('b'); + str[new_length++] = QLatin1Char('y'); + str[new_length++] = QLatin1Char('t'); + str[new_length++] = QLatin1Char('e'); + str[new_length++] = QLatin1Char('a'); } return str; } -- 2.50.1 From b8d48282350b60c8482dfbeace4083d21260856d Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Sun, 13 Dec 2020 19:16:30 +0530 Subject: include KDEInstallDirs as first thing Otherwise ECMGeneratePriFile won't get correct paths and will install pri file in wrong place and things wanting to use kdb with qmake won't work. diff --git a/CMakeLists.txt b/CMakeLists.txt index c035b16..14f61ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,12 +11,12 @@ kdb_add_tests(OFF) kdb_add_examples(OFF) # ECM +include(KDEInstallDirs) include(ECMGeneratePriFile) include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(ECMPoQmTools) include(ECMSetupVersion) -include(KDEInstallDirs) include(KDECMakeSettings NO_POLICY_SCOPE) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -- 2.50.1 From 3a0b30ead00782edc9ceec41be43b070a7bd1140 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Sat, 6 Sep 2025 07:48:20 +0200 Subject: Fix build for cmake > 4 diff --git a/cmake/modules/SetKDbCMakePolicies.cmake b/cmake/modules/SetKDbCMakePolicies.cmake index bc28d8a..bd400c2 100644 --- a/cmake/modules/SetKDbCMakePolicies.cmake +++ b/cmake/modules/SetKDbCMakePolicies.cmake @@ -8,9 +8,6 @@ cmake_policy(SET CMP0048 NEW) # for PROJECT_VERSION cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's Qt5ModuleLocation.cmake # "Simplify variable reference and escape sequence evaluation" -if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property. - cmake_policy(SET CMP0059 OLD) -endif() if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3) cmake_policy(SET CMP0063 NEW) endif() -- 2.50.1