Mac: remove some unused code in QFontDialog

Those code was warpped by Q_WS_MAC and should be part of QPA already.

Change-Id: I48b751aad0509b50ccf9e82778c962ed80a2a9f9
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index 30004df..2a68d29 100644 (file)
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -333,13 +333,6 @@ void QFontDialogPrivate::init()
 
 QFontDialog::~QFontDialog()
 {
-#ifdef Q_WS_MAC
-    Q_D(QFontDialog);
-    if (d->delegate) {
-        d->closeCocoaFontPanel();
-        return;
-    }
-#endif
 }
 
 /*!
@@ -804,11 +797,6 @@ void QFontDialog::setCurrentFont(const QFont &font)
         if (QPlatformFontDialogHelper *helper = d->platformFontDialogHelper())
             helper->setCurrentFont(font);
     }
-
-#ifdef Q_WS_MAC
-    if (d->delegate)
-        QFontDialogPrivate::setFont(d->delegate, font);
-#endif
 }
 
 /*!
@@ -911,11 +899,6 @@ QFontDialog::FontDialogOptions QFontDialog::options() const
     return QFontDialog::FontDialogOptions(int(d->options->options()));
 }
 
-#ifdef Q_WS_MAC
-// can only have one Cocoa font panel active
-bool QFontDialogPrivate::sharedFontPanelAvailable = true;
-#endif
-
 /*!
     \since 4.5
     \overload

diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h
index 015a605..93d1201 100644 (file)
--- a/src/widgets/dialogs/qfontdialog_p.h
+++ b/src/widgets/dialogs/qfontdialog_p.h
@@ -145,22 +145,6 @@ public:
 
     bool canBeNativeDialog() const;
     void _q_runNativeAppModalPanel();
-#ifdef Q_WS_MAC
-    static void setFont(void *delegate, const QFont &font);
-
-    inline void done(int result) { q_func()->done(result); }
-    inline QFontDialog *fontDialog() { return q_func(); }
-
-    void *delegate;
-    void closeCocoaFontPanel();
-
-    bool setVisible_sys(bool visible);
-    void createNSFontPanelDelegate();
-    bool showCocoaFontPanel();
-    bool hideCocoaFontPanel();
-
-    static bool sharedFontPanelAvailable;
-#endif
 
 private:
     virtual void initHelper(QPlatformDialogHelper *);