diff options
Diffstat (limited to 'src/widgets/dialogs/qdialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 906022a185..d5daedef3e 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -785,12 +785,6 @@ void QDialog::setVisible(bool visible) return; QWidget::setVisible(visible); -#if QT_DEPRECATED_SINCE(5, 13) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - showExtension(d->doShowExtension); -QT_WARNING_POP -#endif QWidget *fw = window()->focusWidget(); if (!fw) fw = this; @@ -957,153 +951,6 @@ void QDialog::adjustPosition(QWidget* w) move(p); } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \obsolete - - If \a orientation is Qt::Horizontal, the extension will be displayed - to the right of the dialog's main area. If \a orientation is - Qt::Vertical, the extension will be displayed below the dialog's main - area. - - Instead of using this functionality, we recommend that you simply call - show() or hide() on the part of the dialog that you want to use as an - extension. See the \l{Extension Example} for details. - - \sa setExtension() -*/ -void QDialog::setOrientation(Qt::Orientation orientation) -{ - Q_D(QDialog); - d->orientation = orientation; -} - -/*! - \obsolete - - Returns the dialog's extension orientation. - - Instead of using this functionality, we recommend that you simply call - show() or hide() on the part of the dialog that you want to use as an - extension. See the \l{Extension Example} for details. - - \sa extension() -*/ -Qt::Orientation QDialog::orientation() const -{ - Q_D(const QDialog); - return d->orientation; -} - -/*! - \obsolete - - Sets the widget, \a extension, to be the dialog's extension, - deleting any previous extension. The dialog takes ownership of the - extension. Note that if \nullptr is passed, any existing extension will be - deleted. This function must only be called while the dialog is hidden. - - Instead of using this functionality, we recommend that you simply call - show() or hide() on the part of the dialog that you want to use as an - extension. See the \l{Extension Example} for details. - - \sa showExtension(), setOrientation() -*/ -void QDialog::setExtension(QWidget* extension) -{ - Q_D(QDialog); - delete d->extension; - d->extension = extension; - - if (!extension) - return; - - if (extension->parentWidget() != this) - extension->setParent(this); - extension->hide(); -} - -/*! - \obsolete - - Returns the dialog's extension or \nullptr if no extension has been - defined. - - Instead of using this functionality, we recommend that you simply call - show() or hide() on the part of the dialog that you want to use as an - extension. See the \l{Extension Example} for details. - - \sa showExtension(), setOrientation() -*/ -QWidget* QDialog::extension() const -{ - Q_D(const QDialog); - return d->extension; -} - - -/*! - \obsolete - - If \a showIt is true, the dialog's extension is shown; otherwise the - extension is hidden. - - Instead of using this functionality, we recommend that you simply call - show() or hide() on the part of the dialog that you want to use as an - extension. See the \l{Extension Example} for details. - - \sa show(), setExtension(), setOrientation() -*/ -void QDialog::showExtension(bool showIt) -{ - Q_D(QDialog); - d->doShowExtension = showIt; - if (!d->extension) - return; - if (!testAttribute(Qt::WA_WState_Visible)) - return; - if (d->extension->isVisible() == showIt) - return; - - if (showIt) { - d->size = size(); - d->min = minimumSize(); - d->max = maximumSize(); - if (layout()) - layout()->setEnabled(false); - QSize s(d->extension->sizeHint() - .expandedTo(d->extension->minimumSize()) - .boundedTo(d->extension->maximumSize())); - if (d->orientation == Qt::Horizontal) { - int h = qMax(height(), s.height()); - d->extension->setGeometry(width(), 0, s.width(), h); - setFixedSize(width() + s.width(), h); - } else { - int w = qMax(width(), s.width()); - d->extension->setGeometry(0, height(), w, s.height()); - setFixedSize(w, height() + s.height()); - } - d->extension->show(); -#if QT_CONFIG(sizegrip) - const bool sizeGripEnabled = isSizeGripEnabled(); - setSizeGripEnabled(false); - d->sizeGripEnabled = sizeGripEnabled; -#endif - } else { - d->extension->hide(); - // workaround for CDE window manager that won't shrink with (-1,-1) - setMinimumSize(d->min.expandedTo(QSize(1, 1))); - setMaximumSize(d->max); - resize(d->size); - if (layout()) - layout()->setEnabled(true); -#if QT_CONFIG(sizegrip) - setSizeGripEnabled(d->sizeGripEnabled); -#endif - } -} -#endif - /*! \reimp */ QSize QDialog::sizeHint() const { |