diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-01-30 09:52:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:17:55 +0100 |
commit | ef63b7befd5b0d6726b709aa79f6503322af1462 (patch) | |
tree | f2a156531349082ced7b020b16c3512ad8943efe /src | |
parent | eb60e93d347bfa439df3e900b1fc899ed85fb6de (diff) |
Mac: Fix compilation with -qtnamespace set
Change-Id: Id3b9f4e3edf2caeac32c8a44278cdf05a1fc70fb
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src')
4 files changed, 14 insertions, 3 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 diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h index 6467dbc011..c61ff2bd02 100644 --- a/src/plugins/platforms/cocoa/qnsview.h +++ b/src/plugins/platforms/cocoa/qnsview.h @@ -47,7 +47,10 @@ #include <QtGui/QImage> #include <QtGui/QAccessible> +QT_BEGIN_NAMESPACE class QCocoaWindow; +QT_END_NAMESPACE + @interface QNSView : NSView { CGImageRef m_cgImage; QWindow *m_window; diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 6f5891efc4..09cb9cc016 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -2105,7 +2105,7 @@ void QMacStyle::unpolish(QWidget* w) } } - if (QRubberBand *rubber = ::qobject_cast<QRubberBand*>(w)) { + if (QRubberBand *rubber = qobject_cast<QRubberBand*>(w)) { rubber->setWindowOpacity(1.0); rubber->setAttribute(Qt::WA_PaintOnScreen, true); rubber->setAttribute(Qt::WA_NoSystemBackground, true); @@ -3538,7 +3538,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter QCommonStyle::drawControl(ce, opt, p, w); break; case CE_PushButtonBevel: - if (const QStyleOptionButton *btn = ::qstyleoption_cast<const QStyleOptionButton *>(opt)) { + if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) { if (!(btn->state & (State_Raised | State_Sunken | State_On))) break; |