aboutsummaryrefslogtreecommitdiff
path: root/odb/qt/containers
diff options
context:
space:
mode:
Diffstat (limited to 'odb/qt/containers')
-rw-r--r--odb/qt/containers/list-iterator.hxx1
-rw-r--r--odb/qt/containers/list-traits.hxx1
-rw-r--r--odb/qt/containers/list-traits.txx1
-rw-r--r--odb/qt/containers/list.hxx9
-rw-r--r--odb/qt/containers/list.ixx1
-rw-r--r--odb/qt/containers/mutable-list-iterator.hxx1
-rw-r--r--odb/qt/containers/qhash-traits.hxx1
-rw-r--r--odb/qt/containers/qlinked-list-traits.hxx10
-rw-r--r--odb/qt/containers/qlist-traits.hxx1
-rw-r--r--odb/qt/containers/qmap-traits.hxx1
-rw-r--r--odb/qt/containers/qset-traits.hxx1
-rw-r--r--odb/qt/containers/qvector-traits.hxx11
12 files changed, 26 insertions, 13 deletions
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
generated by cgit v1.1 at 2024-04-27 23:11:45 +0000