diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 13:54:02 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-17 13:54:02 (GMT) |
| commit | 86b28b0bf7ddd278f1b878db0b5961762e9272b2 (patch) | |
| tree | e7481368b6051de08fd5d43d784beac8ace2c893 /src | |
| parent | d9911390f17426801f553cb82654e102fe0400b9 (diff) | |
| download | Qt-86b28b0bf7ddd278f1b878db0b5961762e9272b2.zip Qt-86b28b0bf7ddd278f1b878db0b5961762e9272b2.tar.gz Qt-86b28b0bf7ddd278f1b878db0b5961762e9272b2.tar.bz2 | |
namespace fixes. s60main and corelib now compiles under a namespace
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale_symbian.cpp | 5 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.h | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 361c038..6e9250f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -795,6 +795,9 @@ namespace QT_NAMESPACE {} # define Q_WS_WIN #endif +// forward declare std::exception +namespace std { class exception; } + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -2315,8 +2318,6 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #if defined(Q_OS_SYMBIAN) -// forward declare std::exception -namespace std { class exception; } Q_CORE_EXPORT void qt_translateSymbianErrorToException(int error); Q_CORE_EXPORT void qt_translateExceptionToSymbianErrorL(const std::exception& ex); diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp index c11a7b9..976227d 100644 --- a/src/corelib/tools/qlocale_symbian.cpp +++ b/src/corelib/tools/qlocale_symbian.cpp @@ -47,11 +47,12 @@ #include <e32std.h> #include "private/qcore_symbian_p.h" -// Located in qlocale.cpp -extern void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry); QT_BEGIN_NAMESPACE +// Located in qlocale.cpp +extern void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry); + static TExtendedLocale _s60Locale; // Type definitions for runtime resolved function pointers diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 9ef5347..6c24055 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -51,6 +51,10 @@ QT_BEGIN_HEADER +#if defined(Q_OS_SYMBIAN) +class CFbsBitmap; +#endif + QT_BEGIN_NAMESPACE QT_MODULE(Gui) @@ -59,13 +63,8 @@ class QImageWriter; class QColor; class QVariant; class QX11Info; - class QPixmapData; -#if defined(Q_OS_SYMBIAN) -class CFbsBitmap; -#endif - class Q_GUI_EXPORT QPixmap : public QPaintDevice { public: |