diff --git a/src/artdetailwindow.cpp b/src/artdetailwindow.cpp index 67d6a5a..46ea731 100644 --- a/src/artdetailwindow.cpp +++ b/src/artdetailwindow.cpp @@ -48,7 +48,7 @@ ArtDetailWindow::ArtDetailWindow(const QString &filename, const QDir &assetDirec previewBox->setLayout(previewLayout); auto imageView = new ImageLabel(); - imageView->setPixmap(QPixmap::fromImage(image)); + imageView->setQPixmap(QPixmap::fromImage(image)); previewLayout->addWidget(imageView); m_titleEdit = new QLineEdit(); diff --git a/src/imagelabel.cpp b/src/imagelabel.cpp index f92dcb5..67c8317 100644 --- a/src/imagelabel.cpp +++ b/src/imagelabel.cpp @@ -11,7 +11,7 @@ ImageLabel::ImageLabel(QWidget *parent) setScaledContents(false); } -void ImageLabel::setPixmap(const QPixmap &p) +void ImageLabel::setQPixmap(const QPixmap &p) { pix = p; QLabel::setPixmap(scaledPixmap()); @@ -19,7 +19,7 @@ void ImageLabel::setPixmap(const QPixmap &p) int ImageLabel::heightForWidth(int width) const { - return pix.isNull() ? this->height() : ((qreal)pix.height() * width) / pix.width(); + return pix.isNull() ? height() : (pix.height() * width) / pix.width(); } QSize ImageLabel::sizeHint() const diff --git a/src/imagelabel.h b/src/imagelabel.h index f6c8da7..90b694b 100644 --- a/src/imagelabel.h +++ b/src/imagelabel.h @@ -17,7 +17,7 @@ public: [[nodiscard]] QPixmap scaledPixmap() const; public Q_SLOTS: - void setPixmap(const QPixmap &); + void setQPixmap(const QPixmap &); void resizeEvent(QResizeEvent *) override; private: