From eea133a3aad15cc7945641387680cbfc45559bd4 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 25 Mar 2024 20:46:54 +0000 Subject: [PATCH] More renaming. --- CMakeLists.txt | 1 + app/CMakeLists.txt | 8 +++--- app/data/activitydata.h | 4 +-- app/data/viewdata.h | 2 +- .../contextmenulayerquickitem.h | 2 +- app/layout/abstractlayout.h | 2 +- app/layout/genericlayout.h | 2 +- app/plasma/extended/backgroundcache.h | 2 +- app/plasma/extended/backgroundtracker.h | 2 +- app/plasma/extended/panelbackground.cpp | 20 +++++++-------- app/plasma/extended/panelbackground.h | 25 +++++++++++-------- app/plasma/extended/theme.cpp | 4 +-- app/plasma/extended/theme.h | 5 +++- app/view/effects.h | 4 ++- app/view/panelshadows_p.h | 10 ++++---- app/wm/abstractwindowinterface.h | 4 +-- declarativeimports/core/quickwindowsystem.cpp | 2 +- default.nix | 2 +- 18 files changed, 56 insertions(+), 45 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 60ef7ecf3..f147ca5a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 NewStuff Notifications + Package Svg WindowSystem XmlGui diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 6daed9bf9..681a29885 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -73,12 +73,14 @@ target_link_libraries(latte-dock KF6::KIOWidgets KF6::Notifications KF6::NewStuffWidgets + KF6::Package + KF6::Svg # KF6::WaylandClient KF6::XmlGui Wayland::Client - Plasma - PlasmaActivities - PlasmaQuick + Plasma::Activities + Plasma::Plasma + Plasma::PlasmaQuick ) diff --git a/app/data/activitydata.h b/app/data/activitydata.h index 784f44730..0d21a3678 100644 --- a/app/data/activitydata.h +++ b/app/data/activitydata.h @@ -16,8 +16,8 @@ #include #include -//! KActivities -#include +//! Plasma Activities +#include namespace Latte { namespace Data { diff --git a/app/data/viewdata.h b/app/data/viewdata.h index 01f7ee787..16bfe84b6 100644 --- a/app/data/viewdata.h +++ b/app/data/viewdata.h @@ -16,7 +16,7 @@ #include // Plasma -#include +#include namespace Latte { diff --git a/app/declarativeimports/contextmenulayerquickitem.h b/app/declarativeimports/contextmenulayerquickitem.h index 338506521..bab0b73ad 100644 --- a/app/declarativeimports/contextmenulayerquickitem.h +++ b/app/declarativeimports/contextmenulayerquickitem.h @@ -17,7 +17,7 @@ #include // Plasma -#include +#include namespace Plasma { class Applet; diff --git a/app/layout/abstractlayout.h b/app/layout/abstractlayout.h index 983109bf9..133c596ab 100644 --- a/app/layout/abstractlayout.h +++ b/app/layout/abstractlayout.h @@ -13,7 +13,7 @@ #include // Plasma -#include +#include namespace Plasma { class Types; diff --git a/app/layout/genericlayout.h b/app/layout/genericlayout.h index eaa843daa..9cb3c46a1 100644 --- a/app/layout/genericlayout.h +++ b/app/layout/genericlayout.h @@ -20,7 +20,7 @@ #include // Plasma -#include +#include namespace Plasma { class Applet; diff --git a/app/plasma/extended/backgroundcache.h b/app/plasma/extended/backgroundcache.h index 627924e68..9c6450594 100644 --- a/app/plasma/extended/backgroundcache.h +++ b/app/plasma/extended/backgroundcache.h @@ -14,7 +14,7 @@ #include // Plasma -#include +#include // KDE #include diff --git a/app/plasma/extended/backgroundtracker.h b/app/plasma/extended/backgroundtracker.h index 979a82d98..5052f7781 100644 --- a/app/plasma/extended/backgroundtracker.h +++ b/app/plasma/extended/backgroundtracker.h @@ -10,7 +10,7 @@ #include // Plasma -#include +#include namespace Latte{ diff --git a/app/plasma/extended/panelbackground.cpp b/app/plasma/extended/panelbackground.cpp index f5fd98440..00a9c2ff3 100644 --- a/app/plasma/extended/panelbackground.cpp +++ b/app/plasma/extended/panelbackground.cpp @@ -32,7 +32,7 @@ PanelBackground::~PanelBackground() { } -bool PanelBackground::hasMask(Plasma::Svg *svg) const +bool PanelBackground::hasMask(KSvg::Svg *svg) const { if (!svg) { return false; @@ -96,7 +96,7 @@ QString PanelBackground::prefixed(const QString &id) return id; } -QString PanelBackground::element(Plasma::Svg *svg, const QString &id) +QString PanelBackground::element(KSvg::Svg *svg, const QString &id) { if (!svg) { return ""; @@ -113,7 +113,7 @@ QString PanelBackground::element(Plasma::Svg *svg, const QString &id) return ""; } -void PanelBackground::updateMaxOpacity(Plasma::Svg *svg) +void PanelBackground::updateMaxOpacity(KSvg::Svg *svg) { if (!svg) { return; @@ -149,7 +149,7 @@ void PanelBackground::updateMaxOpacity(Plasma::Svg *svg) emit maxOpacityChanged(); } -void PanelBackground::updatePaddings(Plasma::Svg *svg) +void PanelBackground::updatePaddings(KSvg::Svg *svg) { if (!svg) { return; @@ -163,7 +163,7 @@ void PanelBackground::updatePaddings(Plasma::Svg *svg) emit paddingsChanged(); } -void PanelBackground::updateRoundnessFromMask(Plasma::Svg *svg) +void PanelBackground::updateRoundnessFromMask(KSvg::Svg *svg) { if (!svg) { return; @@ -317,7 +317,7 @@ void PanelBackground::updateRoundnessFromMask(Plasma::Svg *svg) -void PanelBackground::updateRoundnessFromShadows(Plasma::Svg *svg) +void PanelBackground::updateRoundnessFromShadows(KSvg::Svg *svg) { //! 1. Algorithm is choosing which corner shadow based on panel location //! 2. For that corner discovers the maxOpacity (most solid shadow point) and @@ -494,7 +494,7 @@ void PanelBackground::updateRoundnessFromShadows(Plasma::Svg *svg) emit roundnessChanged(); } -void PanelBackground::updateRoundnessFallback(Plasma::Svg *svg) +void PanelBackground::updateRoundnessFallback(KSvg::Svg *svg) { if (!svg) { return; @@ -549,7 +549,7 @@ void PanelBackground::updateRoundnessFallback(Plasma::Svg *svg) emit roundnessChanged(); } -void PanelBackground::updateShadow(Plasma::Svg *svg) +void PanelBackground::updateShadow(KSvg::Svg *svg) { if (!svg) { return; @@ -651,7 +651,7 @@ void PanelBackground::updateShadow(Plasma::Svg *svg) } -void PanelBackground::updateRoundness(Plasma::Svg *svg) +void PanelBackground::updateRoundness(KSvg::Svg *svg) { if (!svg) { return; @@ -671,7 +671,7 @@ void PanelBackground::updateRoundness(Plasma::Svg *svg) void PanelBackground::update() { - Plasma::Svg *backSvg = new Plasma::Svg(this); + KSvg::Svg *backSvg = new KSvg::Svg(this); backSvg->setImagePath(QStringLiteral("widgets/panel-background")); backSvg->resize(); diff --git a/app/plasma/extended/panelbackground.h b/app/plasma/extended/panelbackground.h index 647437b29..54efa3ab6 100644 --- a/app/plasma/extended/panelbackground.h +++ b/app/plasma/extended/panelbackground.h @@ -9,9 +9,12 @@ // Qt #include +// KF +#include +#include + // Plasma -#include -#include +#include namespace Latte { namespace PlasmaExtended { @@ -64,19 +67,19 @@ signals: void maxOpacityChanged(); private: - bool hasMask(Plasma::Svg *svg) const; + bool hasMask(KSvg::Svg *svg) const; QString prefixed(const QString &id); - QString element(Plasma::Svg *svg, const QString &id); + QString element(KSvg::Svg *svg, const QString &id); - void updateMaxOpacity(Plasma::Svg *svg); - void updatePaddings(Plasma::Svg *svg); - void updateRoundness(Plasma::Svg *svg); - void updateShadow(Plasma::Svg *svg); + void updateMaxOpacity(KSvg::Svg *svg); + void updatePaddings(KSvg::Svg *svg); + void updateRoundness(KSvg::Svg *svg); + void updateShadow(KSvg::Svg *svg); - void updateRoundnessFromMask(Plasma::Svg *svg); - void updateRoundnessFromShadows(Plasma::Svg *svg); - void updateRoundnessFallback(Plasma::Svg *svg); + void updateRoundnessFromMask(KSvg::Svg *svg); + void updateRoundnessFromShadows(KSvg::Svg *svg); + void updateRoundnessFallback(KSvg::Svg *svg); private: int m_paddingTop{0}; diff --git a/app/plasma/extended/theme.cpp b/app/plasma/extended/theme.cpp index ef3ec3e33..e68269afc 100644 --- a/app/plasma/extended/theme.cpp +++ b/app/plasma/extended/theme.cpp @@ -326,7 +326,7 @@ void Theme::updateBackgrounds() void Theme::updateHasShadow() { - Plasma::Svg *svg = new Plasma::Svg(this); + KSvg::Svg *svg = new KSvg::Svg(this); svg->setImagePath(QStringLiteral("widgets/panel-background")); svg->resize(); @@ -498,7 +498,7 @@ void Theme::updateMarginsAreaValues() m_marginsAreaBottom = 0; m_marginsAreaRight = 0; - Plasma::Svg *svg = new Plasma::Svg(this); + KSvg::Svg *svg = new KSvg::Svg(this); svg->setImagePath(QStringLiteral("widgets/panel-background")); bool hasThickSeparatorMargins = svg->hasElement("thick-center"); diff --git a/app/plasma/extended/theme.h b/app/plasma/extended/theme.h index 741e8cd37..93f92278f 100644 --- a/app/plasma/extended/theme.h +++ b/app/plasma/extended/theme.h @@ -18,8 +18,11 @@ #include #include +// KF +#include +#include + // Plasma -#include #include namespace Latte { diff --git a/app/view/effects.h b/app/view/effects.h index 814cd57b4..53fcc0983 100644 --- a/app/view/effects.h +++ b/app/view/effects.h @@ -15,8 +15,10 @@ #include #include +// KF +#include + // Plasma -#include #include namespace Latte { diff --git a/app/view/panelshadows_p.h b/app/view/panelshadows_p.h index 6ecb56c71..67c80c63b 100644 --- a/app/view/panelshadows_p.h +++ b/app/view/panelshadows_p.h @@ -8,10 +8,10 @@ #include -#include "plasma/framesvg.h" -#include "plasma/svg.h" +#include +#include -class PanelShadows : public Plasma::Svg +class PanelShadows : public KSvg::Svg { Q_OBJECT @@ -21,10 +21,10 @@ public: static PanelShadows *self(); - void addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders = Plasma::FrameSvg::AllBorders); + void addWindow(QWindow *window, KSvg::FrameSvg::EnabledBorders enabledBorders = KSvg::FrameSvg::AllBorders); void removeWindow(QWindow *window); - void setEnabledBorders(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders = Plasma::FrameSvg::AllBorders); + void setEnabledBorders(QWindow *window, KSvg::FrameSvg::EnabledBorders enabledBorders = KSvg::FrameSvg::AllBorders); private: class Private; diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h index 35e7d6ab9..94bf01903 100644 --- a/app/wm/abstractwindowinterface.h +++ b/app/wm/abstractwindowinterface.h @@ -32,10 +32,10 @@ // KDE #include -#include +#include // Plasma -#include +#include namespace Latte { diff --git a/declarativeimports/core/quickwindowsystem.cpp b/declarativeimports/core/quickwindowsystem.cpp index ae4e843be..79a07c476 100644 --- a/declarativeimports/core/quickwindowsystem.cpp +++ b/declarativeimports/core/quickwindowsystem.cpp @@ -12,7 +12,7 @@ // X11 #include -#include +#include namespace Latte { diff --git a/default.nix b/default.nix index 5b1399463..0193ea287 100644 --- a/default.nix +++ b/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = ./.; buildInputs = with kdePackages; [ - plasma-activities plasma-sdk + plasma-activities plasma-activities.dev plasma-sdk plasma-wayland-protocols qt6.full xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland