From 5ca2cf9320eaf44f29e4d1b1eb0a36bac13bd9e5 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 19 Nov 2022 11:02:16 +0100 Subject: [PATCH] Fix a bunch of warnings --- include/Nazara/Core/EmptyStream.hpp | 4 ++-- include/Nazara/Core/MemoryStream.hpp | 4 ++-- include/Nazara/Core/VirtualDirectory.inl | 14 +++++++------- include/Nazara/Graphics/FramePipeline.hpp | 2 +- include/Nazara/Renderer/DebugDrawer.hpp | 2 +- include/Nazara/Widgets/ButtonWidget.hpp | 4 ++-- include/Nazara/Widgets/ScrollbarButtonWidget.hpp | 4 ++-- include/Nazara/Widgets/ScrollbarWidget.hpp | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/Nazara/Core/EmptyStream.hpp b/include/Nazara/Core/EmptyStream.hpp index c2d7c734e..8b1707edb 100644 --- a/include/Nazara/Core/EmptyStream.hpp +++ b/include/Nazara/Core/EmptyStream.hpp @@ -16,7 +16,7 @@ namespace Nz { public: inline EmptyStream(); - EmptyStream(const EmptyStream&) = default; + EmptyStream(const EmptyStream&) = delete; EmptyStream(EmptyStream&&) noexcept = default; ~EmptyStream() = default; @@ -24,7 +24,7 @@ namespace Nz UInt64 GetSize() const override; - EmptyStream& operator=(const EmptyStream&) = default; + EmptyStream& operator=(const EmptyStream&) = delete; EmptyStream& operator=(EmptyStream&&) noexcept = default; private: diff --git a/include/Nazara/Core/MemoryStream.hpp b/include/Nazara/Core/MemoryStream.hpp index d5b4a489f..0575eafd0 100644 --- a/include/Nazara/Core/MemoryStream.hpp +++ b/include/Nazara/Core/MemoryStream.hpp @@ -20,7 +20,7 @@ namespace Nz public: inline MemoryStream(); inline MemoryStream(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite); - MemoryStream(const MemoryStream&) = default; + MemoryStream(const MemoryStream&) = delete; MemoryStream(MemoryStream&&) noexcept = default; ~MemoryStream() = default; @@ -32,7 +32,7 @@ namespace Nz void SetBuffer(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite); - MemoryStream& operator=(const MemoryStream&) = default; + MemoryStream& operator=(const MemoryStream&) = delete; MemoryStream& operator=(MemoryStream&&) noexcept = default; private: diff --git a/include/Nazara/Core/VirtualDirectory.inl b/include/Nazara/Core/VirtualDirectory.inl index c835efa3b..1f15c15e8 100644 --- a/include/Nazara/Core/VirtualDirectory.inl +++ b/include/Nazara/Core/VirtualDirectory.inl @@ -43,7 +43,7 @@ namespace Nz callback(std::string_view("."), ourselves); if (VirtualDirectoryPtr parent = m_parent.lock()) { - Entry parentEntry = VirtualDirectoryEntry{ parent }; + Entry parentEntry = VirtualDirectoryEntry{ { parent } }; if (!CallbackReturn(callback, std::string_view(".."), parentEntry)) return; } @@ -79,7 +79,7 @@ namespace Nz else if (std::filesystem::is_directory(status)) { VirtualDirectoryPtr virtualDir = std::make_shared(physicalEntry.path(), weak_from_this()); - entry = PhysicalDirectoryEntry{ std::move(virtualDir), physicalEntry.path() }; + entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, physicalEntry.path() }; } else continue; @@ -179,7 +179,7 @@ namespace Nz else if (std::filesystem::is_directory(status)) { VirtualDirectoryPtr virtualDir = std::make_shared(filePath, weak_from_this()); - entry = PhysicalDirectoryEntry{ std::move(virtualDir), std::move(filePath) }; + entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, std::move(filePath) }; } else return false; //< either not known or of a special type @@ -247,7 +247,7 @@ namespace Nz if (entryName == "." || entryName == "..") throw std::runtime_error("invalid entry name"); - return dir->StoreInternal(std::string(entryName), VirtualDirectoryEntry{ std::move(directory) }); + return dir->StoreInternal(std::string(entryName), VirtualDirectoryEntry{ { std::move(directory) } }); } inline auto VirtualDirectory::StoreDirectory(std::string_view path, std::filesystem::path directoryPath) -> PhysicalDirectoryEntry& @@ -318,7 +318,7 @@ namespace Nz { if (name == ".") { - Entry entry{ VirtualDirectoryEntry{ shared_from_this() } }; + Entry entry{ VirtualDirectoryEntry{ { shared_from_this() } } }; return CallbackReturn(callback, entry); } @@ -332,7 +332,7 @@ namespace Nz if (parentEntry) { - Entry entry = VirtualDirectoryEntry{ std::move(parentEntry) }; + Entry entry = VirtualDirectoryEntry{ { std::move(parentEntry) } }; return CallbackReturn(callback, entry); } } @@ -355,7 +355,7 @@ namespace Nz else if (std::filesystem::is_directory(status)) { VirtualDirectoryPtr virtualDir = std::make_shared(filePath, weak_from_this()); - entry = PhysicalDirectoryEntry{ std::move(virtualDir), std::move(filePath) }; + entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, std::move(filePath) }; } else return false; //< either not known or of a special type diff --git a/include/Nazara/Graphics/FramePipeline.hpp b/include/Nazara/Graphics/FramePipeline.hpp index 726a32cbc..00d3099a0 100644 --- a/include/Nazara/Graphics/FramePipeline.hpp +++ b/include/Nazara/Graphics/FramePipeline.hpp @@ -53,7 +53,7 @@ namespace Nz virtual void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) = 0; FramePipeline& operator=(const FramePipeline&) = delete; - FramePipeline& operator=(FramePipeline&&) noexcept = default; + FramePipeline& operator=(FramePipeline&&) = delete; NazaraSignal(OnTransfer, FramePipeline* /*pipeline*/, RenderFrame& /*renderFrame*/, CommandBufferBuilder& /*builder*/); diff --git a/include/Nazara/Renderer/DebugDrawer.hpp b/include/Nazara/Renderer/DebugDrawer.hpp index 8cfb6ecce..f2af52d65 100644 --- a/include/Nazara/Renderer/DebugDrawer.hpp +++ b/include/Nazara/Renderer/DebugDrawer.hpp @@ -34,7 +34,7 @@ namespace Nz public: DebugDrawer(RenderDevice& renderDevice, std::size_t maxVertexPerDraw = DefaultVertexBlockSize); DebugDrawer(const DebugDrawer&) = delete; - DebugDrawer(DebugDrawer&&) = delete; + DebugDrawer(DebugDrawer&&) noexcept = default; ~DebugDrawer(); void Draw(CommandBufferBuilder& builder); diff --git a/include/Nazara/Widgets/ButtonWidget.hpp b/include/Nazara/Widgets/ButtonWidget.hpp index 5822c11a2..f361c27cd 100644 --- a/include/Nazara/Widgets/ButtonWidget.hpp +++ b/include/Nazara/Widgets/ButtonWidget.hpp @@ -22,13 +22,13 @@ namespace Nz public: ButtonWidget(BaseWidget* parent); ButtonWidget(const ButtonWidget&) = delete; - ButtonWidget(ButtonWidget&&) = default; + ButtonWidget(ButtonWidget&&) = delete; ~ButtonWidget() = default; void UpdateText(const AbstractTextDrawer& drawer); ButtonWidget& operator=(const ButtonWidget&) = delete; - ButtonWidget& operator=(ButtonWidget&&) = default; + ButtonWidget& operator=(ButtonWidget&&) = delete; NazaraSignal(OnButtonTrigger, const ButtonWidget* /*button*/); diff --git a/include/Nazara/Widgets/ScrollbarButtonWidget.hpp b/include/Nazara/Widgets/ScrollbarButtonWidget.hpp index f12489fd0..d1fefea6b 100644 --- a/include/Nazara/Widgets/ScrollbarButtonWidget.hpp +++ b/include/Nazara/Widgets/ScrollbarButtonWidget.hpp @@ -22,11 +22,11 @@ namespace Nz public: ScrollbarButtonWidget(BaseWidget* parent); ScrollbarButtonWidget(const ScrollbarButtonWidget&) = delete; - ScrollbarButtonWidget(ScrollbarButtonWidget&&) = default; + ScrollbarButtonWidget(ScrollbarButtonWidget&&) = delete; ~ScrollbarButtonWidget() = default; ScrollbarButtonWidget& operator=(const ScrollbarButtonWidget&) = delete; - ScrollbarButtonWidget& operator=(ScrollbarButtonWidget&&) = default; + ScrollbarButtonWidget& operator=(ScrollbarButtonWidget&&) = delete; NazaraSignal(OnButtonGrabbed, ScrollbarButtonWidget* /*emitter*/, int /*x*/, int /*y*/); NazaraSignal(OnButtonMoved, ScrollbarButtonWidget* /*emitter*/, int /*x*/, int /*y*/); diff --git a/include/Nazara/Widgets/ScrollbarWidget.hpp b/include/Nazara/Widgets/ScrollbarWidget.hpp index 2fdbc53d7..1b6fdb700 100644 --- a/include/Nazara/Widgets/ScrollbarWidget.hpp +++ b/include/Nazara/Widgets/ScrollbarWidget.hpp @@ -18,7 +18,7 @@ namespace Nz public: ScrollbarWidget(BaseWidget* parent, ScrollbarOrientation orientation); ScrollbarWidget(const ScrollbarWidget&) = delete; - ScrollbarWidget(ScrollbarWidget&&) = default; + ScrollbarWidget(ScrollbarWidget&&) = delete; ~ScrollbarWidget() = default; inline ScrollbarOrientation GetOrientation() const; @@ -30,7 +30,7 @@ namespace Nz inline void SetValue(float newValue); ScrollbarWidget& operator=(const ScrollbarWidget&) = delete; - ScrollbarWidget& operator=(ScrollbarWidget&&) = default; + ScrollbarWidget& operator=(ScrollbarWidget&&) = delete; NazaraSignal(OnScrollbarValueUpdate, ScrollbarWidget* /*emitter*/, float /*newValue*/);