From 871d450b93458f7412a5d5716ad6dce75b9ede55 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Thu, 9 Apr 2020 18:17:27 +0200
Subject: [PATCH] Kernel: Remove redundant "ACPI" from filenames in ACPI/

---
 Kernel/ACPI/{ACPIDynamicParser.cpp => DynamicParser.cpp} | 4 ++--
 Kernel/ACPI/{ACPIDynamicParser.h => DynamicParser.h}     | 2 +-
 Kernel/ACPI/Initialize.cpp                               | 2 +-
 Kernel/ACPI/{ACPIParser.cpp => Parser.cpp}               | 2 +-
 Kernel/ACPI/{ACPIParser.h => Parser.h}                   | 0
 Kernel/Makefile                                          | 4 ++--
 Kernel/PCI/Initializer.cpp                               | 2 +-
 Kernel/Process.cpp                                       | 2 +-
 Kernel/Time/HPET.cpp                                     | 2 +-
 Kernel/Time/TimeManagement.cpp                           | 2 +-
 Kernel/init.cpp                                          | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename Kernel/ACPI/{ACPIDynamicParser.cpp => DynamicParser.cpp} (96%)
 rename Kernel/ACPI/{ACPIDynamicParser.h => DynamicParser.h} (98%)
 rename Kernel/ACPI/{ACPIParser.cpp => Parser.cpp} (99%)
 rename Kernel/ACPI/{ACPIParser.h => Parser.h} (100%)

diff --git a/Kernel/ACPI/ACPIDynamicParser.cpp b/Kernel/ACPI/DynamicParser.cpp
similarity index 96%
rename from Kernel/ACPI/ACPIDynamicParser.cpp
rename to Kernel/ACPI/DynamicParser.cpp
index 7e9de148989..84a2c2ac73d 100644
--- a/Kernel/ACPI/ACPIDynamicParser.cpp
+++ b/Kernel/ACPI/DynamicParser.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/ACPI/ACPIDynamicParser.h>
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/DynamicParser.h>
+#include <Kernel/ACPI/Parser.h>
 
 namespace Kernel {
 namespace ACPI {
diff --git a/Kernel/ACPI/ACPIDynamicParser.h b/Kernel/ACPI/DynamicParser.h
similarity index 98%
rename from Kernel/ACPI/ACPIDynamicParser.h
rename to Kernel/ACPI/DynamicParser.h
index 1e75930c362..168c6061322 100644
--- a/Kernel/ACPI/ACPIDynamicParser.h
+++ b/Kernel/ACPI/DynamicParser.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/RefPtr.h>
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Lock.h>
 #include <Kernel/VM/PhysicalPage.h>
diff --git a/Kernel/ACPI/Initialize.cpp b/Kernel/ACPI/Initialize.cpp
index 7ebeb390747..0ef293a166c 100644
--- a/Kernel/ACPI/Initialize.cpp
+++ b/Kernel/ACPI/Initialize.cpp
@@ -25,7 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/ACPI/ACPIDynamicParser.h>
+#include <Kernel/ACPI/DynamicParser.h>
 #include <Kernel/CommandLine.h>
 
 namespace Kernel {
diff --git a/Kernel/ACPI/ACPIParser.cpp b/Kernel/ACPI/Parser.cpp
similarity index 99%
rename from Kernel/ACPI/ACPIParser.cpp
rename to Kernel/ACPI/Parser.cpp
index 4eebc86f049..c870a2a6d1c 100644
--- a/Kernel/ACPI/ACPIParser.cpp
+++ b/Kernel/ACPI/Parser.cpp
@@ -26,7 +26,7 @@
  */
 
 #include <AK/StringView.h>
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/Parser.h>
 #include <Kernel/PCI/Access.h>
 #include <Kernel/VM/MemoryManager.h>
 #include <Kernel/VM/TypedMapping.h>
diff --git a/Kernel/ACPI/ACPIParser.h b/Kernel/ACPI/Parser.h
similarity index 100%
rename from Kernel/ACPI/ACPIParser.h
rename to Kernel/ACPI/Parser.h
diff --git a/Kernel/Makefile b/Kernel/Makefile
index eec367de39d..806dcbe2c35 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -121,11 +121,11 @@ OBJS = \
     VM/Region.o \
     VM/SharedInodeVMObject.o \
     VM/VMObject.o \
-    ACPI/ACPIParser.o \
-    ACPI/ACPIDynamicParser.o \
     ACPI/DMIDecoder.o \
+    ACPI/DynamicParser.o \
     ACPI/Initialize.o \
     ACPI/MultiProcessorParser.o \
+    ACPI/Parser.o \
     WaitQueue.o \
     init.o
 
diff --git a/Kernel/PCI/Initializer.cpp b/Kernel/PCI/Initializer.cpp
index 2189a7129f9..058d30ffa8a 100644
--- a/Kernel/PCI/Initializer.cpp
+++ b/Kernel/PCI/Initializer.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/Parser.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/RTL8139NetworkAdapter.h>
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index e3dae71ba5b..230be187bed 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -31,7 +31,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/Time.h>
 #include <AK/Types.h>
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Devices/KeyboardDevice.h>
diff --git a/Kernel/Time/HPET.cpp b/Kernel/Time/HPET.cpp
index 6ad91358ce1..73c1152d673 100644
--- a/Kernel/Time/HPET.cpp
+++ b/Kernel/Time/HPET.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/StringView.h>
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/Parser.h>
 #include <Kernel/Interrupts/InterruptManagement.h>
 #include <Kernel/Time/HPET.h>
 #include <Kernel/Time/HPETComparator.h>
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
index 57cb4b4e5bd..ea221da4150 100644
--- a/Kernel/Time/TimeManagement.cpp
+++ b/Kernel/Time/TimeManagement.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/ACPI/ACPIParser.h>
+#include <Kernel/ACPI/Parser.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Scheduler.h>
 #include <Kernel/Time/HPET.h>
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 1b16dae2151..2f474b85cd8 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/Types.h>
-#include <Kernel/ACPI/ACPIDynamicParser.h>
+#include <Kernel/ACPI/DynamicParser.h>
 #include <Kernel/ACPI/DMIDecoder.h>
 #include <Kernel/ACPI/Initialize.h>
 #include <Kernel/ACPI/MultiProcessorParser.h>