From 7f12389a9553fab558e09e8845aebb26e8a7d9eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A9ven=20Car?= Date: Wed, 15 Jan 2025 09:57:37 +0100 Subject: [PATCH] Clean stop-gap porting ifdef for KICONTHEMES_VERSION That were introduced in: a55c467fbb31d822d89722812388425327830377 38ab14c87a945153e683657483fa4bcf44d6b0fb --- src/kitemviews/kstandarditemlistwidget.cpp | 13 ------------- src/main.cpp | 2 -- src/panels/information/informationpanelcontent.cpp | 7 ------- 3 files changed, 22 deletions(-) diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 340343158..aebcfa7d4 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1121,14 +1121,7 @@ void KStandardItemListWidget::updatePixmapCache() } if (m_isCut) { -#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0) KIconEffect::toDisabled(m_pixmap); -#else - QImage img = m_pixmap.toImage(); - KIconEffect::toGray(img, 1); - KIconEffect::semiTransparent(img); - m_pixmap = QPixmap::fromImage(img); -#endif } if (m_isHidden) { @@ -1201,13 +1194,7 @@ void KStandardItemListWidget::updatePixmapCache() // Prepare the pixmap that is used when the item gets hovered if (isHovered()) { m_hoverPixmap = m_pixmap; -#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0) KIconEffect::toActive(m_hoverPixmap); -#else - QImage img = m_pixmap.toImage(); - KIconEffect::toGamma(img, 0.7); - m_hoverPixmap = QPixmap::fromImage(img); -#endif } else if (hoverOpacity() <= 0.0) { // No hover animation is ongoing. Clear m_hoverPixmap to save memory. m_hoverPixmap = QPixmap(); diff --git a/src/main.cpp b/src/main.cpp index 4e8feb167..0d2f825c7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,9 +69,7 @@ int main(int argc, char **argv) /** * trigger initialisation of proper icon theme */ -#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0) KIconTheme::initTheme(); -#endif QApplication app(argc, argv); app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon())); diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 78900ab8a..b112b2caf 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -413,15 +413,8 @@ void InformationPanelContent::markOutdatedPreview() // use it until the preview is done showIcon(m_item); } else { -#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 5, 0) QPixmap disabledPixmap = m_preview->pixmap(); KIconEffect::toDisabled(disabledPixmap); -#else - QImage img = m_preview->pixmap().toImage(); - KIconEffect::toGray(img, 1); - KIconEffect::semiTransparent(img); - QPixmap disabledPixmap = QPixmap::fromImage(img); -#endif m_preview->setPixmap(disabledPixmap); } } -- 2.47.3