Merge pull request #5884 from JosJuice/remove-noncopyable

Remove NonCopyable
dolphin-emu · Aug 22, 2017 · 81a4fd9 · 81a4fd9
2 parents ef4e4a9 + 09f3f9b
commit 81a4fd9
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 59 deletions.
diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h
@@ -19,14 +19,18 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/File.h"
-#include "Common/NonCopyable.h"
 
-class WaveFileWriter : NonCopyable
+class WaveFileWriter
 {
 public:
   WaveFileWriter();
   ~WaveFileWriter();
 
+  WaveFileWriter(const WaveFileWriter&) = delete;
+  WaveFileWriter& operator=(const WaveFileWriter&) = delete;
+  WaveFileWriter(WaveFileWriter&&) = delete;
+  WaveFileWriter& operator=(WaveFileWriter&&) = delete;
+
   bool Start(const std::string& filename, unsigned int HLESampleRate);
   void Stop();
 

diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h
@@ -10,15 +10,14 @@
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/MemoryUtil.h"
-#include "Common/NonCopyable.h"
 
 // Everything that needs to generate code should inherit from this.
 // You get memory management for free, plus, you can use all emitter functions without
 // having to prefix them with gen-> or something similar.
 // Example implementation:
 // class JIT : public CodeBlock<ARMXEmitter> {}
 template <class T>
-class CodeBlock : public T, NonCopyable
+class CodeBlock : public T
 {
 private:
   // A privately used function to set the executable RAM space to something invalid.
@@ -37,11 +36,16 @@ class CodeBlock : public T, NonCopyable
   std::vector<CodeBlock*> m_children;
 
 public:
+  CodeBlock() = default;
   virtual ~CodeBlock()
   {
     if (region)
       FreeCodeSpace();
   }
+  CodeBlock(const CodeBlock&) = delete;
+  CodeBlock& operator=(const CodeBlock&) = delete;
+  CodeBlock(CodeBlock&&) = delete;
+  CodeBlock& operator=(CodeBlock&&) = delete;
 
   // Call this before you generate any code.
   void AllocCodeSpace(size_t size)

diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
@@ -136,7 +136,6 @@
     <ClInclude Include="MsgHandler.h" />
     <ClInclude Include="NandPaths.h" />
     <ClInclude Include="Network.h" />
-    <ClInclude Include="NonCopyable.h" />
     <ClInclude Include="PcapFile.h" />
     <ClInclude Include="Profiler.h" />
     <ClInclude Include="ScopeGuard.h" />

diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
@@ -237,7 +237,6 @@
       <Filter>GL\GLInterface</Filter>
     </ClInclude>
     <ClInclude Include="Assert.h" />
-    <ClInclude Include="NonCopyable.h" />
     <ClInclude Include="Analytics.h" />
     <ClInclude Include="Semaphore.h" />
     <ClInclude Include="MD5.h" />

diff --git a/Source/Core/Common/File.h b/Source/Core/Common/File.h
@@ -9,14 +9,13 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/NonCopyable.h"
 
 namespace File
 {
 // simple wrapper for cstdlib file functions to
 // hopefully will make error checking easier
 // and make forgetting an fclose() harder
-class IOFile : public NonCopyable
+class IOFile
 {
 public:
   IOFile();
@@ -25,6 +24,9 @@ class IOFile : public NonCopyable
 
   ~IOFile();
 
+  IOFile(const IOFile&) = delete;
+  IOFile& operator=(const IOFile&) = delete;
+
   IOFile(IOFile&& other) noexcept;
   IOFile& operator=(IOFile&& other) noexcept;
 

diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
@@ -12,7 +12,6 @@
 #include <sys/stat.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/NonCopyable.h"
 
 #ifdef _WIN32
 #include "Common/StringUtil.h"

diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
@@ -9,7 +9,6 @@
 
 #include "Common/BitSet.h"
 #include "Common/Logging/Log.h"
-#include "Common/NonCopyable.h"
 
 // pure virtual interface
 class LogListener
@@ -28,7 +27,7 @@ class LogListener
   };
 };
 
-class LogManager : NonCopyable
+class LogManager
 {
 public:
   static LogManager* GetInstance();
@@ -66,6 +65,11 @@ class LogManager : NonCopyable
   LogManager();
   ~LogManager();
 
+  LogManager(const LogManager&) = delete;
+  LogManager& operator=(const LogManager&) = delete;
+  LogManager(LogManager&&) = delete;
+  LogManager& operator=(LogManager&&) = delete;
+
   LogTypes::LOG_LEVELS m_level;
   std::array<LogContainer, LogTypes::NUMBER_OF_LOGS> m_log{};
   std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners{};

diff --git a/Source/Core/Common/NonCopyable.h b/Source/Core/Common/NonCopyable.h
diff --git a/Source/Core/Common/PcapFile.h b/Source/Core/Common/PcapFile.h
@@ -18,9 +18,8 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/File.h"
-#include "Common/NonCopyable.h"
 
-class PCAP final : public NonCopyable
+class PCAP final
 {
 public:
   // Takes ownership of the file object. Assumes the file object is already

diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "Common/IniFile.h"
-#include "Common/NonCopyable.h"
 #include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/SI/SI_Device.h"
 #include "Core/TitleDatabase.h"
@@ -52,7 +51,7 @@ enum GPUDeterminismMode
 
 struct BootParameters;
 
-struct SConfig : NonCopyable
+struct SConfig
 {
   // Wii Devices
   bool m_WiiSDCard;
@@ -318,6 +317,11 @@ struct SConfig : NonCopyable
   bool m_SSLDumpRootCA;
   bool m_SSLDumpPeerCert;
 
+  SConfig(const SConfig&) = delete;
+  SConfig& operator=(const SConfig&) = delete;
+  SConfig(SConfig&&) = delete;
+  SConfig& operator=(SConfig&&) = delete;
+
   // Save settings
   void SaveSettings();
 

diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.h b/Source/Core/Core/DSP/DSPCaptureLogger.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/NonCopyable.h"
 
 class PCAP;
 
@@ -51,7 +50,7 @@ class DefaultDSPCaptureLogger : public DSPCaptureLogger
 
 // A capture logger implementation that logs to PCAP files in a custom
 // packet-based format.
-class PCAPDSPCaptureLogger final : public DSPCaptureLogger, NonCopyable
+class PCAPDSPCaptureLogger final : public DSPCaptureLogger
 {
 public:
   // Automatically creates a writeable file (truncate existing file).

diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.h b/Source/Core/Core/HW/GCMemcard/GCMemcard.h
@@ -9,7 +9,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/NandPaths.h"
-#include "Common/NonCopyable.h"
 #include "Common/Swap.h"
 #include "Common/Timer.h"
 
@@ -295,7 +294,7 @@ class GCIFile
   std::string m_filename;
 };
 
-class GCMemcard : NonCopyable
+class GCMemcard
 {
 private:
   bool m_valid;
@@ -317,6 +316,12 @@ class GCMemcard : NonCopyable
 public:
   explicit GCMemcard(const std::string& fileName, bool forceCreation = false,
                      bool shift_jis = false);
+
+  GCMemcard(const GCMemcard&) = delete;
+  GCMemcard& operator=(const GCMemcard&) = delete;
+  GCMemcard(GCMemcard&&) = default;
+  GCMemcard& operator=(GCMemcard&&) = default;
+
   bool IsValid() const { return m_valid; }
   bool IsShiftJIS() const;
   bool Save();

diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.h b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.h
@@ -10,19 +10,24 @@
 #include <vector>
 
 #include "Common/Event.h"
-#include "Common/NonCopyable.h"
 #include "Core/HW/GCMemcard/GCMemcard.h"
 
 // Uncomment this to write the system data of the memorycard from directory to disc
 //#define _WRITE_MC_HEADER 1
 void MigrateFromMemcardFile(const std::string& directory_name, int card_index);
 
-class GCMemcardDirectory : public MemoryCardBase, NonCopyable
+class GCMemcardDirectory : public MemoryCardBase
 {
 public:
   GCMemcardDirectory(const std::string& directory, int slot, u16 size_mbits, bool shift_jis,
                      int game_id);
   ~GCMemcardDirectory();
+
+  GCMemcardDirectory(const GCMemcardDirectory&) = delete;
+  GCMemcardDirectory& operator=(const GCMemcardDirectory&) = delete;
+  GCMemcardDirectory(GCMemcardDirectory&&) = default;
+  GCMemcardDirectory& operator=(GCMemcardDirectory&&) = default;
+
   void FlushToFile();
   void FlushThread();
   s32 Read(u32 src_address, s32 length, u8* dest_address) override;

diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/NonCopyable.h"
 
 // All the templated and very repetitive MMIO-related code is isolated in this
 // file for easier reading. It mostly contains code related to handling methods
@@ -119,7 +118,7 @@ class WriteHandlingMethodVisitor
 // inlinable, we need to provide some of the implementation of these two
 // classes here and can't just use a forward declaration.
 template <typename T>
-class ReadHandler : public NonCopyable
+class ReadHandler
 {
 public:
   ReadHandler();
@@ -155,7 +154,7 @@ class ReadHandler : public NonCopyable
   std::function<T(u32)> m_ReadFunc;
 };
 template <typename T>
-class WriteHandler : public NonCopyable
+class WriteHandler
 {
 public:
   WriteHandler();

diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
@@ -14,7 +14,6 @@
 #include "Common/Event.h"
 #include "Common/FifoQueue.h"
 #include "Common/Flag.h"
-#include "Common/NonCopyable.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteCommon/WiimoteConstants.h"
 #include "Core/HW/WiimoteCommon/WiimoteHid.h"
@@ -24,9 +23,14 @@ class PointerWrap;
 
 namespace WiimoteReal
 {
-class Wiimote : NonCopyable
+class Wiimote
 {
 public:
+  Wiimote(const Wiimote&) = delete;
+  Wiimote& operator=(const Wiimote&) = delete;
+  Wiimote(Wiimote&&) = default;
+  Wiimote& operator=(Wiimote&&) = default;
+
   virtual ~Wiimote() {}
   // This needs to be called in derived destructors!
   void Shutdown();

diff --git a/Source/Core/Core/IOS/Network/Socket.h b/Source/Core/Core/IOS/Network/Socket.h
@@ -50,7 +50,6 @@ typedef struct pollfd pollfd_t;
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/NonCopyable.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IOS/IOS.h"
 #include "Core/IOS/Network/IP/Top.h"
@@ -207,7 +206,7 @@ class WiiSocket
   void operator=(WiiSocket const&) = delete;
 };
 
-class WiiSockMan : public ::NonCopyable
+class WiiSockMan
 {
 public:
   static s32 GetNetErrorCode(s32 ret, const char* caller, bool isRW);
@@ -249,6 +248,10 @@ class WiiSockMan : public ::NonCopyable
 
 private:
   WiiSockMan() = default;
+  WiiSockMan(const WiiSockMan&) = delete;
+  WiiSockMan& operator=(const WiiSockMan&) = delete;
+  WiiSockMan(WiiSockMan&&) = delete;
+  WiiSockMan& operator=(WiiSockMan&&) = delete;
 
   std::unordered_map<s32, WiiSocket> WiiSockets;
   s32 errno_last;

diff --git a/Source/Core/DiscIO/DirectoryBlob.h b/Source/Core/DiscIO/DirectoryBlob.h
@@ -15,7 +15,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-#include "Common/NonCopyable.h"
 #include "DiscIO/Blob.h"
 
 namespace File
@@ -59,13 +58,18 @@ class DiscContent
   ContentSource m_content_source;
 };
 
-// We do not allow copying, because it might mess up the pointers inside DiscContents
-class DirectoryBlobPartition : private NonCopyable
+class DirectoryBlobPartition
 {
 public:
   DirectoryBlobPartition() = default;
   DirectoryBlobPartition(const std::string& root_directory, std::optional<bool> is_wii);
 
+  // We do not allow copying, because it might mess up the pointers inside DiscContents
+  DirectoryBlobPartition(const DirectoryBlobPartition&) = delete;
+  DirectoryBlobPartition& operator=(const DirectoryBlobPartition&) = delete;
+  DirectoryBlobPartition(DirectoryBlobPartition&&) = default;
+  DirectoryBlobPartition& operator=(DirectoryBlobPartition&&) = default;
+
   bool IsWii() const { return m_is_wii; }
   u64 GetDataSize() const { return m_data_size; }
   const std::string& GetRootDirectory() const { return m_root_directory; }
@@ -103,12 +107,17 @@ class DirectoryBlobPartition : private NonCopyable
   u64 m_data_size;
 };
 
-// We do not allow copying, because it might mess up the pointers inside DiscContents
-class DirectoryBlobReader : public BlobReader, private NonCopyable
+class DirectoryBlobReader : public BlobReader
 {
 public:
   static std::unique_ptr<DirectoryBlobReader> Create(const std::string& dol_path);
 
+  // We do not allow copying, because it might mess up the pointers inside DiscContents
+  DirectoryBlobReader(const DirectoryBlobReader&) = delete;
+  DirectoryBlobReader& operator=(const DirectoryBlobReader&) = delete;
+  DirectoryBlobReader(DirectoryBlobReader&&) = default;
+  DirectoryBlobReader& operator=(DirectoryBlobReader&&) = default;
+
   bool Read(u64 offset, u64 length, u8* buffer) override;
   bool SupportsReadWiiDecrypted() const override;
   bool ReadWiiDecrypted(u64 offset, u64 size, u8* buffer, u64 partition_offset) override;