diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 15:36:46 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 15:58:41 (GMT) |
| commit | f59bc255922730bcee7b594d04fea28b278cee7c (patch) | |
| tree | 4f7fe6f6616b1e25536f00d28b45673c9dcad1ee | |
| parent | 87ac26f0c489911d9a43bab04aef03cadbe8bbe6 (diff) | |
| download | Qt-f59bc255922730bcee7b594d04fea28b278cee7c.zip Qt-f59bc255922730bcee7b594d04fea28b278cee7c.tar.gz Qt-f59bc255922730bcee7b594d04fea28b278cee7c.tar.bz2 | |
make qglobal.h compile when inlcuded from c-files
| -rw-r--r-- | src/corelib/global/qglobal.h | 11 |
1 files 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); |