AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac: remove some unused code in QFontDialog

Browse Source 
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>
This commit is contained in:
Liang Qi 2012-10-30 13:46:50 +01:00 committed by The Qt Project
parent 029cc40c2a
commit 7d5b813de3
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/dialogs/qfontdialog.cpp
View File

@ -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

16
src/widgets/dialogs/qfontdialog_p.h
View File

@ -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 *);