aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/imageviewer/imageviewer.cpp
diff options
context:
space:
mode:
authorJarek Kobus <[email protected]>2024-02-01 17:53:23 +0100
committerJarek Kobus <[email protected]>2024-02-01 16:59:27 +0000
commit614b18e5d16f57d32c0296a48058f0fe81cf5619 (patch)
tree171aebd6ae5d795ac3ef844b7e6659f7bd8fc502 /src/plugins/imageviewer/imageviewer.cpp
parentde1d73216eb27ca500738511c1ec1a33db96ef26 (diff)
ImageViewer: Replace QSharedPointer with std::shared_ptr
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 <[email protected]>
Diffstat (limited to 'src/plugins/imageviewer/imageviewer.cpp')
-rw-r--r--src/plugins/imageviewer/imageviewer.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 6d0b40c5608..e8c35e7b4e7 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -65,12 +65,12 @@ public:
void togglePlay();
private:
- ImageViewer(const QSharedPointer<ImageViewerFile> &document);
+ ImageViewer(const std::shared_ptr<ImageViewerFile> &document);
void ctor();
void playToggled();
void updatePauseAction();
- QSharedPointer<ImageViewerFile> m_file;
+ std::shared_ptr<ImageViewerFile> m_file;
ImageView *m_imageView;
QWidget *m_toolbar;
@@ -112,7 +112,7 @@ ImageViewer::ImageViewer()
ctor();
}
-ImageViewer::ImageViewer(const QSharedPointer<ImageViewerFile> &document)
+ImageViewer::ImageViewer(const std::shared_ptr<ImageViewerFile> &document)
{
m_file = document;
ctor();
@@ -120,7 +120,7 @@ ImageViewer::ImageViewer(const QSharedPointer<ImageViewerFile> &document)
void ImageViewer::ctor()
{
- m_imageView = new ImageView(m_file.data());
+ m_imageView = new ImageView(m_file.get());
m_imageView->readSettings();
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_actionOutline, &QAction::toggled, m_imageView, &ImageView::setViewOutline);
connect(m_actionPlayPause, &QAction::triggered, this, &ImageViewer::playToggled);
- connect(m_file.data(), &ImageViewerFile::imageSizeChanged,
+ connect(m_file.get(), &ImageViewerFile::imageSizeChanged,
this, &ImageViewer::imageSizeUpdated);
- connect(m_file.data(), &ImageViewerFile::openFinished,
+ connect(m_file.get(), &ImageViewerFile::openFinished,
m_imageView, &ImageView::createScene);
- connect(m_file.data(), &ImageViewerFile::openFinished,
+ connect(m_file.get(), &ImageViewerFile::openFinished,
this, &ImageViewer::updateToolButtons);
- connect(m_file.data(), &ImageViewerFile::aboutToReload,
+ connect(m_file.get(), &ImageViewerFile::aboutToReload,
m_imageView, &ImageView::reset);
- connect(m_file.data(), &ImageViewerFile::reloadFinished,
+ connect(m_file.get(), &ImageViewerFile::reloadFinished,
m_imageView, &ImageView::createScene);
- connect(m_file.data(), &ImageViewerFile::movieStateChanged,
+ connect(m_file.get(), &ImageViewerFile::movieStateChanged,
this, &ImageViewer::updatePauseAction);
connect(m_imageView, &ImageView::scaleFactorChanged,
this, &ImageViewer::scaleFactorUpdate);
@@ -284,7 +284,7 @@ ImageViewer::~ImageViewer()
IDocument *ImageViewer::document() const
{
- return m_file.data();
+ return m_file.get();
}
QWidget *ImageViewer::toolBar()