From d8e15457837e43a58c4f96d1ac3f1a5e9c973476 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Wed, 10 Apr 2019 22:39:59 +0200
Subject: [PATCH] LibCore: Move LibGUI/GLock to LibCore/CLock.

---
 Applications/FileManager/DirectoryModel.cpp |  8 +++---
 LibGUI/GLock.h => LibCore/CLock.h           | 30 ++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)
 rename LibGUI/GLock.h => LibCore/CLock.h (77%)

diff --git a/Applications/FileManager/DirectoryModel.cpp b/Applications/FileManager/DirectoryModel.cpp
index 7035526f12..c15eb0f317 100644
--- a/Applications/FileManager/DirectoryModel.cpp
+++ b/Applications/FileManager/DirectoryModel.cpp
@@ -8,13 +8,13 @@
 #include <AK/StringBuilder.h>
 #include <SharedGraphics/GraphicsBitmap.h>
 #include <LibGUI/GPainter.h>
-#include <LibGUI/GLock.h>
+#include <LibCore/CLock.h>
 
-static GLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>& thumbnail_cache()
+static CLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>& thumbnail_cache()
 {
-    static GLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>* s_map;
+    static CLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>* s_map;
     if (!s_map)
-        s_map = new GLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>();
+        s_map = new CLockable<HashMap<String, RetainPtr<GraphicsBitmap>>>();
     return *s_map;
 }
 
diff --git a/LibGUI/GLock.h b/LibCore/CLock.h
similarity index 77%
rename from LibGUI/GLock.h
rename to LibCore/CLock.h
index ad0f1c4995..ef515fb320 100644
--- a/LibGUI/GLock.h
+++ b/LibCore/CLock.h
@@ -17,10 +17,10 @@ static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
     return ret;
 }
 
-class GLock {
+class CLock {
 public:
-    GLock() { }
-    ~GLock() { }
+    CLock() { }
+    ~CLock() { }
 
     void lock();
     void unlock();
@@ -31,18 +31,18 @@ private:
     int m_holder { -1 };
 };
 
-class GLocker {
+class CLocker {
 public:
-    [[gnu::always_inline]] inline explicit GLocker(GLock& l) : m_lock(l) { lock(); }
-    [[gnu::always_inline]] inline ~GLocker() { unlock(); }
+    [[gnu::always_inline]] inline explicit CLocker(CLock& l) : m_lock(l) { lock(); }
+    [[gnu::always_inline]] inline ~CLocker() { unlock(); }
     [[gnu::always_inline]] inline void unlock() { m_lock.unlock(); }
     [[gnu::always_inline]] inline void lock() { m_lock.lock(); }
 
 private:
-    GLock& m_lock;
+    CLock& m_lock;
 };
 
-[[gnu::always_inline]] inline void GLock::lock()
+[[gnu::always_inline]] inline void CLock::lock()
 {
     for (;;) {
         if (CAS(&m_lock, 1, 0) == 0) {
@@ -59,7 +59,7 @@ private:
     }
 }
 
-inline void GLock::unlock()
+inline void CLock::unlock()
 {
     for (;;) {
         if (CAS(&m_lock, 1, 0) == 0) {
@@ -80,14 +80,14 @@ inline void GLock::unlock()
     }
 }
 
-#define LOCKER(lock) GLocker locker(lock)
+#define LOCKER(lock) CLocker locker(lock)
 
 template<typename T>
-class GLockable {
+class CLockable {
 public:
-    GLockable() { }
-    GLockable(T&& resource) : m_resource(move(resource)) { }
-    GLock& lock() { return m_lock; }
+    CLockable() { }
+    CLockable(T&& resource) : m_resource(move(resource)) { }
+    CLock& lock() { return m_lock; }
     T& resource() { return m_resource; }
 
     T lock_and_copy()
@@ -98,6 +98,6 @@ public:
 
 private:
     T m_resource;
-    GLock m_lock;
+    CLock m_lock;
 };