Make overriding explicit and remove redundant virtual specifiers on overriding destructors - Core & UnitTests
This commit is contained in:
parent
4f210df86a
commit
fc2b223d86
|
@ -32,7 +32,7 @@ class WASAPIStream final : public SoundStream
|
|||
#ifdef _WIN32
|
||||
public:
|
||||
explicit WASAPIStream();
|
||||
~WASAPIStream();
|
||||
~WASAPIStream() override;
|
||||
bool Init() override;
|
||||
bool SetRunning(bool running) override;
|
||||
|
||||
|
|
|
@ -31,7 +31,8 @@ public:
|
|||
{
|
||||
m_active_block = &m_output_result.blocks.emplace_back(base_addr);
|
||||
}
|
||||
virtual ~GekkoIRPlugin() = default;
|
||||
|
||||
~GekkoIRPlugin() override = default;
|
||||
|
||||
void OnDirectivePre(GekkoDirective directive) override;
|
||||
void OnDirectivePost(GekkoDirective directive) override;
|
||||
|
|
|
@ -46,8 +46,7 @@ public:
|
|||
ASSERT(!mbedtls_aes_setkey_dec(&ctx, key, 128));
|
||||
}
|
||||
|
||||
virtual bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out,
|
||||
size_t len) const override
|
||||
bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out, size_t len) const override
|
||||
{
|
||||
std::array<u8, BLOCK_SIZE> iv_tmp{};
|
||||
if (iv)
|
||||
|
@ -206,8 +205,7 @@ public:
|
|||
_mm_storeu_si128(&((__m128i*)buf_out)[d], block[d]);
|
||||
}
|
||||
|
||||
virtual bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out,
|
||||
size_t len) const override
|
||||
bool Crypt(const u8* iv, u8* iv_out, const u8* buf_in, u8* buf_out, size_t len) const override
|
||||
{
|
||||
if (len % BLOCK_SIZE)
|
||||
return false;
|
||||
|
|
|
@ -40,18 +40,20 @@ public:
|
|||
mbedtls_sha1_init(&ctx);
|
||||
ASSERT(!mbedtls_sha1_starts_ret(&ctx));
|
||||
}
|
||||
~ContextMbed() { mbedtls_sha1_free(&ctx); }
|
||||
virtual void Update(const u8* msg, size_t len) override
|
||||
~ContextMbed() override { mbedtls_sha1_free(&ctx); }
|
||||
void Update(const u8* msg, size_t len) override
|
||||
{
|
||||
ASSERT(!mbedtls_sha1_update_ret(&ctx, msg, len));
|
||||
}
|
||||
virtual Digest Finish() override
|
||||
|
||||
Digest Finish() override
|
||||
{
|
||||
Digest digest;
|
||||
ASSERT(!mbedtls_sha1_finish_ret(&ctx, digest.data()));
|
||||
return digest;
|
||||
}
|
||||
virtual bool HwAccelerated() const override { return false; }
|
||||
|
||||
bool HwAccelerated() const override { return false; }
|
||||
|
||||
private:
|
||||
mbedtls_sha1_context ctx{};
|
||||
|
@ -67,7 +69,7 @@ protected:
|
|||
virtual void ProcessBlock(const u8* msg) = 0;
|
||||
virtual Digest GetDigest() = 0;
|
||||
|
||||
virtual void Update(const u8* msg, size_t len) override
|
||||
void Update(const u8* msg, size_t len) override
|
||||
{
|
||||
if (len == 0)
|
||||
return;
|
||||
|
@ -104,7 +106,7 @@ protected:
|
|||
}
|
||||
}
|
||||
|
||||
virtual Digest Finish() override
|
||||
Digest Finish() override
|
||||
{
|
||||
// block_used is guaranteed < BLOCK_LEN
|
||||
block[block_used++] = 0x80;
|
||||
|
@ -202,7 +204,8 @@ private:
|
|||
}
|
||||
|
||||
ATTRIBUTE_TARGET("sha")
|
||||
virtual void ProcessBlock(const u8* msg) override
|
||||
|
||||
void ProcessBlock(const u8* msg) override
|
||||
{
|
||||
// There are 80 rounds with 4 bytes per round, giving 0x140 byte work space, but we can keep
|
||||
// active state in just 0x40 bytes.
|
||||
|
@ -246,7 +249,7 @@ private:
|
|||
// clang-format on
|
||||
}
|
||||
|
||||
virtual Digest GetDigest() override
|
||||
Digest GetDigest() override
|
||||
{
|
||||
Digest digest;
|
||||
_mm_storeu_si128((__m128i*)&digest[0], byterev_16B(state[0]));
|
||||
|
@ -255,7 +258,7 @@ private:
|
|||
return digest;
|
||||
}
|
||||
|
||||
virtual bool HwAccelerated() const override { return true; }
|
||||
bool HwAccelerated() const override { return true; }
|
||||
|
||||
std::array<XmmReg, 2> state{};
|
||||
};
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
class GLContextWGL final : public GLContext
|
||||
{
|
||||
public:
|
||||
~GLContextWGL();
|
||||
~GLContextWGL() override;
|
||||
|
||||
bool IsHeadless() const;
|
||||
bool IsHeadless() const override;
|
||||
|
||||
std::unique_ptr<GLContext> CreateSharedContext() override;
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ class HostDisassemblerBochs final : public HostDisassembler
|
|||
{
|
||||
public:
|
||||
explicit HostDisassemblerBochs();
|
||||
~HostDisassemblerBochs() = default;
|
||||
~HostDisassemblerBochs() override = default;
|
||||
|
||||
private:
|
||||
disassembler m_disasm;
|
||||
|
|
|
@ -9,7 +9,7 @@ class ConsoleListener : public Common::Log::LogListener
|
|||
{
|
||||
public:
|
||||
ConsoleListener();
|
||||
~ConsoleListener();
|
||||
~ConsoleListener() override;
|
||||
|
||||
void Log(Common::Log::LogLevel level, const char* text) override;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ public:
|
|||
explicit DolReader(const std::string& filename);
|
||||
explicit DolReader(File::IOFile file);
|
||||
explicit DolReader(std::vector<u8> buffer);
|
||||
~DolReader();
|
||||
~DolReader() override;
|
||||
|
||||
bool IsValid() const override { return m_is_valid; }
|
||||
bool IsWii() const override { return m_is_wii; }
|
||||
|
|
|
@ -28,7 +28,7 @@ public:
|
|||
explicit ElfReader(const std::string& filename);
|
||||
explicit ElfReader(File::IOFile file);
|
||||
explicit ElfReader(std::vector<u8> buffer);
|
||||
~ElfReader();
|
||||
~ElfReader() override;
|
||||
u32 Read32(int off) const { return base32[off >> 2]; }
|
||||
// Quick accessors
|
||||
ElfType GetType() const { return (ElfType)(header->e_type); }
|
||||
|
|
|
@ -132,7 +132,7 @@ class OSThreadView : public Common::Debug::ThreadView
|
|||
{
|
||||
public:
|
||||
explicit OSThreadView(const Core::CPUThreadGuard& guard, u32 addr);
|
||||
~OSThreadView() = default;
|
||||
~OSThreadView() override = default;
|
||||
|
||||
const OSThread& Data() const;
|
||||
|
||||
|
|
|
@ -220,7 +220,7 @@ class FifoPlayer::CPUCore final : public CPUCoreBase
|
|||
public:
|
||||
explicit CPUCore(FifoPlayer* parent) : m_parent(parent) {}
|
||||
CPUCore(const CPUCore&) = delete;
|
||||
~CPUCore() {}
|
||||
~CPUCore() override {}
|
||||
CPUCore& operator=(const CPUCore&) = delete;
|
||||
|
||||
void Init() override
|
||||
|
|
|
@ -157,7 +157,7 @@ class VAListStruct : public VAList
|
|||
{
|
||||
public:
|
||||
explicit VAListStruct(const Core::CPUThreadGuard& guard, u32 address);
|
||||
~VAListStruct() = default;
|
||||
~VAListStruct() override = default;
|
||||
|
||||
private:
|
||||
struct svr4_va_list
|
||||
|
|
|
@ -28,7 +28,7 @@ public:
|
|||
DSPHLE(DSPHLE&& other) = delete;
|
||||
DSPHLE& operator=(const DSPHLE& other) = delete;
|
||||
DSPHLE& operator=(DSPHLE&& other) = delete;
|
||||
~DSPHLE();
|
||||
~DSPHLE() override;
|
||||
|
||||
bool Initialize(bool wii, bool dsp_thread) override;
|
||||
void Shutdown() override;
|
||||
|
|
|
@ -27,7 +27,7 @@ public:
|
|||
AESndAccelerator(AESndAccelerator&&) = delete;
|
||||
AESndAccelerator& operator=(const AESndAccelerator&) = delete;
|
||||
AESndAccelerator& operator=(AESndAccelerator&&) = delete;
|
||||
~AESndAccelerator();
|
||||
~AESndAccelerator() override;
|
||||
|
||||
protected:
|
||||
void OnEndException() override;
|
||||
|
|
|
@ -129,7 +129,7 @@ public:
|
|||
HLEAccelerator(HLEAccelerator&&) = delete;
|
||||
HLEAccelerator& operator=(const HLEAccelerator&) = delete;
|
||||
HLEAccelerator& operator=(HLEAccelerator&&) = delete;
|
||||
~HLEAccelerator() = default;
|
||||
~HLEAccelerator() override = default;
|
||||
|
||||
PB_TYPE* acc_pb = nullptr;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ class DSPLLE : public DSPEmulator
|
|||
{
|
||||
public:
|
||||
DSPLLE();
|
||||
~DSPLLE();
|
||||
~DSPLLE() override;
|
||||
|
||||
bool Initialize(bool wii, bool dsp_thread) override;
|
||||
void Shutdown() override;
|
||||
|
|
|
@ -18,7 +18,7 @@ class CEXIAgp : public IEXIDevice
|
|||
{
|
||||
public:
|
||||
CEXIAgp(Core::System& system, const Slot slot);
|
||||
virtual ~CEXIAgp() override;
|
||||
~CEXIAgp() override;
|
||||
bool IsPresent() const override { return true; }
|
||||
void ImmWrite(u32 _uData, u32 _uSize) override;
|
||||
u32 ImmRead(u32 _uSize) override;
|
||||
|
|
|
@ -216,7 +216,7 @@ class CEXIETHERNET : public IEXIDevice
|
|||
{
|
||||
public:
|
||||
CEXIETHERNET(Core::System& system, BBADeviceType type);
|
||||
virtual ~CEXIETHERNET();
|
||||
~CEXIETHERNET() override;
|
||||
void SetCS(int cs) override;
|
||||
bool IsPresent() const override;
|
||||
bool IsInterruptSet() override;
|
||||
|
|
|
@ -18,7 +18,7 @@ class CEXIMic : public IEXIDevice
|
|||
{
|
||||
public:
|
||||
CEXIMic(Core::System& system, const int index);
|
||||
virtual ~CEXIMic();
|
||||
~CEXIMic() override;
|
||||
void SetCS(int cs) override;
|
||||
bool IsInterruptSet() override;
|
||||
bool IsPresent() const override;
|
||||
|
|
|
@ -33,7 +33,7 @@ class CEXIModem : public IEXIDevice
|
|||
{
|
||||
public:
|
||||
CEXIModem(Core::System& system, ModemDeviceType type);
|
||||
virtual ~CEXIModem();
|
||||
~CEXIModem() override;
|
||||
void SetCS(int cs) override;
|
||||
bool IsPresent() const override;
|
||||
bool IsInterruptSet() override;
|
||||
|
@ -142,13 +142,13 @@ private:
|
|||
TAPServerNetworkInterface(CEXIModem* modem_ref, const std::string& destination);
|
||||
|
||||
public:
|
||||
virtual bool Activate() override;
|
||||
virtual void Deactivate() override;
|
||||
virtual bool IsActivated() override;
|
||||
virtual bool SendAndRemoveAllHDLCFrames(std::string* send_buffer) override;
|
||||
virtual bool RecvInit() override;
|
||||
virtual void RecvStart() override;
|
||||
virtual void RecvStop() override;
|
||||
bool Activate() override;
|
||||
void Deactivate() override;
|
||||
bool IsActivated() override;
|
||||
bool SendAndRemoveAllHDLCFrames(std::string* send_buffer) override;
|
||||
bool RecvInit() override;
|
||||
void RecvStart() override;
|
||||
void RecvStop() override;
|
||||
|
||||
private:
|
||||
TAPServerConnection m_tapserver_if;
|
||||
|
|
|
@ -24,7 +24,7 @@ class GCMemcardDirectory : public MemoryCardBase
|
|||
public:
|
||||
GCMemcardDirectory(const std::string& directory, ExpansionInterface::Slot slot,
|
||||
const Memcard::HeaderData& header_data, u32 game_id);
|
||||
~GCMemcardDirectory();
|
||||
~GCMemcardDirectory() override;
|
||||
|
||||
GCMemcardDirectory(const GCMemcardDirectory&) = delete;
|
||||
GCMemcardDirectory& operator=(const GCMemcardDirectory&) = delete;
|
||||
|
|
|
@ -19,7 +19,7 @@ class MemoryCard : public MemoryCardBase
|
|||
public:
|
||||
MemoryCard(const std::string& filename, ExpansionInterface::Slot card_slot,
|
||||
u16 size_mbits = Memcard::MBIT_SIZE_MEMORY_CARD_2043);
|
||||
~MemoryCard();
|
||||
~MemoryCard() override;
|
||||
void FlushThread();
|
||||
void MakeDirty();
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ class ConstantHandlingMethod : public ReadHandlingMethod<T>
|
|||
{
|
||||
public:
|
||||
explicit ConstantHandlingMethod(T value) : value_(value) {}
|
||||
virtual ~ConstantHandlingMethod() = default;
|
||||
~ConstantHandlingMethod() override = default;
|
||||
void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
|
||||
{
|
||||
v.VisitConstant(value_);
|
||||
|
@ -62,7 +62,7 @@ class NopHandlingMethod : public WriteHandlingMethod<T>
|
|||
{
|
||||
public:
|
||||
NopHandlingMethod() {}
|
||||
virtual ~NopHandlingMethod() = default;
|
||||
~NopHandlingMethod() override = default;
|
||||
void AcceptWriteVisitor(WriteHandlingMethodVisitor<T>& v) const override { v.VisitNop(); }
|
||||
};
|
||||
template <typename T>
|
||||
|
@ -79,7 +79,7 @@ class DirectHandlingMethod : public ReadHandlingMethod<T>, public WriteHandlingM
|
|||
{
|
||||
public:
|
||||
DirectHandlingMethod(T* addr, u32 mask) : addr_(addr), mask_(mask) {}
|
||||
virtual ~DirectHandlingMethod() = default;
|
||||
~DirectHandlingMethod() override = default;
|
||||
void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
|
||||
{
|
||||
v.VisitDirect(addr_, mask_);
|
||||
|
@ -122,7 +122,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual ~ComplexHandlingMethod() = default;
|
||||
~ComplexHandlingMethod() override = default;
|
||||
void AcceptReadVisitor(ReadHandlingMethodVisitor<T>& v) const override
|
||||
{
|
||||
v.VisitComplex(&read_lambda_);
|
||||
|
|
|
@ -21,7 +21,7 @@ class CSIDevice_GBAEmu final : public ISIDevice
|
|||
{
|
||||
public:
|
||||
CSIDevice_GBAEmu(Core::System& system, SIDevices device, int device_number);
|
||||
~CSIDevice_GBAEmu();
|
||||
~CSIDevice_GBAEmu() override;
|
||||
|
||||
int RunBuffer(u8* buffer, int request_length) override;
|
||||
int TransferInterval() override;
|
||||
|
|
|
@ -120,7 +120,7 @@ protected:
|
|||
using EncryptedExtension::EncryptedExtension;
|
||||
|
||||
private:
|
||||
void UpdateEncryptionKey() final override;
|
||||
void UpdateEncryptionKey() final;
|
||||
};
|
||||
|
||||
class Extension3rdParty : public EncryptedExtension
|
||||
|
@ -129,7 +129,7 @@ protected:
|
|||
using EncryptedExtension::EncryptedExtension;
|
||||
|
||||
private:
|
||||
void UpdateEncryptionKey() final override;
|
||||
void UpdateEncryptionKey() final;
|
||||
};
|
||||
|
||||
} // namespace WiimoteEmu
|
||||
|
|
|
@ -137,7 +137,7 @@ public:
|
|||
static constexpr const char* SIDEWAYS_OPTION = "Sideways Wiimote";
|
||||
|
||||
explicit Wiimote(unsigned int index);
|
||||
~Wiimote();
|
||||
~Wiimote() override;
|
||||
|
||||
std::string GetName() const override;
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ class WiimoteScannerHidapi final : public WiimoteScannerBackend
|
|||
{
|
||||
public:
|
||||
WiimoteScannerHidapi();
|
||||
~WiimoteScannerHidapi();
|
||||
~WiimoteScannerHidapi() override;
|
||||
bool IsReady() const override;
|
||||
void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
|
||||
void Update() override {} // not needed for hidapi
|
||||
|
|
|
@ -232,7 +232,7 @@ class HotkeyManager : public ControllerEmu::EmulatedController
|
|||
{
|
||||
public:
|
||||
HotkeyManager();
|
||||
~HotkeyManager();
|
||||
~HotkeyManager() override;
|
||||
|
||||
void GetInput(HotkeyStatus* hk, bool ignore_focus);
|
||||
std::string GetName() const override;
|
||||
|
|
|
@ -234,7 +234,7 @@ public:
|
|||
ESDevice(ESDevice&& other) = delete;
|
||||
ESDevice& operator=(const ESDevice& other) = delete;
|
||||
ESDevice& operator=(ESDevice&& other) = delete;
|
||||
~ESDevice();
|
||||
~ESDevice() override;
|
||||
|
||||
static void InitializeEmulationState(CoreTiming::CoreTimingManager& core_timing);
|
||||
static void FinalizeEmulationState();
|
||||
|
|
|
@ -117,7 +117,7 @@ class FSDevice final : public EmulationDevice
|
|||
{
|
||||
public:
|
||||
FSDevice(EmulationKernel& ios, FSCore& core, const std::string& device_name);
|
||||
~FSDevice();
|
||||
~FSDevice() override;
|
||||
|
||||
void DoState(PointerWrap& p) override;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ class HostFileSystem final : public FileSystem
|
|||
{
|
||||
public:
|
||||
HostFileSystem(const std::string& root_path, std::vector<NandRedirect> nand_redirects = {});
|
||||
~HostFileSystem();
|
||||
~HostFileSystem() override;
|
||||
|
||||
void DoState(PointerWrap& p) override;
|
||||
|
||||
|
|
|
@ -153,7 +153,7 @@ class EmulationKernel final : public Kernel
|
|||
{
|
||||
public:
|
||||
EmulationKernel(Core::System& system, u64 ios_title_id);
|
||||
~EmulationKernel();
|
||||
~EmulationKernel() override;
|
||||
|
||||
// Get a resource manager by name.
|
||||
// This only works for devices which are part of the device map.
|
||||
|
|
|
@ -84,7 +84,7 @@ class NetSSLDevice : public EmulationDevice
|
|||
public:
|
||||
NetSSLDevice(EmulationKernel& ios, const std::string& device_name);
|
||||
|
||||
virtual ~NetSSLDevice();
|
||||
~NetSSLDevice() override;
|
||||
|
||||
std::optional<IPCReply> IOCtl(const IOCtlRequest& request) override;
|
||||
std::optional<IPCReply> IOCtlV(const IOCtlVRequest& request) override;
|
||||
|
|
|
@ -41,7 +41,7 @@ class BluetoothEmuDevice final : public BluetoothBaseDevice
|
|||
public:
|
||||
BluetoothEmuDevice(EmulationKernel& ios, const std::string& device_name);
|
||||
|
||||
virtual ~BluetoothEmuDevice();
|
||||
~BluetoothEmuDevice() override;
|
||||
|
||||
std::optional<IPCReply> Close(u32 fd) override;
|
||||
std::optional<IPCReply> IOCtlV(const IOCtlVRequest& request) override;
|
||||
|
|
|
@ -73,7 +73,7 @@ class SkylanderUSB final : public Device
|
|||
{
|
||||
public:
|
||||
SkylanderUSB(EmulationKernel& ios);
|
||||
~SkylanderUSB();
|
||||
~SkylanderUSB() override;
|
||||
DeviceDescriptor GetDeviceDescriptor() const override;
|
||||
std::vector<ConfigDescriptor> GetConfigurations() const override;
|
||||
std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
|
||||
|
|
|
@ -30,7 +30,7 @@ class USBHost : public EmulationDevice
|
|||
{
|
||||
public:
|
||||
USBHost(EmulationKernel& ios, const std::string& device_name);
|
||||
virtual ~USBHost();
|
||||
~USBHost() override;
|
||||
|
||||
std::optional<IPCReply> Open(const OpenRequest& request) override;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ class LibusbDevice final : public Device
|
|||
public:
|
||||
LibusbDevice(EmulationKernel& ios, libusb_device* device,
|
||||
const libusb_device_descriptor& device_descriptor);
|
||||
~LibusbDevice();
|
||||
~LibusbDevice() override;
|
||||
DeviceDescriptor GetDeviceDescriptor() const override;
|
||||
std::vector<ConfigDescriptor> GetConfigurations() const override;
|
||||
std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
|
||||
|
|
|
@ -116,7 +116,7 @@ public:
|
|||
|
||||
NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog,
|
||||
const std::string& name, const NetTraversalConfig& traversal_config);
|
||||
~NetPlayClient();
|
||||
~NetPlayClient() override;
|
||||
|
||||
std::vector<const Player*> GetPlayers();
|
||||
const NetSettings& GetNetSettings() const;
|
||||
|
|
|
@ -44,7 +44,7 @@ public:
|
|||
|
||||
NetPlayServer(u16 port, bool forward_port, NetPlayUI* dialog,
|
||||
const NetTraversalConfig& traversal_config);
|
||||
~NetPlayServer();
|
||||
~NetPlayServer() override;
|
||||
|
||||
bool ChangeGame(const SyncIdentifier& sync_identifier, const std::string& netplay_name);
|
||||
bool ComputeGameDigest(const SyncIdentifier& sync_identifier);
|
||||
|
|
|
@ -86,7 +86,7 @@ class PCAPSSLCaptureLogger final : public NetworkCaptureLogger
|
|||
{
|
||||
public:
|
||||
PCAPSSLCaptureLogger();
|
||||
~PCAPSSLCaptureLogger();
|
||||
~PCAPSSLCaptureLogger() override;
|
||||
|
||||
void OnNewSocket(s32 socket) override;
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ public:
|
|||
CachedInterpreter(CachedInterpreter&&) = delete;
|
||||
CachedInterpreter& operator=(const CachedInterpreter&) = delete;
|
||||
CachedInterpreter& operator=(CachedInterpreter&&) = delete;
|
||||
~CachedInterpreter();
|
||||
~CachedInterpreter() override;
|
||||
|
||||
void Init() override;
|
||||
void Shutdown() override;
|
||||
|
|
|
@ -30,7 +30,7 @@ public:
|
|||
Interpreter(Interpreter&&) = delete;
|
||||
Interpreter& operator=(const Interpreter&) = delete;
|
||||
Interpreter& operator=(Interpreter&&) = delete;
|
||||
~Interpreter();
|
||||
~Interpreter() override;
|
||||
|
||||
void Init() override;
|
||||
void Shutdown() override;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
class CSVSignatureDB final : public HashSignatureDB
|
||||
{
|
||||
public:
|
||||
~CSVSignatureDB() = default;
|
||||
~CSVSignatureDB() override = default;
|
||||
bool Load(const std::string& file_path) override;
|
||||
bool Save(const std::string& file_path) const override;
|
||||
};
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
class DSYSignatureDB final : public HashSignatureDB
|
||||
{
|
||||
public:
|
||||
~DSYSignatureDB() = default;
|
||||
~DSYSignatureDB() override = default;
|
||||
bool Load(const std::string& file_path) override;
|
||||
bool Save(const std::string& file_path) const override;
|
||||
};
|
||||
|
|
|
@ -107,7 +107,7 @@ protected:
|
|||
class SectorReader : public BlobReader
|
||||
{
|
||||
public:
|
||||
virtual ~SectorReader() = 0;
|
||||
~SectorReader() override = 0;
|
||||
|
||||
bool Read(u64 offset, u64 size, u8* out_ptr) override;
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ class CompressedBlobReader : public SectorReader
|
|||
public:
|
||||
static std::unique_ptr<CompressedBlobReader> Create(File::IOFile file,
|
||||
const std::string& filename);
|
||||
~CompressedBlobReader();
|
||||
~CompressedBlobReader() override;
|
||||
|
||||
const CompressedBlobHeader& GetHeader() const { return m_header; }
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ class VolumeGC : public VolumeDisc
|
|||
{
|
||||
public:
|
||||
VolumeGC(std::unique_ptr<BlobReader> reader);
|
||||
~VolumeGC();
|
||||
~VolumeGC() override;
|
||||
bool Read(u64 offset, u64 length, u8* buffer,
|
||||
const Partition& partition = PARTITION_NONE) const override;
|
||||
const FileSystem* GetFileSystem(const Partition& partition = PARTITION_NONE) const override;
|
||||
|
|
|
@ -58,7 +58,7 @@ public:
|
|||
static_assert(sizeof(HashBlock) == BLOCK_HEADER_SIZE);
|
||||
|
||||
VolumeWii(std::unique_ptr<BlobReader> reader);
|
||||
~VolumeWii();
|
||||
~VolumeWii() override;
|
||||
bool Read(u64 offset, u64 length, u8* buffer, const Partition& partition) const override;
|
||||
bool HasWiiHashes() const override;
|
||||
bool HasWiiEncryption() const override;
|
||||
|
|
|
@ -44,7 +44,7 @@ template <bool RVZ>
|
|||
class WIARVZFileReader : public BlobReader
|
||||
{
|
||||
public:
|
||||
~WIARVZFileReader();
|
||||
~WIARVZFileReader() override;
|
||||
|
||||
static std::unique_ptr<WIARVZFileReader> Create(File::IOFile file, const std::string& path);
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ private:
|
|||
class Bzip2Decompressor final : public Decompressor
|
||||
{
|
||||
public:
|
||||
~Bzip2Decompressor();
|
||||
~Bzip2Decompressor() override;
|
||||
|
||||
bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out,
|
||||
size_t* in_bytes_read) override;
|
||||
|
@ -89,7 +89,7 @@ class LZMADecompressor final : public Decompressor
|
|||
{
|
||||
public:
|
||||
LZMADecompressor(bool lzma2, const u8* filter_options, size_t filter_options_size);
|
||||
~LZMADecompressor();
|
||||
~LZMADecompressor() override;
|
||||
|
||||
bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out,
|
||||
size_t* in_bytes_read) override;
|
||||
|
@ -106,7 +106,7 @@ class ZstdDecompressor final : public Decompressor
|
|||
{
|
||||
public:
|
||||
ZstdDecompressor();
|
||||
~ZstdDecompressor();
|
||||
~ZstdDecompressor() override;
|
||||
|
||||
bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out,
|
||||
size_t* in_bytes_read) override;
|
||||
|
@ -164,7 +164,7 @@ class PurgeCompressor final : public Compressor
|
|||
{
|
||||
public:
|
||||
PurgeCompressor();
|
||||
~PurgeCompressor();
|
||||
~PurgeCompressor() override;
|
||||
|
||||
bool Start(std::optional<u64> size) override;
|
||||
bool AddPrecedingDataOnlyForPurgeHashing(const u8* data, size_t size) override;
|
||||
|
@ -184,7 +184,7 @@ class Bzip2Compressor final : public Compressor
|
|||
{
|
||||
public:
|
||||
Bzip2Compressor(int compression_level);
|
||||
~Bzip2Compressor();
|
||||
~Bzip2Compressor() override;
|
||||
|
||||
bool Start(std::optional<u64> size) override;
|
||||
bool Compress(const u8* data, size_t size) override;
|
||||
|
@ -206,7 +206,7 @@ class LZMACompressor final : public Compressor
|
|||
public:
|
||||
LZMACompressor(bool lzma2, int compression_level, u8 compressor_data_out[7],
|
||||
u8* compressor_data_size_out);
|
||||
~LZMACompressor();
|
||||
~LZMACompressor() override;
|
||||
|
||||
bool Start(std::optional<u64> size) override;
|
||||
bool Compress(const u8* data, size_t size) override;
|
||||
|
@ -229,7 +229,7 @@ class ZstdCompressor final : public Compressor
|
|||
{
|
||||
public:
|
||||
ZstdCompressor(int compression_level);
|
||||
~ZstdCompressor();
|
||||
~ZstdCompressor() override;
|
||||
|
||||
bool Start(std::optional<u64> size) override;
|
||||
bool Compress(const u8* data, size_t size) override;
|
||||
|
|
|
@ -18,7 +18,7 @@ static constexpr u32 WBFS_MAGIC = 0x53464257; // "WBFS" (byteswapped to little
|
|||
class WbfsFileReader : public BlobReader
|
||||
{
|
||||
public:
|
||||
~WbfsFileReader();
|
||||
~WbfsFileReader() override;
|
||||
|
||||
static std::unique_ptr<WbfsFileReader> Create(File::IOFile file, const std::string& path);
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ public:
|
|||
void SetTitle(const std::string& string) override;
|
||||
void MainLoop() override;
|
||||
|
||||
WindowSystemInfo GetWindowSystemInfo() const;
|
||||
WindowSystemInfo GetWindowSystemInfo() const override;
|
||||
|
||||
private:
|
||||
static constexpr TCHAR WINDOW_CLASS_NAME[] = _T("DolphinNoGUI");
|
||||
|
|
|
@ -34,7 +34,7 @@ class CheatsManager : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit CheatsManager(Core::System& system, QWidget* parent = nullptr);
|
||||
~CheatsManager();
|
||||
~CheatsManager() override;
|
||||
|
||||
signals:
|
||||
void OpenGeneralSettings();
|
||||
|
|
|
@ -17,7 +17,7 @@ class GameConfigHighlighter : public QSyntaxHighlighter
|
|||
|
||||
public:
|
||||
explicit GameConfigHighlighter(QTextDocument* parent = nullptr);
|
||||
~GameConfigHighlighter();
|
||||
~GameConfigHighlighter() override;
|
||||
|
||||
protected:
|
||||
void highlightBlock(const QString& text) override;
|
||||
|
|
|
@ -29,7 +29,7 @@ class GameConfigWidget : public QWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit GameConfigWidget(const UICommon::GameFile& game);
|
||||
~GameConfigWidget();
|
||||
~GameConfigWidget() override;
|
||||
|
||||
private:
|
||||
void CreateWidgets();
|
||||
|
|
|
@ -27,7 +27,7 @@ class PostProcessingConfigWindow final : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit PostProcessingConfigWindow(EnhancementsWidget* parent, const std::string& shader);
|
||||
~PostProcessingConfigWindow();
|
||||
~PostProcessingConfigWindow() override;
|
||||
|
||||
private:
|
||||
class ConfigGroup final
|
||||
|
|
|
@ -35,7 +35,7 @@ class GraphicsModListWidget : public QWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit GraphicsModListWidget(const UICommon::GameFile& game);
|
||||
~GraphicsModListWidget();
|
||||
~GraphicsModListWidget() override;
|
||||
|
||||
void SaveToDisk();
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ class LogConfigWidget final : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit LogConfigWidget(QWidget* parent = nullptr);
|
||||
~LogConfigWidget();
|
||||
~LogConfigWidget() override;
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent* event) override;
|
||||
|
|
|
@ -23,7 +23,7 @@ class LogWidget final : public QDockWidget, Common::Log::LogListener
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit LogWidget(QWidget* parent = nullptr);
|
||||
~LogWidget();
|
||||
~LogWidget() override;
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent*) override;
|
||||
|
|
|
@ -15,7 +15,7 @@ class GCPadWiiUConfigDialog final : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit GCPadWiiUConfigDialog(int port, QWidget* parent = nullptr);
|
||||
~GCPadWiiUConfigDialog();
|
||||
~GCPadWiiUConfigDialog() override;
|
||||
|
||||
private:
|
||||
void LoadSettings();
|
||||
|
|
|
@ -31,10 +31,10 @@ public:
|
|||
|
||||
bool ApplicationCloseRequest();
|
||||
|
||||
~AssemblerWidget();
|
||||
~AssemblerWidget() override;
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent*);
|
||||
void closeEvent(QCloseEvent*) override;
|
||||
|
||||
private:
|
||||
enum class AsmKind
|
||||
|
|
|
@ -65,7 +65,8 @@ public:
|
|||
CustomDelegate(BreakpointWidget* parent) : QStyledItemDelegate(parent) {}
|
||||
|
||||
private:
|
||||
void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
|
||||
void paint(QPainter* painter, const QStyleOptionViewItem& option,
|
||||
const QModelIndex& index) const override
|
||||
{
|
||||
Q_ASSERT(index.isValid());
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ class BreakpointWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit BreakpointWidget(QWidget* parent = nullptr);
|
||||
~BreakpointWidget();
|
||||
~BreakpointWidget() override;
|
||||
|
||||
void AddBP(u32 addr);
|
||||
void AddBP(u32 addr, bool break_on_hit, bool log_on_hit, const QString& condition);
|
||||
|
|
|
@ -33,7 +33,7 @@ class CodeWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit CodeWidget(QWidget* parent = nullptr);
|
||||
~CodeWidget();
|
||||
~CodeWidget() override;
|
||||
|
||||
void Step();
|
||||
void StepOver();
|
||||
|
|
|
@ -16,7 +16,7 @@ using namespace Common::GekkoAssembler::detail;
|
|||
class HighlightParsePlugin : public ParsePlugin
|
||||
{
|
||||
public:
|
||||
virtual ~HighlightParsePlugin() = default;
|
||||
~HighlightParsePlugin() override = default;
|
||||
|
||||
std::vector<std::pair<int, int>>&& MoveParens() { return std::move(m_matched_parens); }
|
||||
std::vector<std::tuple<int, int, HighlightFormat>>&& MoveFormatting()
|
||||
|
|
|
@ -32,7 +32,7 @@ class MemoryWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit MemoryWidget(Core::System& system, QWidget* parent = nullptr);
|
||||
~MemoryWidget();
|
||||
~MemoryWidget() override;
|
||||
|
||||
void SetAddress(u32 address);
|
||||
void Update();
|
||||
|
|
|
@ -21,7 +21,7 @@ class NetworkWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit NetworkWidget(QWidget* parent = nullptr);
|
||||
~NetworkWidget();
|
||||
~NetworkWidget() override;
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent*) override;
|
||||
|
|
|
@ -23,7 +23,7 @@ class RegisterWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit RegisterWidget(QWidget* parent = nullptr);
|
||||
~RegisterWidget();
|
||||
~RegisterWidget() override;
|
||||
|
||||
signals:
|
||||
void RequestTableUpdate();
|
||||
|
|
|
@ -19,7 +19,7 @@ class ThreadWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit ThreadWidget(QWidget* parent = nullptr);
|
||||
~ThreadWidget();
|
||||
~ThreadWidget() override;
|
||||
|
||||
signals:
|
||||
void RequestBreakpoint(u32 addr);
|
||||
|
|
|
@ -25,7 +25,7 @@ class WatchWidget : public QDockWidget
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit WatchWidget(QWidget* parent = nullptr);
|
||||
~WatchWidget();
|
||||
~WatchWidget() override;
|
||||
|
||||
void AddWatch(QString name, u32 addr);
|
||||
signals:
|
||||
|
|
|
@ -22,7 +22,7 @@ class DiscordHandler : public QObject, public Discord::Handler
|
|||
#ifdef USE_DISCORD_PRESENCE
|
||||
public:
|
||||
explicit DiscordHandler(QWidget* parent);
|
||||
~DiscordHandler();
|
||||
~DiscordHandler() override;
|
||||
|
||||
void Start();
|
||||
void Stop();
|
||||
|
|
|
@ -26,7 +26,7 @@ class FIFOAnalyzer final : public QWidget
|
|||
|
||||
public:
|
||||
explicit FIFOAnalyzer(FifoPlayer& fifo_player);
|
||||
~FIFOAnalyzer();
|
||||
~FIFOAnalyzer() override;
|
||||
|
||||
void Update();
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ class FIFOPlayerWindow : public QWidget
|
|||
public:
|
||||
explicit FIFOPlayerWindow(FifoPlayer& fifo_player, FifoRecorder& fifo_recorder,
|
||||
QWidget* parent = nullptr);
|
||||
~FIFOPlayerWindow();
|
||||
~FIFOPlayerWindow() override;
|
||||
|
||||
signals:
|
||||
void LoadFIFORequested(const QString& path);
|
||||
|
@ -50,7 +50,7 @@ private:
|
|||
void UpdateInfo();
|
||||
void UpdateLimits();
|
||||
|
||||
bool eventFilter(QObject* object, QEvent* event) final override;
|
||||
bool eventFilter(QObject* object, QEvent* event) final;
|
||||
|
||||
FifoPlayer& m_fifo_player;
|
||||
FifoRecorder& m_fifo_recorder;
|
||||
|
|
|
@ -18,7 +18,7 @@ class GBAHost : public GBAHostInterface
|
|||
{
|
||||
public:
|
||||
explicit GBAHost(std::weak_ptr<HW::GBA::Core> core);
|
||||
~GBAHost();
|
||||
~GBAHost() override;
|
||||
void GameChanged() override;
|
||||
void FrameEnded(const std::vector<u32>& video_buffer) override;
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ class GCMemcardCreateNewDialog : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit GCMemcardCreateNewDialog(QWidget* parent = nullptr);
|
||||
~GCMemcardCreateNewDialog();
|
||||
~GCMemcardCreateNewDialog() override;
|
||||
|
||||
std::string GetMemoryCardPath() const;
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ class GCMemcardManager : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit GCMemcardManager(QWidget* parent = nullptr);
|
||||
~GCMemcardManager();
|
||||
~GCMemcardManager() override;
|
||||
|
||||
static QString GetErrorMessagesForErrorCode(const Memcard::GCMemcardErrorCode& code);
|
||||
static QString GetErrorMessageForErrorCode(Memcard::ReadSavefileErrorCode code);
|
||||
|
|
|
@ -26,7 +26,7 @@ class GameList final : public QStackedWidget
|
|||
|
||||
public:
|
||||
explicit GameList(QWidget* parent = nullptr);
|
||||
~GameList();
|
||||
~GameList() override;
|
||||
|
||||
std::shared_ptr<const UICommon::GameFile> GetSelectedGame() const;
|
||||
QList<std::shared_ptr<const UICommon::GameFile>> GetSelectedGames() const;
|
||||
|
|
|
@ -17,7 +17,7 @@ class Host final : public QObject
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
~Host();
|
||||
~Host() override;
|
||||
|
||||
static Host* GetInstance();
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ class HotkeyScheduler : public QObject
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit HotkeyScheduler();
|
||||
~HotkeyScheduler();
|
||||
~HotkeyScheduler() override;
|
||||
|
||||
void Start();
|
||||
void Stop();
|
||||
|
|
|
@ -81,7 +81,7 @@ class MainWindow final : public QMainWindow
|
|||
public:
|
||||
explicit MainWindow(Core::System& system, std::unique_ptr<BootParameters> boot_parameters,
|
||||
const std::string& movie_path);
|
||||
~MainWindow();
|
||||
~MainWindow() override;
|
||||
|
||||
WindowSystemInfo GetWindowSystemInfo() const;
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ class NetPlayBrowser : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit NetPlayBrowser(QWidget* parent = nullptr);
|
||||
~NetPlayBrowser();
|
||||
~NetPlayBrowser() override;
|
||||
|
||||
void accept() override;
|
||||
signals:
|
||||
|
|
|
@ -40,7 +40,7 @@ public:
|
|||
|
||||
explicit NetPlayDialog(const GameListModel& game_list_model,
|
||||
StartGameCallback start_game_callback, QWidget* parent = nullptr);
|
||||
~NetPlayDialog();
|
||||
~NetPlayDialog() override;
|
||||
|
||||
void show(std::string nickname, bool use_traversal);
|
||||
void reject() override;
|
||||
|
|
|
@ -14,9 +14,9 @@ public:
|
|||
Qt::TextElideMode elideMode() const;
|
||||
void setElideMode(Qt::TextElideMode elide_mode);
|
||||
|
||||
QSize sizeHint() const final override;
|
||||
QSize sizeHint() const final;
|
||||
|
||||
private:
|
||||
void paintEvent(QPaintEvent* event) final override;
|
||||
void paintEvent(QPaintEvent* event) final;
|
||||
Qt::TextElideMode m_elide_mode;
|
||||
};
|
||||
|
|
|
@ -24,7 +24,7 @@ public:
|
|||
explicit RiivolutionBootWidget(std::string game_id, std::optional<u16> revision,
|
||||
std::optional<u8> disc, std::string base_game_path,
|
||||
QWidget* parent = nullptr);
|
||||
~RiivolutionBootWidget();
|
||||
~RiivolutionBootWidget() override;
|
||||
|
||||
bool ShouldBoot() const { return m_should_boot; }
|
||||
std::vector<DiscIO::Riivolution::Patch>& GetPatches() { return m_patches; }
|
||||
|
|
|
@ -24,7 +24,7 @@ private:
|
|||
void CreateWidgets();
|
||||
void ConnectWidgets();
|
||||
|
||||
bool eventFilter(QObject* object, QEvent* event) final override;
|
||||
bool eventFilter(QObject* object, QEvent* event) final;
|
||||
|
||||
QLineEdit* m_search_edit;
|
||||
QPushButton* m_close_button;
|
||||
|
|
|
@ -43,7 +43,7 @@ public:
|
|||
Settings(Settings&&) = delete;
|
||||
Settings& operator=(Settings&&) = delete;
|
||||
|
||||
~Settings();
|
||||
~Settings() override;
|
||||
|
||||
void UnregisterDevicesChangedCallback();
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ private:
|
|||
QVBoxLayout* CreateSlotLayout();
|
||||
QVBoxLayout* CreateFinderLayout();
|
||||
void closeEvent(QCloseEvent* bar) override;
|
||||
bool eventFilter(QObject* object, QEvent* event) final override;
|
||||
bool eventFilter(QObject* object, QEvent* event) final;
|
||||
|
||||
// UI
|
||||
void EmulatePortal(bool emulate);
|
||||
|
|
|
@ -17,7 +17,7 @@ public:
|
|||
AnalogStick(const char* name, std::unique_ptr<StickGate>&& stick_gate);
|
||||
AnalogStick(const char* name, const char* ui_name, std::unique_ptr<StickGate>&& stick_gate);
|
||||
|
||||
ReshapeData GetReshapableState(bool adjusted) const final override;
|
||||
ReshapeData GetReshapableState(bool adjusted) const final;
|
||||
ControlState GetGateRadiusAtAngle(double ang) const override;
|
||||
|
||||
StateData GetState() const;
|
||||
|
|
|
@ -24,7 +24,7 @@ public:
|
|||
|
||||
Cursor(std::string name, std::string ui_name);
|
||||
|
||||
ReshapeData GetReshapableState(bool adjusted) const final override;
|
||||
ReshapeData GetReshapableState(bool adjusted) const final;
|
||||
ControlState GetGateRadiusAtAngle(double ang) const override;
|
||||
|
||||
// Modifies the state
|
||||
|
|
|
@ -18,10 +18,10 @@ public:
|
|||
|
||||
explicit Force(const std::string& name);
|
||||
|
||||
ReshapeData GetReshapableState(bool adjusted) const final override;
|
||||
ControlState GetGateRadiusAtAngle(double ang) const final override;
|
||||
ReshapeData GetReshapableState(bool adjusted) const final;
|
||||
ControlState GetGateRadiusAtAngle(double ang) const final;
|
||||
|
||||
ControlState GetDefaultInputRadiusAtAngle(double angle) const final override;
|
||||
ControlState GetDefaultInputRadiusAtAngle(double angle) const final;
|
||||
|
||||
StateData GetState(bool adjusted = true) const;
|
||||
|
||||
|
|
|
@ -18,12 +18,12 @@ public:
|
|||
|
||||
explicit Tilt(const std::string& name);
|
||||
|
||||
ReshapeData GetReshapableState(bool adjusted) const final override;
|
||||
ControlState GetGateRadiusAtAngle(double angle) const final override;
|
||||
ReshapeData GetReshapableState(bool adjusted) const final;
|
||||
ControlState GetGateRadiusAtAngle(double angle) const final;
|
||||
|
||||
// Tilt is using the gate radius to adjust the tilt angle so we must provide an unadjusted value
|
||||
// for the default input radius.
|
||||
ControlState GetDefaultInputRadiusAtAngle(double angle) const final override;
|
||||
ControlState GetDefaultInputRadiusAtAngle(double angle) const final;
|
||||
|
||||
StateData GetState() const;
|
||||
|
||||
|
|
|
@ -235,7 +235,7 @@ protected:
|
|||
class EmulatedController : public ControlGroupContainer
|
||||
{
|
||||
public:
|
||||
virtual ~EmulatedController();
|
||||
~EmulatedController() override;
|
||||
|
||||
virtual InputConfig* GetConfig() const = 0;
|
||||
|
||||
|
|
|
@ -36,8 +36,8 @@ class OctagonStickGate : public StickGate
|
|||
public:
|
||||
// Radius of circumscribed circle
|
||||
explicit OctagonStickGate(ControlState radius);
|
||||
ControlState GetRadiusAtAngle(double ang) const override final;
|
||||
std::optional<u32> GetIdealCalibrationSampleCount() const override final;
|
||||
ControlState GetRadiusAtAngle(double ang) const final;
|
||||
std::optional<u32> GetIdealCalibrationSampleCount() const final;
|
||||
|
||||
private:
|
||||
const ControlState m_radius;
|
||||
|
@ -48,8 +48,8 @@ class RoundStickGate : public StickGate
|
|||
{
|
||||
public:
|
||||
explicit RoundStickGate(ControlState radius);
|
||||
ControlState GetRadiusAtAngle(double ang) const override final;
|
||||
std::optional<u32> GetIdealCalibrationSampleCount() const override final;
|
||||
ControlState GetRadiusAtAngle(double ang) const final;
|
||||
std::optional<u32> GetIdealCalibrationSampleCount() const final;
|
||||
|
||||
private:
|
||||
const ControlState m_radius;
|
||||
|
@ -60,8 +60,8 @@ class SquareStickGate : public StickGate
|
|||
{
|
||||
public:
|
||||
explicit SquareStickGate(ControlState half_width);
|
||||
ControlState GetRadiusAtAngle(double ang) const override final;
|
||||
std::optional<u32> GetIdealCalibrationSampleCount() const override final;
|
||||
ControlState GetRadiusAtAngle(double ang) const final;
|
||||
std::optional<u32> GetIdealCalibrationSampleCount() const final;
|
||||
|
||||
private:
|
||||
const ControlState m_half_width;
|
||||
|
|
|
@ -117,7 +117,7 @@ public:
|
|||
class Output : public Control
|
||||
{
|
||||
public:
|
||||
virtual ~Output() = default;
|
||||
~Output() override = default;
|
||||
virtual void SetState(ControlState state) = 0;
|
||||
Output* ToOutput() override { return this; }
|
||||
};
|
||||
|
|
|
@ -60,13 +60,13 @@ public:
|
|||
Core::DeviceRemoval UpdateInput() override;
|
||||
|
||||
Joystick(const LPDIRECTINPUTDEVICE8 device);
|
||||
~Joystick();
|
||||
~Joystick() override;
|
||||
|
||||
std::string GetName() const override;
|
||||
std::string GetSource() const override;
|
||||
int GetSortPriority() const override { return -3; }
|
||||
|
||||
bool IsValid() const final override;
|
||||
bool IsValid() const final;
|
||||
|
||||
private:
|
||||
const LPDIRECTINPUTDEVICE8 m_device;
|
||||
|
|
|
@ -97,7 +97,7 @@ public:
|
|||
Core::DeviceRemoval UpdateInput() override;
|
||||
|
||||
KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
|
||||
~KeyboardMouse();
|
||||
~KeyboardMouse() override;
|
||||
|
||||
std::string GetName() const override;
|
||||
std::string GetSource() const override;
|
||||
|
|
|
@ -71,11 +71,8 @@ private:
|
|||
: m_name(name), m_input(input), m_range(range), m_offset(offset)
|
||||
{
|
||||
}
|
||||
std::string GetName() const final override { return m_name; }
|
||||
ControlState GetState() const final override
|
||||
{
|
||||
return (ControlState(m_input) + m_offset) / m_range;
|
||||
}
|
||||
std::string GetName() const final { return m_name; }
|
||||
ControlState GetState() const final { return (ControlState(m_input) + m_offset) / m_range; }
|
||||
|
||||
private:
|
||||
const char* m_name;
|
||||
|
@ -203,7 +200,7 @@ class InputBackend final : public ciface::InputBackend
|
|||
{
|
||||
public:
|
||||
InputBackend(ControllerInterface* controller_interface);
|
||||
~InputBackend();
|
||||
~InputBackend() override;
|
||||
void PopulateDevices() override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -243,7 +243,7 @@ private:
|
|||
{
|
||||
public:
|
||||
HapticEffect(SDL_Haptic* haptic);
|
||||
~HapticEffect();
|
||||
~HapticEffect() override;
|
||||
|
||||
protected:
|
||||
virtual bool UpdateParameters(s16 value) = 0;
|
||||
|
@ -254,7 +254,7 @@ private:
|
|||
static constexpr u16 DISABLED_EFFECT_TYPE = 0;
|
||||
|
||||
private:
|
||||
virtual void SetState(ControlState state) override final;
|
||||
void SetState(ControlState state) final;
|
||||
void UpdateEffect();
|
||||
SDL_Haptic* const m_haptic;
|
||||
int m_id = -1;
|
||||
|
@ -368,7 +368,7 @@ private:
|
|||
|
||||
public:
|
||||
GameController(SDL_GameController* const gamecontroller, SDL_Joystick* const joystick);
|
||||
~GameController();
|
||||
~GameController() override;
|
||||
|
||||
std::string GetName() const override;
|
||||
std::string GetSource() const override;
|
||||
|
@ -423,7 +423,7 @@ class InputBackend final : public ciface::InputBackend
|
|||
{
|
||||
public:
|
||||
InputBackend(ControllerInterface* controller_interface);
|
||||
~InputBackend();
|
||||
~InputBackend() override;
|
||||
void PopulateDevices() override;
|
||||
void UpdateInput(std::vector<std::weak_ptr<ciface::Core::Device>>& devices_to_remove) override;
|
||||
|
||||
|
|
|
@ -93,8 +93,8 @@ private:
|
|||
: m_name(name), m_input(input), m_range(range)
|
||||
{
|
||||
}
|
||||
std::string GetName() const final override { return m_name; }
|
||||
ControlState GetState() const final override { return ControlState(m_input) / m_range; }
|
||||
std::string GetName() const final { return m_name; }
|
||||
ControlState GetState() const final { return ControlState(m_input) / m_range; }
|
||||
|
||||
private:
|
||||
const char* m_name;
|
||||
|
|
|
@ -51,7 +51,7 @@ public:
|
|||
|
||||
std::string GetName() const override { return m_name; }
|
||||
|
||||
ControlState GetState() const final override { return ControlState(m_value) / m_extent; }
|
||||
ControlState GetState() const final { return ControlState(m_value) / m_extent; }
|
||||
|
||||
protected:
|
||||
const T& m_value;
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue