diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-10 12:35:25 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-11 18:59:37 +0000 |
| commit | cc8b01240f54048ca16ace963bf205e813728bfb (patch) | |
| tree | 8394941857459369e17a6af8296ad9f4a1836bd8 | |
| parent | 68e1077ede7dc0a48c767e4715e412e60d5bca61 (diff) | |
| download | qttools-cc8b01240f54048ca16ace963bf205e813728bfb.tar.gz | |
QtTools/designer: replace deprecated functions
Replace deprecated functions:
- QFileDialog::setConfirmOverwrite()
- QFileDialog::setResolveSymlinks()
- QAbstractItemDelegate::elidedText()
- QGraphicsProxyWidget::matrix()
Change-Id: Ib50310f0e4652c57ee6965c21e80d76f94ab987d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/designer/src/lib/shared/dialoggui.cpp | 4 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/sheet_delegate.cpp | 5 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/zoomwidget.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp index febd7ad13..42438e41d 100644 --- a/src/designer/src/lib/shared/dialoggui.cpp +++ b/src/designer/src/lib/shared/dialoggui.cpp @@ -198,8 +198,8 @@ QString DialogGui::getSaveFileName(QWidget *parent, const QString &caption, cons void DialogGui::initializeImageFileDialog(QFileDialog &fileDialog, QFileDialog::Options options, QFileDialog::FileMode fm) { - fileDialog.setConfirmOverwrite( !(options & QFileDialog::DontConfirmOverwrite) ); - fileDialog.setResolveSymlinks( !(options & QFileDialog::DontResolveSymlinks) ); + fileDialog.setOption(QFileDialog::DontConfirmOverwrite, options.testFlag(QFileDialog::DontConfirmOverwrite)); + fileDialog.setOption(QFileDialog::DontResolveSymlinks, options.testFlag(QFileDialog::DontResolveSymlinks)); fileDialog.setIconProvider(ensureIconProvider()); fileDialog.setFileMode(fm); } diff --git a/src/designer/src/lib/shared/sheet_delegate.cpp b/src/designer/src/lib/shared/sheet_delegate.cpp index 8bdafb4e3..255110cfb 100644 --- a/src/designer/src/lib/shared/sheet_delegate.cpp +++ b/src/designer/src/lib/shared/sheet_delegate.cpp @@ -105,8 +105,9 @@ void SheetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, // draw text QRect textrect = QRect(r.left() + i*2, r.top(), r.width() - ((5*i)/2), r.height()); - QString text = elidedText(option.fontMetrics, textrect.width(), Qt::ElideMiddle, - model->data(index, Qt::DisplayRole).toString()); + QString text = option.fontMetrics.elidedText(model->data(index, Qt::DisplayRole).toString(), + Qt::ElideMiddle, + textrect.width()); m_view->style()->drawItemText(painter, textrect, Qt::AlignCenter, option.palette, m_view->isEnabled(), text); diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index 9d0128ff4..d3e66ab6d 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -535,7 +535,7 @@ void ZoomWidget::dump() const << m_proxy->effectiveSizeHint(Qt::MinimumSize) << m_proxy->effectiveSizeHint(Qt::PreferredSize) << m_proxy->effectiveSizeHint(Qt::MaximumSize) - << "\nMatrix: " << m_proxy->matrix() + << "\nTransform: " << m_proxy->transform() << "\nWidget: " << m_proxy->widget()->geometry() << "scaled" << (zoomFactor() * m_proxy->widget()->size()); } |