diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-09-08 10:52:18 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-15 12:10:07 (GMT) |
| commit | 2e2e6e642494dca10b6d101088b8c5237d05f036 (patch) | |
| tree | 71cfe0f2c26a30ba9ad398028dc5ab7c3c95e983 /src/gui/dialogs | |
| parent | 133f510ce7e310d3bbd6aeb57de510d491fe6022 (diff) | |
| download | Qt-2e2e6e642494dca10b6d101088b8c5237d05f036.zip Qt-2e2e6e642494dca10b6d101088b8c5237d05f036.tar.gz Qt-2e2e6e642494dca10b6d101088b8c5237d05f036.tar.bz2 | |
Don't assing 'const Foo*' to a 'Foo*'
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfontdialog_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 9c63dfa..6fb363b 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -496,7 +496,7 @@ void QFontDialogPrivate::setFont(void *delegate, const QFont &font) QMacCocoaAutoReleasePool pool; QFontEngine *fe = font.d->engineForScript(QUnicodeTables::Common); NSFontManager *mgr = [NSFontManager sharedFontManager]; - NSFont *nsFont = 0; + const NSFont *nsFont = 0; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 if (qstrcmp(fe->name(), "CoreText") == 0) { @@ -522,7 +522,7 @@ void QFontDialogPrivate::setFont(void *delegate, const QFont &font) size:fontInfo.pointSize()]; } - [mgr setSelectedFont:nsFont isMultiple:NO]; + [mgr setSelectedFont:const_cast<NSFont *>(nsFont) isMultiple:NO]; [static_cast<QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *>(delegate) setQtFont:font]; } |