From 3841f2382f2a76dc69379abe7b792b4ee6397694 Mon Sep 17 00:00:00 2001
From: github-usr-name <spam-here@github.com>
Date: Sat, 24 Feb 2024 12:32:02 +0000
Subject: [PATCH] Address PR issues

---
 .gitignore        |  2 --
 src/BitFlag.hpp   | 79 ++++++++++++++++-------------------------------
 src/Hy3Layout.cpp |  5 +--
 3 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/.gitignore b/.gitignore
index f013aa6..36b6e89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,3 @@ build/
 compile_commands.json
 .vscode/
 *.log
-.env
-.env.*
\ No newline at end of file
diff --git a/src/BitFlag.hpp b/src/BitFlag.hpp
index 8332a06..6253157 100644
--- a/src/BitFlag.hpp
+++ b/src/BitFlag.hpp
@@ -1,69 +1,44 @@
-#ifndef BITFLAG
-#define BITFLAG
+#pragma once
 
 template <typename FlagType>
-struct BitFlag
-{
-    int m_FlagValue = 0;
+struct BitFlag {
+	int m_FlagValue = 0;
 
-    BitFlag() = default;
+	BitFlag() = default;
 
-    BitFlag(FlagType flag) {
-        m_FlagValue = (int)flag;
-    }
+	BitFlag(FlagType flag) { m_FlagValue = (int) flag; }
 
-    operator FlagType() const {
-        return static_cast<FlagType>(m_FlagValue);
-    }
+	operator FlagType() const { return static_cast<FlagType>(m_FlagValue); }
 
-    void Set(FlagType flag) {
-        m_FlagValue |= (int)flag;
-    }
+	void Set(FlagType flag) { m_FlagValue |= (int) flag; }
 
-    void Unset(FlagType flag) {
-        m_FlagValue &= ~(int)flag;
-    }
+	void Unset(FlagType flag) { m_FlagValue &= ~(int) flag; }
 
-    void Toggle(FlagType flag) {
-        m_FlagValue ^= (int)flag;
-    }
+	void Toggle(FlagType flag) { m_FlagValue ^= (int) flag; }
 
-    void Mask(FlagType flag) {
-        m_FlagValue &= (int)flag;
-    }
+	void Mask(FlagType flag) { m_FlagValue &= (int) flag; }
 
-    bool Has(FlagType flag) const {
-        return (m_FlagValue & (int)flag) == (int)flag;
-    }
+	bool Has(FlagType flag) const { return (m_FlagValue & (int) flag) == (int) flag; }
 
-    bool HasAny(FlagType flag) const {
-        return (m_FlagValue & (int)flag) != 0;
-    }
-    bool HasNot(FlagType flag) const {
-        return (m_FlagValue & (int)flag) != (int)flag;
-    }
+	bool HasAny(FlagType flag) const { return (m_FlagValue & (int) flag) != 0; }
+	bool HasNot(FlagType flag) const { return (m_FlagValue & (int) flag) != (int) flag; }
 
-    const BitFlag& operator |=(FlagType flag) {
-        Set(flag);
-        return *this;
-    }
+	const BitFlag& operator|=(FlagType flag) {
+		Set(flag);
+		return *this;
+	}
 
-    const BitFlag& operator &=(FlagType flag) {
-        Mask(flag);
-        return *this;
-    }
+	const BitFlag& operator&=(FlagType flag) {
+		Mask(flag);
+		return *this;
+	}
 
-    const BitFlag& operator ^=(FlagType flag) {
-        Toggle(flag);
-        return *this;
-    }
+	const BitFlag& operator^=(FlagType flag) {
+		Toggle(flag);
+		return *this;
+	}
 
-    bool operator==(FlagType flag) const {
-        return m_FlagValue == (int)flag;
-    }
+	bool operator==(FlagType flag) const { return m_FlagValue == (int) flag; }
 
-    bool operator!=(FlagType flag) const {
-        return m_FlagValue != (int)flag;
-    }
+	bool operator!=(FlagType flag) const { return m_FlagValue != (int) flag; }
 };
-#endif
\ No newline at end of file
diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
index 3e9638a..4b62d72 100644
--- a/src/Hy3Layout.cpp
+++ b/src/Hy3Layout.cpp
@@ -506,7 +506,7 @@ void Hy3Layout::resizeActiveWindow(const Vector2D& delta, eRectCorner corner, CW
 		g_pXWaylandManager->setWindowSize(window, required_size);
 	} else if (auto* node = this->getNodeFromWindow(window);node != nullptr) {
 		executeResizeOperation(delta, corner, &node->getExpandActor(), g_pCompositor->getMonitorFromID(window->m_iMonitorID));
-	};
+	}
 }
 
 void Hy3Layout::fullscreenRequestForWindow(
@@ -2056,8 +2056,9 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(
 				auto& group_data = target_group->data.as_group;
 
 				if (group_data.children.empty()) {
+					// in theory this would never happen
 					return nullptr;
-				} // in theory this would never happen
+				}
 
 				bool shift_after = false;