Browse Source

LibCore: Rename CFileStreamReader => CIODeviceStreamReader.

Andreas Kling 6 years ago
parent
commit
0f3d191a70
2 changed files with 9 additions and 9 deletions
  1. 2 2
      Libraries/LibAudio/AWavLoader.cpp
  2. 7 7
      Libraries/LibCore/CIODeviceStreamReader.h

+ 2 - 2
Libraries/LibAudio/AWavLoader.cpp

@@ -2,7 +2,7 @@
 #include <LibAudio/ABuffer.h>
 #include <LibAudio/AWavLoader.h>
 #include <LibCore/CFile.h>
-#include <LibCore/CFileStreamReader.h>
+#include <LibCore/CIODeviceStreamReader.h>
 #include <limits>
 
 AWavLoader::AWavLoader(const StringView& path)
@@ -33,7 +33,7 @@ RefPtr<ABuffer> AWavLoader::get_more_samples()
 
 bool AWavLoader::parse_header()
 {
-    CFileStreamReader stream(m_file);
+    CIODeviceStreamReader stream(m_file);
 
 #define CHECK_OK(msg)                                                           \
     do {                                                                        \

+ 7 - 7
Libraries/LibCore/CFileStreamReader.h → Libraries/LibCore/CIODeviceStreamReader.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <AK/StdLibExtras.h>
-#include <LibCore/CFile.h>
+#include <LibCore/CIODevice.h>
 
-class CFileStreamReader {
+class CIODeviceStreamReader {
 public:
-    CFileStreamReader(CFile& file)
-        : m_file(file)
+    CIODeviceStreamReader(CIODevice& device)
+        : m_device(device)
     {
     }
 
@@ -16,9 +16,9 @@ public:
     }
 
     template<typename T>
-    CFileStreamReader& operator>>(T& value)
+    CIODeviceStreamReader& operator>>(T& value)
     {
-        int nread = m_file.read((u8*)&value, sizeof(T));
+        int nread = m_device.read((u8*)&value, sizeof(T));
         ASSERT(nread == sizeof(T));
         if (nread != sizeof(T))
             m_had_failure = true;
@@ -26,6 +26,6 @@ public:
     }
 
 private:
-    CFile& m_file;
+    CIODevice& m_device;
     bool m_had_failure { false };
 };