summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases
diff options
context:
space:
mode:
Diffstat (limited to 'src/platformsupport/fontdatabases')
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm6
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index f3bb59d236..80be157142 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -44,6 +44,8 @@
#include <QtCore/QSettings>
#import <Foundation/Foundation.h>
+QT_BEGIN_NAMESPACE
+
// this could become a list of all languages used for each writing
// system, instead of using the single most common language.
static const char *languageForWritingSystem[] = {
@@ -320,6 +322,7 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString family, cons
return fallbackLists[styleHint];
}
+OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref);
QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName)
{
ATSFontContainerRef fontContainer;
@@ -330,7 +333,6 @@ QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData
kATSFontContextLocal, kATSFontFormatUnspecified, NULL,
kATSOptionFlagsDefault, &fontContainer);
} else {
- OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref);
FSRef ref;
if (qt_mac_create_fsref(fileName, &ref) != noErr)
return QStringList();
@@ -371,3 +373,5 @@ QFont QCoreTextFontDatabase::defaultFont() const
return QFont(defaultFontName);
}
+QT_END_NAMESPACE
+
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
index 08ab0b230d..adcfeebf0b 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
@@ -44,6 +44,8 @@
#include <QPlatformFontDatabase>
+QT_BEGIN_NAMESPACE
+
class QCoreTextFontDatabase : public QPlatformFontDatabase
{
public:
@@ -61,4 +63,6 @@ private:
QHash<QFont::StyleHint, QStringList> fallbackLists;
};
+QT_END_NAMESPACE
+
#endif // QCORETEXTFONTDATABASE_H