1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Q_DEAD_CODE_FROM_QT4_MAC sections

Browse Source 
The native OS X color dialog wrapper is now implemented
in qcocoadialoghelper.mm in the Cocoa platform plugin.

Change-Id: Idc4088df93960dd68507d11a9895277e34a18b96
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
This commit is contained in:
Morten Johan Sørvig 2015-01-23 10:55:20 +01:00 committed by Morten Johan Sørvig
parent c65b8381bb
commit ce651b961d
1 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/widgets/dialogs/qcolordialog.cpp
View File

@ -159,23 +159,6 @@ public:
QWindow dummyTransparentWindow; QWindow dummyTransparentWindow;
#endif #endif
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
void openCocoaColorPanel(const QColor &initial,
QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options);
void closeCocoaColorPanel();
void releaseCocoaColorPanelDelegate();
void setCocoaPanelColor(const QColor &color);
inline void done(int result) { q_func()->done(result); }
inline QColorDialog *colorDialog() { return q_func(); }
void *delegate;
static bool sharedColorPanelAvailable;
void _q_macRunNativeAppModalPanel();
void mac_nativeDialogModalHelp();
#endif
private: private:
virtual void initHelper(QPlatformDialogHelper *h) Q_DECL_OVERRIDE; virtual void initHelper(QPlatformDialogHelper *h) Q_DECL_OVERRIDE;
virtual void helperPrepareShow(QPlatformDialogHelper *h) Q_DECL_OVERRIDE; virtual void helperPrepareShow(QPlatformDialogHelper *h) Q_DECL_OVERRIDE;
@ -1731,9 +1714,6 @@ void QColorDialogPrivate::init(const QColor &initial)
if (!nativeDialogInUse) if (!nativeDialogInUse)
initWidgets(); initWidgets();
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
delegate = 0;
#endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
dummyTransparentWindow.resize(1, 1); dummyTransparentWindow.resize(1, 1);
dummyTransparentWindow.setFlags(Qt::Tool | Qt::FramelessWindowHint); dummyTransparentWindow.setFlags(Qt::Tool | Qt::FramelessWindowHint);
@ -2135,11 +2115,6 @@ QColorDialog::ColorDialogOptions QColorDialog::options() const
\sa color, colorSelected() \sa color, colorSelected()
*/ */
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// can only have one Cocoa color panel active
bool QColorDialogPrivate::sharedColorPanelAvailable = true;
#endif
/*! /*!
\fn void QColorDialog::colorSelected(const QColor &color); \fn void QColorDialog::colorSelected(const QColor &color);
@ -2166,23 +2141,6 @@ void QColorDialog::setVisible(bool visible)
if (visible) if (visible)
d->selectedQColor = QColor(); d->selectedQColor = QColor();
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (visible) {
if (d->delegate || (QColorDialogPrivate::sharedColorPanelAvailable &&
!(testAttribute(Qt::WA_DontShowOnScreen) || (d->opts & DontUseNativeDialog)))){
d->openCocoaColorPanel(currentColor(), parentWidget(), windowTitle(), options());
QColorDialogPrivate::sharedColorPanelAvailable = false;
setAttribute(Qt::WA_DontShowOnScreen);
}
setWindowFlags(windowModality() == Qt::WindowModal ? Qt::Sheet : DefaultWindowFlags);
} else {
if (d->delegate) {
d->closeCocoaColorPanel();
setAttribute(Qt::WA_DontShowOnScreen, false);
}
}
#else
if (d->nativeDialogInUse) { if (d->nativeDialogInUse) {
d->setNativeDialogVisible(visible); d->setNativeDialogVisible(visible);
// Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
@ -2191,7 +2149,6 @@ void QColorDialog::setVisible(bool visible)
} else { } else {
setAttribute(Qt::WA_DontShowOnScreen, false); setAttribute(Qt::WA_DontShowOnScreen, false);
} }
#endif
QDialog::setVisible(visible); QDialog::setVisible(visible);
} }
@ -2267,13 +2224,7 @@ QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent)
QColorDialog::~QColorDialog() QColorDialog::~QColorDialog()
{ {
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
Q_D(QColorDialog);
if (d->delegate) {
d->releaseCocoaColorPanelDelegate();
QColorDialogPrivate::sharedColorPanelAvailable = true;
}
#endif
} }
/*! /*!