diff options
| -rw-r--r-- | examples/svg/svgviewer/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | examples/svg/svgviewer/svgview.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/svg/svgviewer/mainwindow.cpp b/examples/svg/svgviewer/mainwindow.cpp index bb74261..ba574b5 100644 --- a/examples/svg/svgviewer/mainwindow.cpp +++ b/examples/svg/svgviewer/mainwindow.cpp @@ -30,7 +30,7 @@ MainWindow::MainWindow() const QIcon exportIcon = QIcon::fromTheme("document-save", QIcon(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png")); QAction *exportAction = fileMenu->addAction(exportIcon, tr("&Export..."), this, &MainWindow::exportImage); exportAction->setToolTip(tr("Export Image")); - exportAction->setShortcut(Qt::CTRL + Qt::Key_E); + exportAction->setShortcut(Qt::CTRL | Qt::Key_E); toolBar->addAction(exportAction); QAction *quitAction = fileMenu->addAction(tr("E&xit"), qApp, QCoreApplication::quit); quitAction->setShortcuts(QKeySequence::Quit); @@ -54,7 +54,7 @@ MainWindow::MainWindow() zoomAction = viewMenu->addAction(tr("Zoom &Out"), m_view, &SvgView::zoomOut); zoomAction->setShortcut(QKeySequence::ZoomOut); zoomAction = viewMenu->addAction(tr("Reset Zoom"), m_view, &SvgView::resetZoom); - zoomAction->setShortcut(Qt::CTRL + Qt::Key_0); + zoomAction->setShortcut(Qt::CTRL | Qt::Key_0); QMenu *rendererMenu = menuBar()->addMenu(tr("&Renderer")); m_nativeAction = rendererMenu->addAction(tr("&Native")); diff --git a/examples/svg/svgviewer/svgview.cpp b/examples/svg/svgviewer/svgview.cpp index ffd2637..4463aa0 100644 --- a/examples/svg/svgviewer/svgview.cpp +++ b/examples/svg/svgviewer/svgview.cpp @@ -59,14 +59,14 @@ bool SvgView::openFile(const QString &fileName) const bool drawBackground = (m_backgroundItem ? m_backgroundItem->isVisible() : false); const bool drawOutline = (m_outlineItem ? m_outlineItem->isVisible() : true); - QScopedPointer<QGraphicsSvgItem> svgItem(new QGraphicsSvgItem(fileName)); + auto svgItem = std::make_unique<QGraphicsSvgItem>(fileName); if (!svgItem->renderer()->isValid()) return false; s->clear(); resetTransform(); - m_svgItem = svgItem.take(); + m_svgItem = svgItem.release(); m_svgItem->setFlags(QGraphicsItem::ItemClipsToShape); m_svgItem->setCacheMode(QGraphicsItem::NoCache); m_svgItem->setZValue(0); |