summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qdatetime.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2016-05-02 18:45:59 +0200
committerTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2016-05-03 15:20:24 +0000
commit597df79c27a2573d540e231bb7b88baf40e5e58e (patch)
treea8fec3f28fa6df84a00dce9c63520f3de36be9a6 /src/corelib/tools/qdatetime.h
parent5a76a3fb03f8d1dc8cb367de1a1dc6a37048376a (diff)
darwin: Simplify conversion function declarations in headers
We don't need to include Q_QDOC in the forward-declarations of the native types, and Q_FORWARD_DECLARE_OBJC_CLASS works in non-Objective-C mode as well, which means we can declare the Objective-C versions of the functions without guards. Change-Id: I32089c496b4f7ce47f0388ba3f65e0b091d1e9ee Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/tools/qdatetime.h')
-rw-r--r--src/corelib/tools/qdatetime.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index a9271ef177..f698ec3221 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -46,11 +46,9 @@
#include <limits>
-#if defined(Q_OS_MAC) || defined(Q_QDOC)
+#if defined(Q_OS_MAC)
Q_FORWARD_DECLARE_CF_TYPE(CFDate);
-# if defined(__OBJC__) || defined(Q_QDOC)
Q_FORWARD_DECLARE_OBJC_CLASS(NSDate);
-# endif
#endif
QT_BEGIN_NAMESPACE
@@ -316,10 +314,8 @@ public:
#if defined(Q_OS_MAC) || defined(Q_QDOC)
static QDateTime fromCFDate(CFDateRef date);
CFDateRef toCFDate() const Q_DECL_CF_RETURNS_RETAINED;
-# if defined(__OBJC__) || defined(Q_QDOC)
static QDateTime fromNSDate(const NSDate *date);
NSDate *toNSDate() const Q_DECL_NS_RETURNS_AUTORELEASED;
-# endif
#endif
private: