feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ImageViewer: Replace QSharedPointer with std::shared_ptr

Browse Source 
According to https://wiki.qt.io/Things_To_Look_Out_For_In_Reviews
QSharedPointer impl is poor and it's going to be removed from Qt 7.

Change-Id: If4e278a4ef7f183a1bcf6020fd515efa61d2b17f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-02-01 17:53:23 +01:00
parent de1d73216e
commit 614b18e5d1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/imageviewer/imageviewer.cpp
View File

@@ -65,12 +65,12 @@ public:
void togglePlay(); void togglePlay();
private: private:
ImageViewer(const QSharedPointer<ImageViewerFile> &document); ImageViewer(const std::shared_ptr<ImageViewerFile> &document);
void ctor(); void ctor();
void playToggled(); void playToggled();
void updatePauseAction(); void updatePauseAction();
QSharedPointer<ImageViewerFile> m_file; std::shared_ptr<ImageViewerFile> m_file;
ImageView *m_imageView; ImageView *m_imageView;
QWidget *m_toolbar; QWidget *m_toolbar;
@@ -112,7 +112,7 @@ ImageViewer::ImageViewer()
ctor(); ctor();
} }
ImageViewer::ImageViewer(const QSharedPointer<ImageViewerFile> &document) ImageViewer::ImageViewer(const std::shared_ptr<ImageViewerFile> &document)
{ {
m_file = document; m_file = document;
ctor(); ctor();
@@ -120,7 +120,7 @@ ImageViewer::ImageViewer(const QSharedPointer<ImageViewerFile> &document)
void ImageViewer::ctor() void ImageViewer::ctor()
{ {
m_imageView = new ImageView(m_file.data()); m_imageView = new ImageView(m_file.get());
m_imageView->readSettings(); m_imageView->readSettings();
const ImageView::Settings settings = m_imageView->settings(); const ImageView::Settings settings = m_imageView->settings();
@@ -256,17 +256,17 @@ void ImageViewer::ctor()
connect(m_actionBackground, &QAction::toggled, m_imageView, &ImageView::setViewBackground); connect(m_actionBackground, &QAction::toggled, m_imageView, &ImageView::setViewBackground);
connect(m_actionOutline, &QAction::toggled, m_imageView, &ImageView::setViewOutline); connect(m_actionOutline, &QAction::toggled, m_imageView, &ImageView::setViewOutline);
connect(m_actionPlayPause, &QAction::triggered, this, &ImageViewer::playToggled); connect(m_actionPlayPause, &QAction::triggered, this, &ImageViewer::playToggled);
connect(m_file.data(), &ImageViewerFile::imageSizeChanged, connect(m_file.get(), &ImageViewerFile::imageSizeChanged,
this, &ImageViewer::imageSizeUpdated); this, &ImageViewer::imageSizeUpdated);
connect(m_file.data(), &ImageViewerFile::openFinished, connect(m_file.get(), &ImageViewerFile::openFinished,
m_imageView, &ImageView::createScene); m_imageView, &ImageView::createScene);
connect(m_file.data(), &ImageViewerFile::openFinished, connect(m_file.get(), &ImageViewerFile::openFinished,
this, &ImageViewer::updateToolButtons); this, &ImageViewer::updateToolButtons);
connect(m_file.data(), &ImageViewerFile::aboutToReload, connect(m_file.get(), &ImageViewerFile::aboutToReload,
m_imageView, &ImageView::reset); m_imageView, &ImageView::reset);
connect(m_file.data(), &ImageViewerFile::reloadFinished, connect(m_file.get(), &ImageViewerFile::reloadFinished,
m_imageView, &ImageView::createScene); m_imageView, &ImageView::createScene);
connect(m_file.data(), &ImageViewerFile::movieStateChanged, connect(m_file.get(), &ImageViewerFile::movieStateChanged,
this, &ImageViewer::updatePauseAction); this, &ImageViewer::updatePauseAction);
connect(m_imageView, &ImageView::scaleFactorChanged, connect(m_imageView, &ImageView::scaleFactorChanged,
this, &ImageViewer::scaleFactorUpdate); this, &ImageViewer::scaleFactorUpdate);
@@ -284,7 +284,7 @@ ImageViewer::~ImageViewer()
IDocument *ImageViewer::document() const IDocument *ImageViewer::document() const
{ {
return m_file.data(); return m_file.get();
} }
QWidget *ImageViewer::toolBar() QWidget *ImageViewer::toolBar()