diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-05-09 12:54:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 06:56:04 +0200 |
| commit | d223b30c42a9a8d42a8dd35b2d93615e646b4f1e (patch) | |
| tree | a85c9bbe9e2431c52862e5acc86d88d7785b5c95 /src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | |
| parent | 75552c8f62dcfb8012c306b37c79ec629448d780 (diff) | |
qpa: Clean up QPlatformDialogHelper API
Remove the _sys suffix from all members of QPlatformDialogHelper and its
subclasses. The QPlatform* class prefix already implies that these
methods are system specific, we don't need the method suffix as well.
Change-Id: I5ad1f928fab3a989992951acc244915e7fa48d32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm index 89501f7c9d..a70953d0df 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm @@ -364,7 +364,7 @@ QCocoaFontDialogHelper::QCocoaFontDialogHelper() : QCocoaFontDialogHelper::~QCocoaFontDialogHelper() { } -void QCocoaFontDialogHelper::exec_sys() +void QCocoaFontDialogHelper::exec() { // Note: If NSApp is not running (which is the case if e.g a top-most // QEventLoop has been interrupted, and the second-most event loop has not @@ -377,7 +377,7 @@ void QCocoaFontDialogHelper::exec_sys() emit reject(); } -void QCocoaFontDialogHelper::deleteNativeDialog_sys() +void QCocoaFontDialogHelper::deleteNativeDialog() { if (!mDelegate) return; @@ -385,7 +385,7 @@ void QCocoaFontDialogHelper::deleteNativeDialog_sys() mDelegate = 0; } -bool QCocoaFontDialogHelper::show_sys(Qt::WindowFlags, Qt::WindowModality windowModality, QWindow *parent) +bool QCocoaFontDialogHelper::show(Qt::WindowFlags, Qt::WindowModality windowModality, QWindow *parent) { if (windowModality == Qt::WindowModal) { // Cocoa's shared font panel cannot be shown as a sheet @@ -394,14 +394,14 @@ bool QCocoaFontDialogHelper::show_sys(Qt::WindowFlags, Qt::WindowModality window return showCocoaFontPanel(windowModality, parent); } -void QCocoaFontDialogHelper::hide_sys() +void QCocoaFontDialogHelper::hide() { if (!mDelegate) return; [reinterpret_cast<QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) *>(mDelegate)->mFontPanel close]; } -void QCocoaFontDialogHelper::setCurrentFont_sys(const QFont &font) +void QCocoaFontDialogHelper::setCurrentFont(const QFont &font) { NSFontManager *mgr = [NSFontManager sharedFontManager]; const NSFont *nsFont = 0; @@ -429,7 +429,7 @@ void QCocoaFontDialogHelper::setCurrentFont_sys(const QFont &font) static_cast<QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) *>(mDelegate)->mQtFont = font; } -QFont QCocoaFontDialogHelper::currentFont_sys() const +QFont QCocoaFontDialogHelper::currentFont() const { if (!mDelegate) return QFont(); |