diff options
Diffstat (limited to 'odb')
97 files changed, 65 insertions, 109 deletions
diff --git a/odb/qt.options b/odb/qt.options index 4263b85..1e31135 100644 --- a/odb/qt.options +++ b/odb/qt.options @@ -1,5 +1,4 @@ # file : odb/qt.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/basic diff --git a/odb/qt/Makefile.am b/odb/qt/Makefile.am index e33dba8..7edbe1d 100644 --- a/odb/qt/Makefile.am +++ b/odb/qt/Makefile.am @@ -1,5 +1,4 @@ # file : odb/qt/Makefile.am -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file lib_LTLIBRARIES = libodb-qt.la diff --git a/odb/qt/basic.options b/odb/qt/basic.options index 3ec810a..306d949 100644 --- a/odb/qt/basic.options +++ b/odb/qt/basic.options @@ -1,5 +1,4 @@ # file : odb/qt/basic.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/basic/basic diff --git a/odb/qt/basic/basic-common.options b/odb/qt/basic/basic-common.options index 612c680..f704314 100644 --- a/odb/qt/basic/basic-common.options +++ b/odb/qt/basic/basic-common.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-common.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-mssql.options b/odb/qt/basic/basic-mssql.options index 24018bc..2234df5 100644 --- a/odb/qt/basic/basic-mssql.options +++ b/odb/qt/basic/basic-mssql.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-mssql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-mysql.options b/odb/qt/basic/basic-mysql.options index 083bad7..d049f4e 100644 --- a/odb/qt/basic/basic-mysql.options +++ b/odb/qt/basic/basic-mysql.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-mysql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-oracle.options b/odb/qt/basic/basic-oracle.options index 27df415..60ef9d0 100644 --- a/odb/qt/basic/basic-oracle.options +++ b/odb/qt/basic/basic-oracle.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-oracle.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-pgsql.options b/odb/qt/basic/basic-pgsql.options index 1480f5b..6f0dc6e 100644 --- a/odb/qt/basic/basic-pgsql.options +++ b/odb/qt/basic/basic-pgsql.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-pgsql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-sqlite.options b/odb/qt/basic/basic-sqlite.options index 5c0aba2..c64e37c 100644 --- a/odb/qt/basic/basic-sqlite.options +++ b/odb/qt/basic/basic-sqlite.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-sqlite.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/mssql/default-mapping.hxx b/odb/qt/basic/mssql/default-mapping.hxx index a22b0f8..19fd43b 100644 --- a/odb/qt/basic/mssql/default-mapping.hxx +++ b/odb/qt/basic/mssql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/mssql/qbyte-array-traits.hxx b/odb/qt/basic/mssql/qbyte-array-traits.hxx index 3452c52..8047691 100644 --- a/odb/qt/basic/mssql/qbyte-array-traits.hxx +++ b/odb/qt/basic/mssql/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/mssql/qstring-traits.hxx b/odb/qt/basic/mssql/qstring-traits.hxx index f89d5fd..779120e 100644 --- a/odb/qt/basic/mssql/qstring-traits.hxx +++ b/odb/qt/basic/mssql/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/mssql/quuid-traits.hxx b/odb/qt/basic/mssql/quuid-traits.hxx index 5f10982..d65b80f 100644 --- a/odb/qt/basic/mssql/quuid-traits.hxx +++ b/odb/qt/basic/mssql/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_UUID_TRAITS_HXX diff --git a/odb/qt/basic/mysql/default-mapping.hxx b/odb/qt/basic/mysql/default-mapping.hxx index 00b4e4e..996895f 100644 --- a/odb/qt/basic/mysql/default-mapping.hxx +++ b/odb/qt/basic/mysql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/mysql/qbyte-array-traits.hxx b/odb/qt/basic/mysql/qbyte-array-traits.hxx index 4ecad02..bfcfc69 100644 --- a/odb/qt/basic/mysql/qbyte-array-traits.hxx +++ b/odb/qt/basic/mysql/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/mysql/qstring-traits.hxx b/odb/qt/basic/mysql/qstring-traits.hxx index e70be83..6a5f315 100644 --- a/odb/qt/basic/mysql/qstring-traits.hxx +++ b/odb/qt/basic/mysql/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/mysql/quuid-traits.hxx b/odb/qt/basic/mysql/quuid-traits.hxx index 3b0e09a..c672ee8 100644 --- a/odb/qt/basic/mysql/quuid-traits.hxx +++ b/odb/qt/basic/mysql/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_UUID_TRAITS_HXX diff --git a/odb/qt/basic/oracle/default-mapping.hxx b/odb/qt/basic/oracle/default-mapping.hxx index 275254c..8d72206 100644 --- a/odb/qt/basic/oracle/default-mapping.hxx +++ b/odb/qt/basic/oracle/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/oracle/qbyte-array-traits.hxx b/odb/qt/basic/oracle/qbyte-array-traits.hxx index 40c30ef..6979cc9 100644 --- a/odb/qt/basic/oracle/qbyte-array-traits.hxx +++ b/odb/qt/basic/oracle/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/oracle/qstring-traits.hxx b/odb/qt/basic/oracle/qstring-traits.hxx index d089a55..418d30e 100644 --- a/odb/qt/basic/oracle/qstring-traits.hxx +++ b/odb/qt/basic/oracle/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/oracle/quuid-traits.hxx b/odb/qt/basic/oracle/quuid-traits.hxx index eed9599..5f8041e 100644 --- a/odb/qt/basic/oracle/quuid-traits.hxx +++ b/odb/qt/basic/oracle/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_UUID_TRAITS_HXX diff --git a/odb/qt/basic/pgsql/default-mapping.hxx b/odb/qt/basic/pgsql/default-mapping.hxx index 1911b5b..13dbeb8 100644 --- a/odb/qt/basic/pgsql/default-mapping.hxx +++ b/odb/qt/basic/pgsql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/pgsql/qbyte-array-traits.hxx b/odb/qt/basic/pgsql/qbyte-array-traits.hxx index 8ebce30..3c3c496 100644 --- a/odb/qt/basic/pgsql/qbyte-array-traits.hxx +++ b/odb/qt/basic/pgsql/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/pgsql/qstring-traits.hxx b/odb/qt/basic/pgsql/qstring-traits.hxx index 01c862a..f1ab53c 100644 --- a/odb/qt/basic/pgsql/qstring-traits.hxx +++ b/odb/qt/basic/pgsql/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/pgsql/quuid-traits.hxx b/odb/qt/basic/pgsql/quuid-traits.hxx index 0a840bf..5999b7e 100644 --- a/odb/qt/basic/pgsql/quuid-traits.hxx +++ b/odb/qt/basic/pgsql/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_UUID_TRAITS_HXX diff --git a/odb/qt/basic/sqlite/default-mapping.hxx b/odb/qt/basic/sqlite/default-mapping.hxx index 259316b..7d14a6c 100644 --- a/odb/qt/basic/sqlite/default-mapping.hxx +++ b/odb/qt/basic/sqlite/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/sqlite/qbyte-array-traits.hxx b/odb/qt/basic/sqlite/qbyte-array-traits.hxx index 39c66cd..8a26bb1 100644 --- a/odb/qt/basic/sqlite/qbyte-array-traits.hxx +++ b/odb/qt/basic/sqlite/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/sqlite/qstring-traits.hxx b/odb/qt/basic/sqlite/qstring-traits.hxx index 0762fc8..30a2136 100644 --- a/odb/qt/basic/sqlite/qstring-traits.hxx +++ b/odb/qt/basic/sqlite/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/sqlite/quuid-traits.hxx b/odb/qt/basic/sqlite/quuid-traits.hxx index f142e1b..20d4a94 100644 --- a/odb/qt/basic/sqlite/quuid-traits.hxx +++ b/odb/qt/basic/sqlite/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_UUID_TRAITS_HXX diff --git a/odb/qt/buildfile b/odb/qt/buildfile index f83f580..63e6c95 100644 --- a/odb/qt/buildfile +++ b/odb/qt/buildfile @@ -1,5 +1,4 @@ # file : odb/qt/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file ../ diff --git a/odb/qt/containers.options b/odb/qt/containers.options index c8f8464..337b064 100644 --- a/odb/qt/containers.options +++ b/odb/qt/containers.options @@ -1,5 +1,4 @@ # file : odb/qt/containers.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # licences : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/containers/list-iterator.hxx b/odb/qt/containers/list-iterator.hxx index 3414e69..67f56fd 100644 --- a/odb/qt/containers/list-iterator.hxx +++ b/odb/qt/containers/list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_LIST_ITERATOR_HXX diff --git a/odb/qt/containers/list-traits.hxx b/odb/qt/containers/list-traits.hxx index 11f5260..5a3ee38 100644 --- a/odb/qt/containers/list-traits.hxx +++ b/odb/qt/containers/list-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_LIST_TRAITS_HXX diff --git a/odb/qt/containers/list-traits.txx b/odb/qt/containers/list-traits.txx index 12dd58c..105fc2a 100644 --- a/odb/qt/containers/list-traits.txx +++ b/odb/qt/containers/list-traits.txx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list-traits.txx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file namespace odb diff --git a/odb/qt/containers/list.hxx b/odb/qt/containers/list.hxx index 5dd85ec..143deed 100644 --- a/odb/qt/containers/list.hxx +++ b/odb/qt/containers/list.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_LIST_HXX @@ -47,8 +46,14 @@ public: #endif #ifdef ODB_CXX11 - QOdbList(QOdbList &&x): vector_base (std::move (x)), l_ (std::move (x.l_)) {} + QOdbList(QOdbList &&x) noexcept + : vector_base (std::move (x)), l_ (std::move (x.l_)) {} + + // Note: noexcept is not specified since it can throw while reallocating + // impl_. + // QOdbList &operator=(QOdbList &&other); + #if defined(ODB_CXX11_INITIALIZER_LIST) && \ defined(Q_COMPILER_INITIALIZER_LISTS) QOdbList(std::initializer_list<T> il): l_ (il) {} diff --git a/odb/qt/containers/list.ixx b/odb/qt/containers/list.ixx index f211d64..d9d37b6 100644 --- a/odb/qt/containers/list.ixx +++ b/odb/qt/containers/list.ixx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list.ixx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file // diff --git a/odb/qt/containers/mutable-list-iterator.hxx b/odb/qt/containers/mutable-list-iterator.hxx index bd6f17e..271633a 100644 --- a/odb/qt/containers/mutable-list-iterator.hxx +++ b/odb/qt/containers/mutable-list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/mutable-list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_MUTABLE_LIST_ITERATOR_HXX diff --git a/odb/qt/containers/qhash-traits.hxx b/odb/qt/containers/qhash-traits.hxx index c82c8d0..9f42d37 100644 --- a/odb/qt/containers/qhash-traits.hxx +++ b/odb/qt/containers/qhash-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qhash-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QHASH_TRAITS_HXX diff --git a/odb/qt/containers/qlinked-list-traits.hxx b/odb/qt/containers/qlinked-list-traits.hxx index 64e950f..3bfc9e9 100644 --- a/odb/qt/containers/qlinked-list-traits.hxx +++ b/odb/qt/containers/qlinked-list-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qlinked-list-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QLINKED_LIST_TRAITS_HXX @@ -7,6 +6,13 @@ #include <odb/pre.hxx> +#include <QtCore/QtGlobal> // QT_VERSION + +// QLinkedList is deprecated since Qt5 5.15 and in Qt6 it has been moved to a +// separate library. +// +#if (QT_VERSION < 0x050F00) || ODB_QT_FORCE_QLINKEDLIST + #include <QtCore/QLinkedList> #include <odb/container-traits.hxx> @@ -69,6 +75,8 @@ namespace odb }; } +#endif + #include <odb/post.hxx> #endif // ODB_QT_CONTAINER_QLINKED_LIST_TRAITS_HXX diff --git a/odb/qt/containers/qlist-traits.hxx b/odb/qt/containers/qlist-traits.hxx index 54e1b68..572d02a 100644 --- a/odb/qt/containers/qlist-traits.hxx +++ b/odb/qt/containers/qlist-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qlist-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QLIST_TRAITS_HXX diff --git a/odb/qt/containers/qmap-traits.hxx b/odb/qt/containers/qmap-traits.hxx index 87d950f..5f13b29 100644 --- a/odb/qt/containers/qmap-traits.hxx +++ b/odb/qt/containers/qmap-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qmap-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QMAP_TRAITS_HXX diff --git a/odb/qt/containers/qset-traits.hxx b/odb/qt/containers/qset-traits.hxx index 3b7f031..fbea8b7 100644 --- a/odb/qt/containers/qset-traits.hxx +++ b/odb/qt/containers/qset-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qset-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QSET_TRAITS_HXX diff --git a/odb/qt/containers/qvector-traits.hxx b/odb/qt/containers/qvector-traits.hxx index c483b0c..516475d 100644 --- a/odb/qt/containers/qvector-traits.hxx +++ b/odb/qt/containers/qvector-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qvector-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QVECTOR_TRAITS_HXX @@ -7,6 +6,14 @@ #include <odb/pre.hxx> +#include <QtCore/QtGlobal> // QT_VERSION + +// In Qt 6 QVector is an alias for QList. +// +#if QT_VERSION >= 0x060000 +#include <odb/qt/containers/qlist-traits.hxx> +#else + #include <QtCore/QVector> #include <odb/container-traits.hxx> @@ -68,6 +75,8 @@ namespace odb }; } +#endif + #include <odb/post.hxx> #endif // ODB_QT_CONTAINER_QVECTOR_TRAITS_HXX diff --git a/odb/qt/date-time.options b/odb/qt/date-time.options index cecd5c8..d199649 100644 --- a/odb/qt/date-time.options +++ b/odb/qt/date-time.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/date-time/date-time diff --git a/odb/qt/date-time/date-time-common.options b/odb/qt/date-time/date-time-common.options index 5bffbfd..d813259 100644 --- a/odb/qt/date-time/date-time-common.options +++ b/odb/qt/date-time/date-time-common.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-common.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-mssql.options b/odb/qt/date-time/date-time-mssql.options index 4fb0371..7e35b4d 100644 --- a/odb/qt/date-time/date-time-mssql.options +++ b/odb/qt/date-time/date-time-mssql.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-mssql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-mysql.options b/odb/qt/date-time/date-time-mysql.options index 7d800d3..fdbb364 100644 --- a/odb/qt/date-time/date-time-mysql.options +++ b/odb/qt/date-time/date-time-mysql.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-mysql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-oracle.options b/odb/qt/date-time/date-time-oracle.options index aa2cfe2..c339ce3 100644 --- a/odb/qt/date-time/date-time-oracle.options +++ b/odb/qt/date-time/date-time-oracle.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-oracle.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-pgsql.options b/odb/qt/date-time/date-time-pgsql.options index 2f73492..9d80d48 100644 --- a/odb/qt/date-time/date-time-pgsql.options +++ b/odb/qt/date-time/date-time-pgsql.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-pgsql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-sqlite.options b/odb/qt/date-time/date-time-sqlite.options index 2cde697..8eb1110 100644 --- a/odb/qt/date-time/date-time-sqlite.options +++ b/odb/qt/date-time/date-time-sqlite.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-sqlite.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/exceptions.cxx b/odb/qt/date-time/exceptions.cxx index 68d4856..48f0540 100644 --- a/odb/qt/date-time/exceptions.cxx +++ b/odb/qt/date-time/exceptions.cxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/exceptions.cxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #include <odb/qt/date-time/exceptions.hxx> diff --git a/odb/qt/date-time/exceptions.hxx b/odb/qt/date-time/exceptions.hxx index 1bfcb98..7a73be2 100644 --- a/odb/qt/date-time/exceptions.hxx +++ b/odb/qt/date-time/exceptions.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/exceptions.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_EXCEPTIONS_HXX diff --git a/odb/qt/date-time/mssql/default-mapping.hxx b/odb/qt/date-time/mssql/default-mapping.hxx index 263c64d..a8acb6b 100644 --- a/odb/qt/date-time/mssql/default-mapping.hxx +++ b/odb/qt/date-time/mssql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/mssql/qdate-time-traits.hxx b/odb/qt/date-time/mssql/qdate-time-traits.hxx index 296d054..5fd8a98 100644 --- a/odb/qt/date-time/mssql/qdate-time-traits.hxx +++ b/odb/qt/date-time/mssql/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/qdate-time-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/mssql/qdate-traits.hxx b/odb/qt/date-time/mssql/qdate-traits.hxx index 960330a..caa5d3c 100644 --- a/odb/qt/date-time/mssql/qdate-traits.hxx +++ b/odb/qt/date-time/mssql/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/mssql/qtime-traits.hxx b/odb/qt/date-time/mssql/qtime-traits.hxx index 76c363d..88fbf41 100644 --- a/odb/qt/date-time/mssql/qtime-traits.hxx +++ b/odb/qt/date-time/mssql/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/mysql/default-mapping.hxx b/odb/qt/date-time/mysql/default-mapping.hxx index 20f0dd3..a88c507 100644 --- a/odb/qt/date-time/mysql/default-mapping.hxx +++ b/odb/qt/date-time/mysql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/mysql/qdate-time-traits.hxx b/odb/qt/date-time/mysql/qdate-time-traits.hxx index ecd1aa6..92279eb 100644 --- a/odb/qt/date-time/mysql/qdate-time-traits.hxx +++ b/odb/qt/date-time/mysql/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/qdate-time-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/mysql/qdate-traits.hxx b/odb/qt/date-time/mysql/qdate-traits.hxx index 2078c49..12a00ec 100644 --- a/odb/qt/date-time/mysql/qdate-traits.hxx +++ b/odb/qt/date-time/mysql/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/mysql/qtime-traits.hxx b/odb/qt/date-time/mysql/qtime-traits.hxx index b35139c..c96e13f 100644 --- a/odb/qt/date-time/mysql/qtime-traits.hxx +++ b/odb/qt/date-time/mysql/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/oracle/default-mapping.hxx b/odb/qt/date-time/oracle/default-mapping.hxx index 196553d..32a733a 100644 --- a/odb/qt/date-time/oracle/default-mapping.hxx +++ b/odb/qt/date-time/oracle/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/oracle/qdate-time-traits.hxx b/odb/qt/date-time/oracle/qdate-time-traits.hxx index 2c2bfe4..ba90075 100644 --- a/odb/qt/date-time/oracle/qdate-time-traits.hxx +++ b/odb/qt/date-time/oracle/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/qdate-time-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/oracle/qdate-traits.hxx b/odb/qt/date-time/oracle/qdate-traits.hxx index 101e18a..f293e2d 100644 --- a/odb/qt/date-time/oracle/qdate-traits.hxx +++ b/odb/qt/date-time/oracle/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/oracle/qtime-traits.hxx b/odb/qt/date-time/oracle/qtime-traits.hxx index 7f1b175..0d9aff4 100644 --- a/odb/qt/date-time/oracle/qtime-traits.hxx +++ b/odb/qt/date-time/oracle/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/pgsql/default-mapping.hxx b/odb/qt/date-time/pgsql/default-mapping.hxx index 1d83a07..cd3b1b5 100644 --- a/odb/qt/date-time/pgsql/default-mapping.hxx +++ b/odb/qt/date-time/pgsql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/pgsql/qdate-time-traits.hxx b/odb/qt/date-time/pgsql/qdate-time-traits.hxx index 4e91456..a9fe757 100644 --- a/odb/qt/date-time/pgsql/qdate-time-traits.hxx +++ b/odb/qt/date-time/pgsql/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/qdatetime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/pgsql/qdate-traits.hxx b/odb/qt/date-time/pgsql/qdate-traits.hxx index d21323c..b7cc7d4 100644 --- a/odb/qt/date-time/pgsql/qdate-traits.hxx +++ b/odb/qt/date-time/pgsql/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/pgsql/qtime-traits.hxx b/odb/qt/date-time/pgsql/qtime-traits.hxx index 4f48f32..86a594b 100644 --- a/odb/qt/date-time/pgsql/qtime-traits.hxx +++ b/odb/qt/date-time/pgsql/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/sqlite/default-mapping.hxx b/odb/qt/date-time/sqlite/default-mapping.hxx index 03e146c..a150ca9 100644 --- a/odb/qt/date-time/sqlite/default-mapping.hxx +++ b/odb/qt/date-time/sqlite/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/sqlite/qdate-time-traits.hxx b/odb/qt/date-time/sqlite/qdate-time-traits.hxx index 2c08b29..db561fc 100644 --- a/odb/qt/date-time/sqlite/qdate-time-traits.hxx +++ b/odb/qt/date-time/sqlite/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/qdatetime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_QDATETIME_TRAITS_HXX @@ -11,6 +10,8 @@ #include <cstddef> // std::size_t #include <cstring> // std::memcpy +#include <QtCore/QtGlobal> // QT_VERSION + #include <QtCore/QDateTime> #include <odb/details/buffer.hxx> @@ -91,7 +92,14 @@ namespace odb else { v.setTimeSpec (Qt::UTC); - v.setTime_t (static_cast <uint> (i)); + + // *Time_t() functions are deprecated in favor of *SecsSinceEpoch(). + // +#if QT_VERSION < 0x060000 + v.setTime_t (static_cast<uint> (i)); +#else + v.setSecsSinceEpoch (static_cast<qint64> (i)); +#endif } } @@ -107,7 +115,12 @@ namespace odb else { is_null = false; + +#if QT_VERSION < 0x060000 i = static_cast<long long> (v.toTime_t ()); +#else + i = static_cast<long long> (v.toSecsSinceEpoch ()); +#endif } } }; diff --git a/odb/qt/date-time/sqlite/qdate-traits.hxx b/odb/qt/date-time/sqlite/qdate-traits.hxx index 825ce1b..52721b7 100644 --- a/odb/qt/date-time/sqlite/qdate-traits.hxx +++ b/odb/qt/date-time/sqlite/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_QDATE_TRAITS_HXX @@ -11,7 +10,10 @@ #include <cstddef> // std::size_t #include <cstring> // std::memcpy +#include <QtCore/QtGlobal> // QT_VERSION + #include <QtCore/QDate> +#include <QtCore/QDateTime> #include <odb/details/buffer.hxx> #include <odb/sqlite/traits.hxx> @@ -93,8 +95,14 @@ namespace odb { QDateTime dt; dt.setTimeSpec (Qt::UTC); - dt.setTime_t (static_cast<uint> (i)); + // *Time_t() functions are deprecated in favor of *SecsSinceEpoch(). + // +#if QT_VERSION < 0x060000 + dt.setTime_t (static_cast<uint> (i)); +#else + dt.setSecsSinceEpoch (static_cast<qint64> (i)); +#endif v = dt.date (); } } @@ -109,8 +117,13 @@ namespace odb else { is_null = false; - i = static_cast<long long> ( - QDateTime (v, QTime (0, 0, 0), Qt::UTC).toTime_t ()); + const QDateTime dt (v, QTime (0, 0, 0), Qt::UTC); + +#if QT_VERSION < 0x060000 + i = static_cast<long long> (dt.toTime_t ()); +#else + i = static_cast<long long> (dt.toSecsSinceEpoch ()); +#endif } } }; diff --git a/odb/qt/date-time/sqlite/qtime-traits.hxx b/odb/qt/date-time/sqlite/qtime-traits.hxx index 8b57abd..dd86399 100644 --- a/odb/qt/date-time/sqlite/qtime-traits.hxx +++ b/odb/qt/date-time/sqlite/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_QTIME_TRAITS_HXX diff --git a/odb/qt/details/build2/config-stub.h b/odb/qt/details/build2/config-stub.h index 7d724a4..fbb2971 100644 --- a/odb/qt/details/build2/config-stub.h +++ b/odb/qt/details/build2/config-stub.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config-stub.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/build2/config-vc-stub.h b/odb/qt/details/build2/config-vc-stub.h index c4051f8..e6a412d 100644 --- a/odb/qt/details/build2/config-vc-stub.h +++ b/odb/qt/details/build2/config-vc-stub.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config-vc-stub.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/build2/config-vc.h b/odb/qt/details/build2/config-vc.h index 43f7d6a..36113ce 100644 --- a/odb/qt/details/build2/config-vc.h +++ b/odb/qt/details/build2/config-vc.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config-vc.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/build2/config.h b/odb/qt/details/build2/config.h index a864e08..12d168f 100644 --- a/odb/qt/details/build2/config.h +++ b/odb/qt/details/build2/config.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/config-vc.h b/odb/qt/details/config-vc.h index db08247..6718a07 100644 --- a/odb/qt/details/config-vc.h +++ b/odb/qt/details/config-vc.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/config-vc.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/config.h.in b/odb/qt/details/config.h.in index 2250691..a0c3989 100644 --- a/odb/qt/details/config.h.in +++ b/odb/qt/details/config.h.in @@ -1,5 +1,4 @@ /* file : odb/qt/details/config.h.in - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/config.hxx b/odb/qt/details/config.hxx index 08030bd..9077380 100644 --- a/odb/qt/details/config.hxx +++ b/odb/qt/details/config.hxx @@ -1,5 +1,4 @@ // file : odb/qt/details/config.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DETAILS_CONFIG_HXX diff --git a/odb/qt/details/export.hxx b/odb/qt/details/export.hxx index 9b93df5..4c0097f 100644 --- a/odb/qt/details/export.hxx +++ b/odb/qt/details/export.hxx @@ -1,5 +1,4 @@ // file : odb/qt/details/export.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DETAILS_EXPORT_HXX diff --git a/odb/qt/exception.hxx b/odb/qt/exception.hxx index a5ed1bb..44646d5 100644 --- a/odb/qt/exception.hxx +++ b/odb/qt/exception.hxx @@ -1,5 +1,4 @@ // file : odb/qt/exception.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_EXCEPTION_HXX diff --git a/odb/qt/lazy-ptr.hxx b/odb/qt/lazy-ptr.hxx index 1d5090d..6e5a3e0 100644 --- a/odb/qt/lazy-ptr.hxx +++ b/odb/qt/lazy-ptr.hxx @@ -1,5 +1,4 @@ // file : odb/qt/lazy-ptr.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_LAZY_PTR_HXX diff --git a/odb/qt/list-iterator.hxx b/odb/qt/list-iterator.hxx index d6f5ffb..bb8b20c 100644 --- a/odb/qt/list-iterator.hxx +++ b/odb/qt/list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_LIST_ITERATOR_HXX diff --git a/odb/qt/list.hxx b/odb/qt/list.hxx index b833677..7918ef6 100644 --- a/odb/qt/list.hxx +++ b/odb/qt/list.hxx @@ -1,5 +1,4 @@ // file : odb/qt/list.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_LIST_HXX diff --git a/odb/qt/makefile b/odb/qt/makefile index 64b06cd..0c46805 100644 --- a/odb/qt/makefile +++ b/odb/qt/makefile @@ -1,5 +1,4 @@ # file : odb/qt/makefile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make diff --git a/odb/qt/mutable-list-iterator.hxx b/odb/qt/mutable-list-iterator.hxx index a511aa9..045ae99 100644 --- a/odb/qt/mutable-list-iterator.hxx +++ b/odb/qt/mutable-list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/mutable-list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_MUTABLE_LIST_ITERATOR_HXX diff --git a/odb/qt/smart-ptr.options b/odb/qt/smart-ptr.options index 7ce10f3..b95b39b 100644 --- a/odb/qt/smart-ptr.options +++ b/odb/qt/smart-ptr.options @@ -1,5 +1,4 @@ # file : odb/qt/smart-ptr.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/smart-ptr/lazy-pointer-traits.hxx b/odb/qt/smart-ptr/lazy-pointer-traits.hxx index 545f008..6c7aa38 100644 --- a/odb/qt/smart-ptr/lazy-pointer-traits.hxx +++ b/odb/qt/smart-ptr/lazy-pointer-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-pointer-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_LAZY_POINTER_TRAITS_HXX diff --git a/odb/qt/smart-ptr/lazy-ptr.hxx b/odb/qt/smart-ptr/lazy-ptr.hxx index 9326998..865e355 100644 --- a/odb/qt/smart-ptr/lazy-ptr.hxx +++ b/odb/qt/smart-ptr/lazy-ptr.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-ptr.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_LAZY_PTR_HXX diff --git a/odb/qt/smart-ptr/lazy-ptr.ixx b/odb/qt/smart-ptr/lazy-ptr.ixx index 8757872..b9e6de8 100644 --- a/odb/qt/smart-ptr/lazy-ptr.ixx +++ b/odb/qt/smart-ptr/lazy-ptr.ixx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-ptr.ixx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file // diff --git a/odb/qt/smart-ptr/lazy-ptr.txx b/odb/qt/smart-ptr/lazy-ptr.txx index e842942..0ae038a 100644 --- a/odb/qt/smart-ptr/lazy-ptr.txx +++ b/odb/qt/smart-ptr/lazy-ptr.txx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-ptr.txx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file template <class T> diff --git a/odb/qt/smart-ptr/pointer-traits.hxx b/odb/qt/smart-ptr/pointer-traits.hxx index bb171c3..f5cbc39 100644 --- a/odb/qt/smart-ptr/pointer-traits.hxx +++ b/odb/qt/smart-ptr/pointer-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/pointer-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_POINTER_TRAITS_HXX diff --git a/odb/qt/smart-ptr/wrapper-traits.hxx b/odb/qt/smart-ptr/wrapper-traits.hxx index c08c5e1..dc6cb02 100644 --- a/odb/qt/smart-ptr/wrapper-traits.hxx +++ b/odb/qt/smart-ptr/wrapper-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/wrapper-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_WRAPPER_TRAITS_HXX diff --git a/odb/qt/version-build2-stub.hxx b/odb/qt/version-build2-stub.hxx index bf1e6e7..b00d1de 100644 --- a/odb/qt/version-build2-stub.hxx +++ b/odb/qt/version-build2-stub.hxx @@ -1,5 +1,4 @@ // file : odb/qt/version-build2-stub.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #include <odb/qt/version.hxx> diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 10791c8..51f1191 100644 --- a/odb/qt/version-build2.hxx.in +++ b/odb/qt/version-build2.hxx.in @@ -1,12 +1,11 @@ // file : odb/qt/version-build2.hxx.in -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_QT_VERSION // Note: using the version macro itself. // @@ TODO: need to derive automatically (it is also hardcoded in *.options). // -#define ODB_QT_VERSION 2046800 +#define ODB_QT_VERSION 2047600 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index 5e50a31..4f9510a 100644 --- a/odb/qt/version.hxx +++ b/odb/qt/version.hxx @@ -1,5 +1,4 @@ // file : odb/qt/version.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifdef LIBODB_QT_BUILD2 @@ -32,23 +31,23 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20468 +#if ODB_VERSION != 20476 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2046800 -#define ODB_QT_VERSION_STR "2.5.0-b.18" +#define ODB_QT_VERSION 2047600 +#define ODB_QT_VERSION_STR "2.5.0-b.26" // libodb-qt version: odb interface version plus the bugfix version. Note // that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION // since if the Qt interface virsion is incremented then the bugfix version // must be incremented as well. // -#define LIBODB_QT_VERSION 2049968 -#define LIBODB_QT_VERSION_STR "2.5.0-b.18" +#define LIBODB_QT_VERSION 2049976 +#define LIBODB_QT_VERSION_STR "2.5.0-b.26" #include <odb/post.hxx> diff --git a/odb/qt/version.options b/odb/qt/version.options index fc241af..0fef537 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -1,5 +1,4 @@ # file : odb/qt/version.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file # Include the config file first so that it can do its thing before we @@ -12,6 +11,6 @@ # --hxx-prologue '#include <odb/qt/version.hxx>' ---hxx-prologue '#if ODB_QT_VERSION != 2046800 // 2.5.0-b.18' +--hxx-prologue '#if ODB_QT_VERSION != 2047600 // 2.5.0-b.26' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' |