summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2012-10-30 13:46:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-06 20:26:43 +0100
commit7d5b813de363d766266350b12cdd96894b0409d9 (patch)
treee3a5ec910496c1eb3b95e5467ec9590e0c079d4d
parent029cc40c2ac2f6f1013020f6af5e63b46a7a8317 (diff)
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>
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp17
-rw-r--r--src/widgets/dialogs/qfontdialog_p.h16
2 files changed, 0 insertions, 33 deletions
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index 30004df1a7..2a68d29bda 100644
--- 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 015a605af0..93d12010d8 100644
--- 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 *);