From 6c22307d12afb4910ae29a041222e69d288a97cd Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Thu, 9 Sep 2021 17:02:37 +0200
Subject: [PATCH] Group pure protocol modules under Quasar.Wayland.Protocol

---
 quasar-wayland.cabal                                      | 6 +++---
 src/Quasar/Wayland/Client.hs                              | 4 ++--
 src/Quasar/Wayland/Connection.hs                          | 4 ++--
 src/Quasar/Wayland/{ => Protocol}/Core.hs                 | 2 +-
 src/Quasar/Wayland/{Protocol.hs => Protocol/Generated.hs} | 6 +++---
 src/Quasar/Wayland/{ => Protocol}/TH.hs                   | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename src/Quasar/Wayland/{ => Protocol}/Core.hs (99%)
 rename src/Quasar/Wayland/{Protocol.hs => Protocol/Generated.hs} (56%)
 rename src/Quasar/Wayland/{ => Protocol}/TH.hs (98%)

diff --git a/quasar-wayland.cabal b/quasar-wayland.cabal
index 8f15c5c..5b06cac 100644
--- a/quasar-wayland.cabal
+++ b/quasar-wayland.cabal
@@ -85,9 +85,9 @@ library
   exposed-modules:
     Quasar.Wayland.Client
     Quasar.Wayland.Connection
-    Quasar.Wayland.Core
-    Quasar.Wayland.Protocol
-    Quasar.Wayland.TH
+    Quasar.Wayland.Protocol.Core
+    Quasar.Wayland.Protocol.Generated
+    Quasar.Wayland.Protocol.TH
   build-depends:
     base >=4.7 && <5,
     binary,
diff --git a/src/Quasar/Wayland/Client.hs b/src/Quasar/Wayland/Client.hs
index b150641..1f9833d 100644
--- a/src/Quasar/Wayland/Client.hs
+++ b/src/Quasar/Wayland/Client.hs
@@ -15,8 +15,8 @@ import Network.Socket.ByteString.Lazy qualified as SocketL
 import Quasar
 import Quasar.Prelude
 import Quasar.Wayland.Connection
-import Quasar.Wayland.Core
-import Quasar.Wayland.Protocol
+import Quasar.Wayland.Protocol.Core
+import Quasar.Wayland.Protocol.Generated
 import System.Environment (getEnv, lookupEnv)
 import System.FilePath ((</>), isRelative)
 import Text.Read (readEither)
diff --git a/src/Quasar/Wayland/Connection.hs b/src/Quasar/Wayland/Connection.hs
index bc3d01a..fb6a66a 100644
--- a/src/Quasar/Wayland/Connection.hs
+++ b/src/Quasar/Wayland/Connection.hs
@@ -13,8 +13,8 @@ import Network.Socket.ByteString qualified as Socket
 import Network.Socket.ByteString.Lazy qualified as SocketL
 import Quasar
 import Quasar.Prelude
-import Quasar.Wayland.Core
-import Quasar.Wayland.Protocol
+import Quasar.Wayland.Protocol.Core
+import Quasar.Wayland.Protocol.Generated
 
 
 data WaylandConnection s = WaylandConnection {
diff --git a/src/Quasar/Wayland/Core.hs b/src/Quasar/Wayland/Protocol/Core.hs
similarity index 99%
rename from src/Quasar/Wayland/Core.hs
rename to src/Quasar/Wayland/Protocol/Core.hs
index 7a28aa5..bef58b0 100644
--- a/src/Quasar/Wayland/Core.hs
+++ b/src/Quasar/Wayland/Protocol/Core.hs
@@ -1,4 +1,4 @@
-module Quasar.Wayland.Core (
+module Quasar.Wayland.Protocol.Core (
   ObjectId,
   Opcode,
   Fixed,
diff --git a/src/Quasar/Wayland/Protocol.hs b/src/Quasar/Wayland/Protocol/Generated.hs
similarity index 56%
rename from src/Quasar/Wayland/Protocol.hs
rename to src/Quasar/Wayland/Protocol/Generated.hs
index c21e9d8..fe3e5b8 100644
--- a/src/Quasar/Wayland/Protocol.hs
+++ b/src/Quasar/Wayland/Protocol/Generated.hs
@@ -1,10 +1,10 @@
 {-# OPTIONS_GHC -Wno-missing-export-lists #-}
 --{-# OPTIONS_GHC -ddump-splices #-}
 
-module Quasar.Wayland.Protocol where
+module Quasar.Wayland.Protocol.Generated where
 
 import Data.Binary
-import Quasar.Wayland.Core
-import Quasar.Wayland.TH
+import Quasar.Wayland.Protocol.Core
+import Quasar.Wayland.Protocol.TH
 
 $(generateWaylandProcol "protocols/wayland.xml")
diff --git a/src/Quasar/Wayland/TH.hs b/src/Quasar/Wayland/Protocol/TH.hs
similarity index 98%
rename from src/Quasar/Wayland/TH.hs
rename to src/Quasar/Wayland/Protocol/TH.hs
index 67eb473..6066fe2 100644
--- a/src/Quasar/Wayland/TH.hs
+++ b/src/Quasar/Wayland/Protocol/TH.hs
@@ -1,4 +1,4 @@
-module Quasar.Wayland.TH (
+module Quasar.Wayland.Protocol.TH (
   generateWaylandProcol
 ) where
 
@@ -9,7 +9,7 @@ import Language.Haskell.TH
 import Language.Haskell.TH.Lib
 import Language.Haskell.TH.Syntax (addDependentFile)
 import Quasar.Prelude
-import Quasar.Wayland.Core
+import Quasar.Wayland.Protocol.Core
 import Text.XML.Light
 
 
-- 
GitLab