From 8f5db4efad2a9d394416ca5b4a0ce93f6081a094 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 28 Aug 2023 21:03:25 +0300 Subject: [PATCH] kdeplasma-addons: remove now redundant version check the minimum Katie version is 4.14.0 now, see the following commit in the kdelibs repo: e7823a048493a1fbbcc93c5f71d4a39622eb6b55 Signed-off-by: Ivailo Monev --- .../wallpapers/qmlwallpapers/wallpapersqml.cpp | 14 -------------- .../wallpapers/qmlwallpapers/wallpapersqml.h | 4 ---- 2 files changed, 18 deletions(-) diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp index e0116ed8..989e898f 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp @@ -51,13 +51,8 @@ WallpaperQml::WallpaperQml(QObject *parent, const QVariantList &args) m_component = new QDeclarativeComponent(m_engine); connect( -#if QT_VERSION < 0x041300 - m_component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), - this, SLOT(componentStatusChanged(QDeclarativeComponent::Status)) -#else m_component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)), this, SLOT(componentStatusChanged(QDeclarativeComponent::ComponentStatus)) -#endif ); connect(this, SIGNAL(renderHintsChanged()), SLOT(resizeWallpaper())); connect(m_scene, SIGNAL(changed(QList)), SLOT(shouldRepaint(QList))); @@ -91,11 +86,7 @@ void WallpaperQml::setPackageName(const QString& packageName) kWarning() << "couldn't load the package named" << packageName; } -#if QT_VERSION < 0x041300 -void WallpaperQml::componentStatusChanged(QDeclarativeComponent::Status s) -#else void WallpaperQml::componentStatusChanged(QDeclarativeComponent::ComponentStatus s) -#endif { if (s==QDeclarativeComponent::Ready) { if (m_item) { @@ -113,13 +104,8 @@ void WallpaperQml::componentStatusChanged(QDeclarativeComponent::ComponentStatus delete m_component; m_component = new QDeclarativeComponent(m_engine); connect( -#if QT_VERSION < 0x041300 - m_component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), - this, SLOT(componentStatusChanged(QDeclarativeComponent::Status)) -#else m_component, SIGNAL(statusChanged(QDeclarativeComponent::ComponentStatus)), this, SLOT(componentStatusChanged(QDeclarativeComponent::ComponentStatus)) -#endif ); } if (!m_component->errors().isEmpty()) diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h index 4d8ceb6f..e5914750 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h @@ -40,11 +40,7 @@ class WallpaperQml : public Plasma::Wallpaper private slots: void resizeWallpaper(); void shouldRepaint(const QList< QRectF >& rects); -#if QT_VERSION < 0x041300 - void componentStatusChanged(QDeclarativeComponent::Status s); -#else void componentStatusChanged(QDeclarativeComponent::ComponentStatus s); -#endif void setPackageName(const QString& name); void changeWallpaper(const QModelIndex& idx); void setBackgroundColor(const QColor& color);