From 38e72a950432d36a96036736bd052ee0ba7a4ec2 Mon Sep 17 00:00:00 2001
From: Peter Fajdiga <peter.fajdiga@gmail.com>
Date: Sun, 8 Sep 2024 09:20:10 +0200
Subject: [PATCH] ClientManager, DesktopManager: define properties in
 constructor

---
 src/lib/world/ClientManager.ts  | 10 ++++++----
 src/lib/world/DesktopManager.ts | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/lib/world/ClientManager.ts b/src/lib/world/ClientManager.ts
index 6936c0f..15d868e 100644
--- a/src/lib/world/ClientManager.ts
+++ b/src/lib/world/ClientManager.ts
@@ -1,13 +1,15 @@
 class ClientManager {
-    private readonly world: World;
     private readonly config: ClientManager.Config;
-    private readonly desktopManager: DesktopManager;
-    private readonly pinManager: PinManager;
     private readonly clientMap: Map<KwinClient, ClientWrapper>;
     private lastFocusedClient: KwinClient|null;
     private readonly windowRuleEnforcer: WindowRuleEnforcer;
 
-    constructor(config: Config, world: World, desktopManager: DesktopManager, pinManager: PinManager) {
+    constructor(
+        config: Config,
+        private readonly world: World,
+        private readonly desktopManager: DesktopManager,
+        private readonly pinManager: PinManager,
+    ) {
         this.world = world;
         this.config = config;
         this.desktopManager = desktopManager;
diff --git a/src/lib/world/DesktopManager.ts b/src/lib/world/DesktopManager.ts
index 4f46849..2645512 100644
--- a/src/lib/world/DesktopManager.ts
+++ b/src/lib/world/DesktopManager.ts
@@ -1,13 +1,16 @@
 class DesktopManager {
-    private readonly pinManager: PinManager;
-    private readonly config: Desktop.Config;
-    public readonly layoutConfig: LayoutConfig;
     private readonly desktops: Map<string, Desktop>; // key is activityId|desktopId
     private selectedScreen: Output;
     private kwinActivities: Set<string>;
     private kwinDesktops: Set<KwinDesktop>;
 
-    constructor(pinManager: PinManager, config: Desktop.Config, layoutConfig: LayoutConfig, currentActivity: string, currentDesktop: KwinDesktop) {
+    constructor(
+        private readonly pinManager: PinManager,
+        private readonly config: Desktop.Config,
+        public readonly layoutConfig: LayoutConfig,
+        currentActivity: string,
+        currentDesktop: KwinDesktop,
+    ) {
         this.pinManager = pinManager;
         this.config = config;
         this.layoutConfig = layoutConfig;