From 357a5bd4d6682a50d85c88ba485ed34c745fae85 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 27 May 2019 20:22:17 +0200 Subject: QtSvg: remove deprecated functions and enumerations Replace QPainter::HighQualityAntialiasing with Antialiasing and remove defines needed for Qt4. Change-Id: I866decad7d9c10da15e5b0e0bd79033d574f6a08 Reviewed-by: Eirik Aavitsland --- examples/svg/svgviewer/mainwindow.cpp | 14 ++++---------- examples/svg/svgviewer/mainwindow.h | 2 +- examples/svg/svgviewer/svgview.cpp | 8 ++------ examples/svg/svgviewer/svgview.h | 2 +- 4 files changed, 8 insertions(+), 18 deletions(-) (limited to 'examples/svg/svgviewer') diff --git a/examples/svg/svgviewer/mainwindow.cpp b/examples/svg/svgviewer/mainwindow.cpp index 7dd240a..d095416 100644 --- a/examples/svg/svgviewer/mainwindow.cpp +++ b/examples/svg/svgviewer/mainwindow.cpp @@ -118,14 +118,10 @@ MainWindow::MainWindow() m_imageAction->setData(int(SvgView::Image)); rendererMenu->addSeparator(); - m_highQualityAntialiasingAction = rendererMenu->addAction(tr("&High Quality Antialiasing")); - m_highQualityAntialiasingAction->setEnabled(false); - m_highQualityAntialiasingAction->setCheckable(true); - m_highQualityAntialiasingAction->setChecked(false); - connect(m_highQualityAntialiasingAction, &QAction::toggled, m_view, &SvgView::setHighQualityAntialiasing); -#ifdef QT_NO_OPENGL - m_highQualityAntialiasingAction->setVisible(false); -#endif + m_antialiasingAction = rendererMenu->addAction(tr("&Antialiasing")); + m_antialiasingAction->setCheckable(true); + m_antialiasingAction->setChecked(false); + connect(m_antialiasingAction, &QAction::toggled, m_view, &SvgView::setAntialiasing); QActionGroup *rendererGroup = new QActionGroup(this); rendererGroup->addAction(m_nativeAction); @@ -191,8 +187,6 @@ bool MainWindow::loadFile(const QString &fileName) void MainWindow::setRenderer(int renderMode) { - - m_highQualityAntialiasingAction->setEnabled(renderMode == SvgView::OpenGL); m_view->setRenderer(static_cast(renderMode)); } diff --git a/examples/svg/svgviewer/mainwindow.h b/examples/svg/svgviewer/mainwindow.h index 6c2af7e..a102eaa 100644 --- a/examples/svg/svgviewer/mainwindow.h +++ b/examples/svg/svgviewer/mainwindow.h @@ -85,7 +85,7 @@ private: QAction *m_nativeAction; QAction *m_glAction; QAction *m_imageAction; - QAction *m_highQualityAntialiasingAction; + QAction *m_antialiasingAction; QAction *m_backgroundAction; QAction *m_outlineAction; diff --git a/examples/svg/svgviewer/svgview.cpp b/examples/svg/svgviewer/svgview.cpp index ecc8409..50b622b 100644 --- a/examples/svg/svgviewer/svgview.cpp +++ b/examples/svg/svgviewer/svgview.cpp @@ -153,13 +153,9 @@ void SvgView::setRenderer(RendererType type) } } -void SvgView::setHighQualityAntialiasing(bool highQualityAntialiasing) +void SvgView::setAntialiasing(bool antialiasing) { -#ifndef QT_NO_OPENGL - setRenderHint(QPainter::HighQualityAntialiasing, highQualityAntialiasing); -#else - Q_UNUSED(highQualityAntialiasing); -#endif + setRenderHint(QPainter::Antialiasing, antialiasing); } void SvgView::setViewBackground(bool enable) diff --git a/examples/svg/svgviewer/svgview.h b/examples/svg/svgviewer/svgview.h index 1b6b33e..7d5f7d1 100644 --- a/examples/svg/svgviewer/svgview.h +++ b/examples/svg/svgviewer/svgview.h @@ -79,7 +79,7 @@ public: qreal zoomFactor() const; public slots: - void setHighQualityAntialiasing(bool highQualityAntialiasing); + void setAntialiasing(bool antialiasing); void setViewBackground(bool enable); void setViewOutline(bool enable); void zoomIn(); -- cgit v1.2.1