diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-01-30 11:26:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:17:55 +0100 |
| commit | 20beb5ff538a4de73b7430583829089e39024d05 (patch) | |
| tree | bec177628120bc13b1143f8f7ccd58948b63946f /src/platformsupport/fontdatabases | |
| parent | ef63b7befd5b0d6726b709aa79f6503322af1462 (diff) | |
Windows: Fix compilation with -qtnamespace
Change-Id: Ib006d74299d65e5872a5a524eaa937e127306ec7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 7 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index e10be2da17..5cfbc6cb4f 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -56,6 +56,8 @@ #include <ft2build.h> #include FT_TRUETYPE_TABLES_H +QT_BEGIN_NAMESPACE + #define SimplifiedChineseCsbBit 18 #define TraditionalChineseCsbBit 20 #define JapaneseCsbBit 17 @@ -322,9 +324,10 @@ void QBasicFontDatabase::releaseHandle(void *handle) delete file; } +extern FT_Library qt_getFreetype(); + QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByteArray &file) { - extern FT_Library qt_getFreetype(); FT_Library library = qt_getFreetype(); int index = 0; @@ -425,3 +428,5 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt } while (index < numFaces); return families; } + +QT_END_NAMESPACE diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h index 5cfb1e72ab..fd6e180c75 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h @@ -46,6 +46,8 @@ #include <QtCore/QByteArray> #include <QtCore/QString> +QT_BEGIN_NAMESPACE + struct FontFile { QString fileName; @@ -66,4 +68,6 @@ public: static QSupportedWritingSystems determineWritingSystemsFromTrueTypeBits(quint32 unicodeRange[4], quint32 codePageRange[2]); }; +QT_END_NAMESPACE + #endif // QBASICFONTDATABASE_H |