git.iko.soy/unity8
on xenial help sign in
Merge
488e9c9Albert Astals
plugins/Dash/croppedimagesizer.cpp+2−2
compare with xenial
unifiedsplit
@@ -30,7 +30,7 @@ CroppedImageSizer::CroppedImageSizer()
30 m_worker(nullptr)
30 m_worker(nullptr)
31{
31{
32 connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
32 connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
33− connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::updateImageSize);
33+ connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
34}
34}
35
35
36CroppedImageSizer::~CroppedImageSizer()
36CroppedImageSizer::~CroppedImageSizer()
@@ -101,7 +101,7 @@ void CroppedImageSizer::setImageSize(const QSize &imageSize)
101 }
101 }
102}
102}
103
103
104−void CroppedImageSizer::updateImageSize()
104+void CroppedImageSizer::requestImage()
105{
105{
106 if (m_worker) {
106 if (m_worker) {
107 m_worker->abort();
107 m_worker->abort();
plugins/Dash/croppedimagesizer.h+1−1
@@ -58,7 +58,7 @@ Q_SIGNALS:
58
58
59private Q_SLOT:
59private Q_SLOT:
60 void calculateSourceSize();
60 void calculateSourceSize();
61− void updateImageSize();
61+ void requestImage();
62
62
63private:
63private:
64 QUrl m_source;
64 QUrl m_source;