From e10e8aab78cd70edc606b475d7feca2f0845f780 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 27 Apr 2011 12:34:56 +0200
Subject: Use QtCore prefix when including Qt headers

This appears to be more portable. For example, on Mac OS X with
-framework QtCore option include <QString> does not work while
including <QtCore/QString> does.
---
 odb/qt/basic/mysql/default-mapping.hxx     | 4 ++--
 odb/qt/basic/mysql/qbyte-array-traits.hxx  | 2 +-
 odb/qt/basic/mysql/qstring-traits.hxx      | 2 +-
 odb/qt/basic/sqlite/default-mapping.hxx    | 4 ++--
 odb/qt/basic/sqlite/qbyte-array-traits.hxx | 2 +-
 odb/qt/basic/sqlite/qstring-traits.hxx     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'odb/qt/basic')

diff --git a/odb/qt/basic/mysql/default-mapping.hxx b/odb/qt/basic/mysql/default-mapping.hxx
index 8ffcafe..d111a08 100644
--- a/odb/qt/basic/mysql/default-mapping.hxx
+++ b/odb/qt/basic/mysql/default-mapping.hxx
@@ -6,8 +6,8 @@
 #ifndef ODB_QT_BASIC_MYSQL_DEFAULT_MAPPING_HXX
 #define ODB_QT_BASIC_MYSQL_DEFAULT_MAPPING_HXX
 
-#include <QString>
-#include <QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
 
 // By default, map QString to MySQL TEXT for non-id and to VARCHAR(256) for
 // id members. MySQL cannot have primary keys of the TEXT type.
diff --git a/odb/qt/basic/mysql/qbyte-array-traits.hxx b/odb/qt/basic/mysql/qbyte-array-traits.hxx
index 0c1a5b8..52e620c 100644
--- a/odb/qt/basic/mysql/qbyte-array-traits.hxx
+++ b/odb/qt/basic/mysql/qbyte-array-traits.hxx
@@ -11,7 +11,7 @@
 #include <cstring> // std::memcpy
 #include <cstddef> // std::size_t
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 #include <odb/details/buffer.hxx>
 #include <odb/mysql/traits.hxx>
diff --git a/odb/qt/basic/mysql/qstring-traits.hxx b/odb/qt/basic/mysql/qstring-traits.hxx
index 17f0946..922c4c3 100644
--- a/odb/qt/basic/mysql/qstring-traits.hxx
+++ b/odb/qt/basic/mysql/qstring-traits.hxx
@@ -11,7 +11,7 @@
 #include <cstring> // std::memcpy
 #include <cstddef> // std::size_t
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <odb/details/buffer.hxx>
 #include <odb/mysql/traits.hxx>
diff --git a/odb/qt/basic/sqlite/default-mapping.hxx b/odb/qt/basic/sqlite/default-mapping.hxx
index 7211700..cc04ddd 100644
--- a/odb/qt/basic/sqlite/default-mapping.hxx
+++ b/odb/qt/basic/sqlite/default-mapping.hxx
@@ -6,8 +6,8 @@
 #ifndef ODB_QT_BASIC_SQLITE_DEFAULT_MAPPING_HXX
 #define ODB_QT_BASIC_SQLITE_DEFAULT_MAPPING_HXX
 
-#include <QString>
-#include <QByteArray>
+#include <QtCore/QString>
+#include <QtCore/QByteArray>
 
 // Map QString to SQLite TEXT by default. Allow NULL values by default as
 // QString provides a null representation.
diff --git a/odb/qt/basic/sqlite/qbyte-array-traits.hxx b/odb/qt/basic/sqlite/qbyte-array-traits.hxx
index 0ab4835..0d1437e 100644
--- a/odb/qt/basic/sqlite/qbyte-array-traits.hxx
+++ b/odb/qt/basic/sqlite/qbyte-array-traits.hxx
@@ -11,7 +11,7 @@
 #include <cstring> // std::memcpy
 #include <cstddef> // std::size_t
 
-#include <QByteArray>
+#include <QtCore/QByteArray>
 
 #include <odb/details/buffer.hxx>
 #include <odb/sqlite/traits.hxx>
diff --git a/odb/qt/basic/sqlite/qstring-traits.hxx b/odb/qt/basic/sqlite/qstring-traits.hxx
index 53c4be4..5014aaf 100644
--- a/odb/qt/basic/sqlite/qstring-traits.hxx
+++ b/odb/qt/basic/sqlite/qstring-traits.hxx
@@ -11,7 +11,7 @@
 #include <cstring> // std::memcpy
 #include <cstddef> // std::size_t
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <odb/details/buffer.hxx>
 #include <odb/sqlite/traits.hxx>
-- 
cgit v1.1