From 550b0b062b457d49fd30981378d00e0b47250608 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Fri, 21 Jun 2019 18:45:35 +0200
Subject: [PATCH] AK: Rename RetainPtr.h => RefPtr.h, Retained.h =>
 NonnullRefPtr.h.

---
 AK/AKString.h                         | 2 +-
 AK/ByteBuffer.h                       | 2 +-
 AK/{Retained.h => NonnullRefPtr.h}    | 0
 AK/{RetainPtr.h => RefPtr.h}          | 2 +-
 AK/StringImpl.h                       | 2 +-
 AK/Weakable.h                         | 2 +-
 Applications/IRCClient/IRCChannel.h   | 2 +-
 Applications/IRCClient/IRCLogBuffer.h | 2 +-
 Applications/IRCClient/IRCQuery.h     | 2 +-
 DevTools/VisualBuilder/VBWidget.h     | 2 +-
 Kernel/Devices/DiskPartition.h        | 2 +-
 Kernel/Devices/FileBackedDiskDevice.h | 2 +-
 Kernel/Devices/IDEDiskDevice.h        | 2 +-
 Kernel/Devices/MBRPartitionTable.h    | 2 +-
 Kernel/File.h                         | 2 +-
 Kernel/FileSystem/Custody.h           | 2 +-
 Kernel/FileSystem/FileSystem.h        | 2 +-
 Kernel/FileSystem/VirtualFileSystem.h | 2 +-
 Kernel/Net/Socket.h                   | 2 +-
 Kernel/SharedMemory.h                 | 2 +-
 Kernel/Thread.h                       | 2 +-
 Kernel/VM/MemoryManager.h             | 2 +-
 Kernel/VM/PageDirectory.h             | 2 +-
 Kernel/VM/PhysicalPage.h              | 2 +-
 Kernel/VM/PhysicalRegion.cpp          | 4 ++--
 Kernel/VM/PhysicalRegion.h            | 2 +-
 Kernel/VM/VMObject.h                  | 2 +-
 LibC/SharedBuffer.h                   | 2 +-
 LibCore/CConfigFile.h                 | 2 +-
 LibGUI/GAction.h                      | 2 +-
 LibGUI/GMenu.h                        | 2 +-
 LibHTML/DOM/Node.h                    | 2 +-
 LibHTML/Layout/LayoutNode.h           | 2 +-
 LibHTML/Parser/Parser.h               | 2 +-
 Servers/WindowServer/WSButton.h       | 2 +-
 Servers/WindowServer/WSCompositor.h   | 2 +-
 SharedGraphics/CharacterBitmap.h      | 2 +-
 SharedGraphics/Font.h                 | 2 +-
 SharedGraphics/GraphicsBitmap.h       | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)
 rename AK/{Retained.h => NonnullRefPtr.h} (100%)
 rename AK/{RetainPtr.h => RefPtr.h} (99%)

diff --git a/AK/AKString.h b/AK/AKString.h
index d08e8997f5..886819b85e 100644
--- a/AK/AKString.h
+++ b/AK/AKString.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/ByteBuffer.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/StringImpl.h>
 #include <AK/StringView.h>
 #include <AK/Traits.h>
diff --git a/AK/ByteBuffer.h b/AK/ByteBuffer.h
index 6b2f2d394c..cf50c58deb 100644
--- a/AK/ByteBuffer.h
+++ b/AK/ByteBuffer.h
@@ -2,7 +2,7 @@
 
 #include "StdLibExtras.h"
 #include "Types.h"
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/kmalloc.h>
 
