From f59bc255922730bcee7b594d04fea28b278cee7c Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Wed, 17 Jun 2009 17:36:46 +0200 Subject: make qglobal.h compile when inlcuded from c-files --- src/corelib/global/qglobal.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 6e9250f..14b6895 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -795,9 +795,6 @@ namespace QT_NAMESPACE {} # define Q_WS_WIN #endif -// forward declare std::exception -namespace std { class exception; } - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -2317,8 +2314,12 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #endif #if defined(Q_OS_SYMBIAN) - - +QT_END_NAMESPACE +// forward declare std::exception +#ifdef __cplusplus +namespace std { class exception; } +#endif +QT_BEGIN_NAMESPACE Q_CORE_EXPORT void qt_translateSymbianErrorToException(int error); Q_CORE_EXPORT void qt_translateExceptionToSymbianErrorL(const std::exception& ex); Q_CORE_EXPORT int qt_translateExceptionToSymbianError(const std::exception& ex); -- cgit v0.12