From 93489fbc4c3bee24262e7d9240fa307454ed2a05 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Wed, 24 Jul 2019 08:42:55 +0200
Subject: [PATCH] Convert HashMap<Key, OwnPtr<T>> to HashMap<Key,
 NonnullOwnPtr<T>>.

In every case I found, we never wanted to support null entry values.
With NonnullOwnPtr, we can encode that at the type level. :^)
---
 Applications/ProcessManager/ProcessModel.h | 2 +-
 Applications/Taskbar/WindowList.h          | 2 +-
 Kernel/SharedBuffer.cpp                    | 6 +++---
 Kernel/SharedBuffer.h                      | 2 +-
 Libraries/LibCore/CEventLoop.cpp           | 4 ++--
 Libraries/LibCore/CEventLoop.h             | 2 +-
 Libraries/LibGUI/GTreeView.h               | 2 +-
 Servers/WindowServer/WSClientConnection.h  | 6 +++---
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Applications/ProcessManager/ProcessModel.h b/Applications/ProcessManager/ProcessModel.h
index 046823ba9a6..21003a6666f 100644
--- a/Applications/ProcessManager/ProcessModel.h
+++ b/Applications/ProcessManager/ProcessModel.h
@@ -58,7 +58,7 @@ private:
     };
 
     HashMap<uid_t, String> m_usernames;
-    HashMap<pid_t, OwnPtr<Process>> m_processes;
+    HashMap<pid_t, NonnullOwnPtr<Process>> m_processes;
     Vector<pid_t> m_pids;
     RefPtr<GraphicsBitmap> m_generic_process_icon;
     RefPtr<GraphicsBitmap> m_high_priority_icon;
diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h
index d706d27eb44..b8d9be2eb62 100644
--- a/Applications/Taskbar/WindowList.h
+++ b/Applications/Taskbar/WindowList.h
@@ -78,5 +78,5 @@ public:
     Function<GButton*(const WindowIdentifier&)> aid_create_button;
 
 private:
-    HashMap<WindowIdentifier, OwnPtr<Window>> m_windows;
+    HashMap<WindowIdentifier, NonnullOwnPtr<Window>> m_windows;
 };
diff --git a/Kernel/SharedBuffer.cpp b/Kernel/SharedBuffer.cpp
index 7fe077b5c89..29665e3bc94 100644
--- a/Kernel/SharedBuffer.cpp
+++ b/Kernel/SharedBuffer.cpp
@@ -1,11 +1,11 @@
 #include <Kernel/SharedBuffer.h>
 #include <Kernel/Process.h>
 
-Lockable<HashMap<int, OwnPtr<SharedBuffer>>>& shared_buffers()
+Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>& shared_buffers()
 {
-    static Lockable<HashMap<int, OwnPtr<SharedBuffer>>>* map;
+    static Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>* map;
     if (!map)
-        map = new Lockable<HashMap<int, OwnPtr<SharedBuffer>>>;
+        map = new Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>;
     return *map;
 }
 
diff --git a/Kernel/SharedBuffer.h b/Kernel/SharedBuffer.h
index 6b408bb3f89..e7791868924 100644
--- a/Kernel/SharedBuffer.h
+++ b/Kernel/SharedBuffer.h
@@ -49,4 +49,4 @@ public:
     unsigned m_total_refs { 0 };
 };
 
-Lockable<HashMap<int, OwnPtr<SharedBuffer>>>& shared_buffers();
+Lockable<HashMap<int, NonnullOwnPtr<SharedBuffer>>>& shared_buffers();
diff --git a/Libraries/LibCore/CEventLoop.cpp b/Libraries/LibCore/CEventLoop.cpp
index 123d3749e2f..719e1369501 100644
--- a/Libraries/LibCore/CEventLoop.cpp
+++ b/Libraries/LibCore/CEventLoop.cpp
@@ -21,7 +21,7 @@
 
 static CEventLoop* s_main_event_loop;
 static Vector<CEventLoop*>* s_event_loop_stack;
-HashMap<int, OwnPtr<CEventLoop::EventLoopTimer>>* CEventLoop::s_timers;
+HashMap<int, NonnullOwnPtr<CEventLoop::EventLoopTimer>>* CEventLoop::s_timers;
 HashTable<CNotifier*>* CEventLoop::s_notifiers;
 int CEventLoop::s_next_timer_id = 1;
 int CEventLoop::s_wake_pipe_fds[2];
@@ -30,7 +30,7 @@ CEventLoop::CEventLoop()
 {
     if (!s_event_loop_stack) {
         s_event_loop_stack = new Vector<CEventLoop*>;
-        s_timers = new HashMap<int, OwnPtr<CEventLoop::EventLoopTimer>>;
+        s_timers = new HashMap<int, NonnullOwnPtr<CEventLoop::EventLoopTimer>>;
         s_notifiers = new HashTable<CNotifier*>;
     }
 
diff --git a/Libraries/LibCore/CEventLoop.h b/Libraries/LibCore/CEventLoop.h
index a5370cc428b..54bbf1d240a 100644
--- a/Libraries/LibCore/CEventLoop.h
+++ b/Libraries/LibCore/CEventLoop.h
@@ -81,7 +81,7 @@ private:
         bool has_expired(const timeval& now) const;
     };
 
-    static HashMap<int, OwnPtr<EventLoopTimer>>* s_timers;
+    static HashMap<int, NonnullOwnPtr<EventLoopTimer>>* s_timers;
     static int s_next_timer_id;
 
     static HashTable<CNotifier*>* s_notifiers;
diff --git a/Libraries/LibGUI/GTreeView.h b/Libraries/LibGUI/GTreeView.h
index 6fe0df6e696..55241d2376d 100644
--- a/Libraries/LibGUI/GTreeView.h
+++ b/Libraries/LibGUI/GTreeView.h
@@ -35,7 +35,7 @@ private:
 
     MetadataForIndex& ensure_metadata_for_index(const GModelIndex&) const;
 
-    mutable HashMap<void*, OwnPtr<MetadataForIndex>> m_view_metadata;
+    mutable HashMap<void*, NonnullOwnPtr<MetadataForIndex>> m_view_metadata;
 
     RefPtr<GraphicsBitmap> m_expand_bitmap;
     RefPtr<GraphicsBitmap> m_collapse_bitmap;
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 2a5d2e47498..1138a945508 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/Servers/WindowServer/WSClientConnection.h
@@ -78,9 +78,9 @@ private:
 
     void post_error(const String&);
 
-    HashMap<int, OwnPtr<WSWindow>> m_windows;
-    HashMap<int, OwnPtr<WSMenuBar>> m_menubars;
-    HashMap<int, OwnPtr<WSMenu>> m_menus;
+    HashMap<int, NonnullOwnPtr<WSWindow>> m_windows;
+    HashMap<int, NonnullOwnPtr<WSMenuBar>> m_menubars;
+    HashMap<int, NonnullOwnPtr<WSMenu>> m_menus;
     WeakPtr<WSMenuBar> m_app_menubar;
 
     int m_next_menubar_id { 10000 };