diff --git a/AK/Retained.h b/AK/NonnullRefPtr.h
similarity index 100%
rename from AK/Retained.h
rename to AK/NonnullRefPtr.h
diff --git a/AK/RetainPtr.h b/AK/RefPtr.h
similarity index 99%
rename from AK/RetainPtr.h
rename to AK/RefPtr.h
index f19ffb35a8..62ad98db69 100644
--- a/AK/RetainPtr.h
+++ b/AK/RefPtr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Types.h>
 
 namespace AK {
diff --git a/AK/StringImpl.h b/AK/StringImpl.h
index 01e70f3135..54881ad3c4 100644
--- a/AK/StringImpl.h
+++ b/AK/StringImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Types.h>
 #include <AK/kmalloc.h>
diff --git a/AK/Weakable.h b/AK/Weakable.h
index 3985e974a1..6076ebe9ce 100644
--- a/AK/Weakable.h
+++ b/AK/Weakable.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Assertions.h"
-#include "RetainPtr.h"
+#include "RefPtr.h"
 #include "Retainable.h"
 
 namespace AK {
diff --git a/Applications/IRCClient/IRCChannel.h b/Applications/IRCClient/IRCChannel.h
index 816bd108c5..0c25a5d000 100644
--- a/Applications/IRCClient/IRCChannel.h
+++ b/Applications/IRCClient/IRCChannel.h
@@ -3,7 +3,7 @@
 #include "IRCLogBuffer.h"
 #include <AK/AKString.h>
 #include <AK/CircularQueue.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Vector.h>
 
diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h
index c442afbf98..a725e14abf 100644
--- a/Applications/IRCClient/IRCLogBuffer.h
+++ b/Applications/IRCClient/IRCLogBuffer.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/CircularQueue.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <SharedGraphics/Color.h>
 
diff --git a/Applications/IRCClient/IRCQuery.h b/Applications/IRCClient/IRCQuery.h
index d94ef37007..c2b6dbe529 100644
--- a/Applications/IRCClient/IRCQuery.h
+++ b/Applications/IRCClient/IRCQuery.h
@@ -3,7 +3,7 @@
 #include "IRCLogBuffer.h"
 #include <AK/AKString.h>
 #include <AK/CircularQueue.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Vector.h>
 
diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h
index 2b6e43dc09..d2d17e285f 100644
--- a/DevTools/VisualBuilder/VBWidget.h
+++ b/DevTools/VisualBuilder/VBWidget.h
@@ -4,7 +4,7 @@
 #include <AK/Function.h>
 #include <AK/HashMap.h>
 #include <AK/Retainable.h>
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
 #include <SharedGraphics/Rect.h>
 
diff --git a/Kernel/Devices/DiskPartition.h b/Kernel/Devices/DiskPartition.h
index 7db12eefc2..d77eb67a2e 100644
--- a/Kernel/Devices/DiskPartition.h
+++ b/Kernel/Devices/DiskPartition.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <Kernel/Devices/DiskDevice.h>
 
 class DiskPartition final : public DiskDevice {
diff --git a/Kernel/Devices/FileBackedDiskDevice.h b/Kernel/Devices/FileBackedDiskDevice.h
index 580f3b531d..30c61b5776 100644
--- a/Kernel/Devices/FileBackedDiskDevice.h
+++ b/Kernel/Devices/FileBackedDiskDevice.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/AKString.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/DiskDevice.h>
 #include <stdio.h>
diff --git a/Kernel/Devices/IDEDiskDevice.h b/Kernel/Devices/IDEDiskDevice.h
index da5f491516..93f2f56f22 100644
--- a/Kernel/Devices/IDEDiskDevice.h
+++ b/Kernel/Devices/IDEDiskDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <Kernel/Devices/DiskDevice.h>
 #include <Kernel/IRQHandler.h>
 #include <Kernel/Lock.h>
diff --git a/Kernel/Devices/MBRPartitionTable.h b/Kernel/Devices/MBRPartitionTable.h
index d5ca9b138f..920bc35284 100644
--- a/Kernel/Devices/MBRPartitionTable.h
+++ b/Kernel/Devices/MBRPartitionTable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Vector.h>
 #include <Kernel/Devices/DiskDevice.h>
 #include <Kernel/Devices/DiskPartition.h>
diff --git a/Kernel/File.h b/Kernel/File.h
index cc42cb2a44..870b4fbb6c 100644
--- a/Kernel/File.h
+++ b/Kernel/File.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/Retainable.h>
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/KResult.h>
 #include <Kernel/UnixTypes.h>
diff --git a/Kernel/FileSystem/Custody.h b/Kernel/FileSystem/Custody.h
index cc2ca004f1..287d099a30 100644
--- a/Kernel/FileSystem/Custody.h
+++ b/Kernel/FileSystem/Custody.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/Badge.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 
 class Inode;
diff --git a/Kernel/FileSystem/FileSystem.h b/Kernel/FileSystem/FileSystem.h
index c9ad4b5dcb..78d86b1e45 100644
--- a/Kernel/FileSystem/FileSystem.h
+++ b/Kernel/FileSystem/FileSystem.h
@@ -8,7 +8,7 @@
 #include <AK/Function.h>
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/WeakPtr.h>
 #include <AK/kstdio.h>
diff --git a/Kernel/FileSystem/VirtualFileSystem.h b/Kernel/FileSystem/VirtualFileSystem.h
index 595e75cb86..8f7c72fe68 100644
--- a/Kernel/FileSystem/VirtualFileSystem.h
+++ b/Kernel/FileSystem/VirtualFileSystem.h
@@ -5,7 +5,7 @@
 #include <AK/Function.h>
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/FileSystem.h>
 #include <Kernel/FileSystem/InodeIdentifier.h>
diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h
index af9e257a37..e506cd0c18 100644
--- a/Kernel/Net/Socket.h
+++ b/Kernel/Net/Socket.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/HashTable.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Vector.h>
 #include <Kernel/File.h>
diff --git a/Kernel/SharedMemory.h b/Kernel/SharedMemory.h
index 7ab7d7497a..39e8864ea9 100644
--- a/Kernel/SharedMemory.h
+++ b/Kernel/SharedMemory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/AKString.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <Kernel/File.h>
 #include <Kernel/KResult.h>
diff --git a/Kernel/Thread.h b/Kernel/Thread.h
index bc00eb630f..7b8d070f36 100644
--- a/Kernel/Thread.h
+++ b/Kernel/Thread.h
@@ -3,7 +3,7 @@
 #include <AK/AKString.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/OwnPtr.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Vector.h>
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/KResult.h>
diff --git a/Kernel/VM/MemoryManager.h b/Kernel/VM/MemoryManager.h
index 605f35dd95..0da536448c 100644
--- a/Kernel/VM/MemoryManager.h
+++ b/Kernel/VM/MemoryManager.h
@@ -5,7 +5,7 @@
 #include <AK/Bitmap.h>
 #include <AK/ByteBuffer.h>
 #include <AK/HashTable.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
diff --git a/Kernel/VM/PageDirectory.h b/Kernel/VM/PageDirectory.h
index fcf8ea83dc..4d2c14438e 100644
--- a/Kernel/VM/PageDirectory.h
+++ b/Kernel/VM/PageDirectory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/HashMap.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <Kernel/VM/PhysicalPage.h>
 #include <Kernel/VM/RangeAllocator.h>
diff --git a/Kernel/VM/PhysicalPage.h b/Kernel/VM/PhysicalPage.h
index a36200f266..d6cfe2e371 100644
--- a/Kernel/VM/PhysicalPage.h
+++ b/Kernel/VM/PhysicalPage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <Kernel/Assertions.h>
 #include <Kernel/PhysicalAddress.h>
 
diff --git a/Kernel/VM/PhysicalRegion.cpp b/Kernel/VM/PhysicalRegion.cpp
index 436f17d144..1aa2b73caf 100644
--- a/Kernel/VM/PhysicalRegion.cpp
+++ b/Kernel/VM/PhysicalRegion.cpp
@@ -1,6 +1,6 @@
 #include <AK/Bitmap.h>
-#include <AK/Retained.h>
-#include <AK/RetainPtr.h>
+#include <AK/NonnullRefPtr.h>
+#include <AK/RefPtr.h>
 #include <Kernel/Assertions.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
diff --git a/Kernel/VM/PhysicalRegion.h b/Kernel/VM/PhysicalRegion.h
index 425a5900a7..762f6a9edb 100644
--- a/Kernel/VM/PhysicalRegion.h
+++ b/Kernel/VM/PhysicalRegion.h
@@ -2,7 +2,7 @@
 
 #include <AK/Bitmap.h>
 #include <AK/Retainable.h>
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
 
diff --git a/Kernel/VM/VMObject.h b/Kernel/VM/VMObject.h
index ca6403f58e..d91a37614a 100644
--- a/Kernel/VM/VMObject.h
+++ b/Kernel/VM/VMObject.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/Badge.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Vector.h>
 #include <AK/Weakable.h>
diff --git a/LibC/SharedBuffer.h b/LibC/SharedBuffer.h
index 588ba1821b..6ad334e955 100644
--- a/LibC/SharedBuffer.h
+++ b/LibC/SharedBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 
 class SharedBuffer : public RefCounted<SharedBuffer> {
diff --git a/LibCore/CConfigFile.h b/LibCore/CConfigFile.h
index 4e5e4fa5e0..8b36835bf9 100644
--- a/LibCore/CConfigFile.h
+++ b/LibCore/CConfigFile.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/HashMap.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Vector.h>
 #include <SharedGraphics/Color.h>
diff --git a/LibGUI/GAction.h b/LibGUI/GAction.h
index 590ea57578..8c4d415e10 100644
--- a/LibGUI/GAction.h
+++ b/LibGUI/GAction.h
@@ -5,7 +5,7 @@
 #include <AK/Function.h>
 #include <AK/HashTable.h>
 #include <AK/Retainable.h>
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
 #include <LibGUI/GShortcut.h>
diff --git a/LibGUI/GMenu.h b/LibGUI/GMenu.h
index 37680f6d6b..fc6a78ba18 100644
--- a/LibGUI/GMenu.h
+++ b/LibGUI/GMenu.h
@@ -2,7 +2,7 @@
 
 #include <AK/Function.h>
 #include <AK/Retainable.h>
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Vector.h>
 #include <LibGUI/GMenuItem.h>
 
diff --git a/LibHTML/DOM/Node.h b/LibHTML/DOM/Node.h
index 50fede6403..482891b6e2 100644
--- a/LibHTML/DOM/Node.h
+++ b/LibHTML/DOM/Node.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Vector.h>
 
 enum class NodeType : unsigned {
diff --git a/LibHTML/Layout/LayoutNode.h b/LibHTML/Layout/LayoutNode.h
index 75c21a176d..89c30c63d7 100644
--- a/LibHTML/Layout/LayoutNode.h
+++ b/LibHTML/Layout/LayoutNode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Vector.h>
 #include <LibHTML/Layout/LayoutStyle.h>
 #include <SharedGraphics/Rect.h>
diff --git a/LibHTML/Parser/Parser.h b/LibHTML/Parser/Parser.h
index 577ebf5f69..976fe6b617 100644
--- a/LibHTML/Parser/Parser.h
+++ b/LibHTML/Parser/Parser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <LibHTML/DOM/Document.h>
 
 NonnullRefPtr<Document> parse(const String& html);
diff --git a/Servers/WindowServer/WSButton.h b/Servers/WindowServer/WSButton.h
index b2f0147ce1..b9c51ea10a 100644
--- a/Servers/WindowServer/WSButton.h
+++ b/Servers/WindowServer/WSButton.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <AK/Retained.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
 #include <SharedGraphics/Rect.h>
 
diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h
index 6002bfd4ca..27635d04ca 100644
--- a/Servers/WindowServer/WSCompositor.h
+++ b/Servers/WindowServer/WSCompositor.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <LibCore/CObject.h>
 #include <LibCore/CTimer.h>
 #include <SharedGraphics/DisjointRectSet.h>
diff --git a/SharedGraphics/CharacterBitmap.h b/SharedGraphics/CharacterBitmap.h
index d7b90f97d7..ee4118a64f 100644
--- a/SharedGraphics/CharacterBitmap.h
+++ b/SharedGraphics/CharacterBitmap.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Size.h"
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 
 class CharacterBitmap : public RefCounted<CharacterBitmap> {
diff --git a/SharedGraphics/Font.h b/SharedGraphics/Font.h
index c182b38931..7d126b8486 100644
--- a/SharedGraphics/Font.h
+++ b/SharedGraphics/Font.h
@@ -2,7 +2,7 @@
 
 #include <AK/AKString.h>
 #include <AK/MappedFile.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/Types.h>
 #include <SharedGraphics/Rect.h>
diff --git a/SharedGraphics/GraphicsBitmap.h b/SharedGraphics/GraphicsBitmap.h
index bf859bdbca..0f077a6fec 100644
--- a/SharedGraphics/GraphicsBitmap.h
+++ b/SharedGraphics/GraphicsBitmap.h
@@ -5,7 +5,7 @@
 #include "Size.h"
 #include <AK/AKString.h>
 #include <AK/MappedFile.h>
-#include <AK/RetainPtr.h>
+#include <AK/RefPtr.h>
 #include <AK/Retainable.h>
 #include <AK/StringView.h>
 #include <SharedBuffer.h>