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/date-time/mysql/default-mapping.hxx    | 6 +++---
 odb/qt/date-time/mysql/qdate-time-traits.hxx  | 2 +-
 odb/qt/date-time/mysql/qdate-traits.hxx       | 2 +-
 odb/qt/date-time/mysql/qtime-traits.hxx       | 2 +-
 odb/qt/date-time/sqlite/default-mapping.hxx   | 6 +++---
 odb/qt/date-time/sqlite/qdate-time-traits.hxx | 2 +-
 odb/qt/date-time/sqlite/qdate-traits.hxx      | 2 +-
 odb/qt/date-time/sqlite/qtime-traits.hxx      | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'odb/qt/date-time')

diff --git a/odb/qt/date-time/mysql/default-mapping.hxx b/odb/qt/date-time/mysql/default-mapping.hxx
index fa0b823..250d668 100644
--- a/odb/qt/date-time/mysql/default-mapping.hxx
+++ b/odb/qt/date-time/mysql/default-mapping.hxx
@@ -6,9 +6,9 @@
 #ifndef ODB_QT_DATE_TIME_MYSQL_DEFAULT_MAPPING_HXX
 #define ODB_QT_DATE_TIME_MYSQL_DEFAULT_MAPPING_HXX
 
-#include <QDate>
-#include <QTime>
-#include <QDateTime>
+#include <QtCore/QDate>
+#include <QtCore/QTime>
+#include <QtCore/QDateTime>
 
 // Map QDate to MySQL DATE by default. QDate provides a null
 // representation so allow NULL values by default.
diff --git a/odb/qt/date-time/mysql/qdate-time-traits.hxx b/odb/qt/date-time/mysql/qdate-time-traits.hxx
index fcb2d79..db8840c 100644
--- a/odb/qt/date-time/mysql/qdate-time-traits.hxx
+++ b/odb/qt/date-time/mysql/qdate-time-traits.hxx
@@ -8,7 +8,7 @@
 
 #include <odb/pre.hxx>
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 #include <odb/mysql/traits.hxx>
 
diff --git a/odb/qt/date-time/mysql/qdate-traits.hxx b/odb/qt/date-time/mysql/qdate-traits.hxx
index 4f1c753..a1b3fac 100644
--- a/odb/qt/date-time/mysql/qdate-traits.hxx
+++ b/odb/qt/date-time/mysql/qdate-traits.hxx
@@ -8,7 +8,7 @@
 
 #include <odb/pre.hxx>
 
-#include <QDate>
+#include <QtCore/QDate>
 
 #include <odb/mysql/traits.hxx>
 #include <odb/qt/date-time/exceptions.hxx>
diff --git a/odb/qt/date-time/mysql/qtime-traits.hxx b/odb/qt/date-time/mysql/qtime-traits.hxx
index f984f1a..b90faef 100644
--- a/odb/qt/date-time/mysql/qtime-traits.hxx
+++ b/odb/qt/date-time/mysql/qtime-traits.hxx
@@ -8,7 +8,7 @@
 
 #include <odb/pre.hxx>
 
-#include <QTime>
+#include <QtCore/QTime>
 
 #include <odb/mysql/traits.hxx>
 
diff --git a/odb/qt/date-time/sqlite/default-mapping.hxx b/odb/qt/date-time/sqlite/default-mapping.hxx
index 82321af..e497e96 100644
--- a/odb/qt/date-time/sqlite/default-mapping.hxx
+++ b/odb/qt/date-time/sqlite/default-mapping.hxx
@@ -6,9 +6,9 @@
 #ifndef ODB_QT_DATE_TIME_SQLITE_DEFAULT_MAPPING_HXX
 #define ODB_QT_DATE_TIME_SQLITE_DEFAULT_MAPPING_HXX
 
-#include <QDate>
-#include <QTime>
-#include <QDateTime>
+#include <QtCore/QDate>
+#include <QtCore/QTime>
+#include <QtCore/QDateTime>
 
 // Map QDate to SQLite TEXT by default. QDate provides a null representation
 // so allow NULL values by default.
diff --git a/odb/qt/date-time/sqlite/qdate-time-traits.hxx b/odb/qt/date-time/sqlite/qdate-time-traits.hxx
index f36852f..7d34647 100644
--- a/odb/qt/date-time/sqlite/qdate-time-traits.hxx
+++ b/odb/qt/date-time/sqlite/qdate-time-traits.hxx
@@ -12,7 +12,7 @@
 #include <cstddef>  // std::size_t
 #include <cstring>  // std::memcpy
 
-#include <QDateTime>
+#include <QtCore/QDateTime>
 
 #include <odb/details/buffer.hxx>
 #include <odb/sqlite/traits.hxx>
diff --git a/odb/qt/date-time/sqlite/qdate-traits.hxx b/odb/qt/date-time/sqlite/qdate-traits.hxx
index 7d8215b..a1d7d6c 100644
--- a/odb/qt/date-time/sqlite/qdate-traits.hxx
+++ b/odb/qt/date-time/sqlite/qdate-traits.hxx
@@ -12,7 +12,7 @@
 #include <cstddef>  // std::size_t
 #include <cstring>  // std::memcpy
 
-#include <QDate>
+#include <QtCore/QDate>
 
 #include <odb/details/buffer.hxx>
 #include <odb/sqlite/traits.hxx>
diff --git a/odb/qt/date-time/sqlite/qtime-traits.hxx b/odb/qt/date-time/sqlite/qtime-traits.hxx
index d50332f..7c99831 100644
--- a/odb/qt/date-time/sqlite/qtime-traits.hxx
+++ b/odb/qt/date-time/sqlite/qtime-traits.hxx
@@ -12,7 +12,7 @@
 #include <cstddef>  // std::size_t
 #include <cstring>  // std::memcpy
 
-#include <QTime>
+#include <QtCore/QTime>
 
 #include <odb/details/buffer.hxx>
 #include <odb/sqlite/traits.hxx>
-- 
cgit v1.1