sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bunch of warnings

This commit is contained in:
SirLynix 2022-11-19 11:02:16 +01:00
parent 5fb974f24c
commit 5ca2cf9320
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/EmptyStream.hpp
View File

@ -16,7 +16,7 @@ namespace Nz
{ {
public: public:
inline EmptyStream(); inline EmptyStream();
EmptyStream(const EmptyStream&) = default; EmptyStream(const EmptyStream&) = delete;
EmptyStream(EmptyStream&&) noexcept = default; EmptyStream(EmptyStream&&) noexcept = default;
~EmptyStream() = default; ~EmptyStream() = default;
@ -24,7 +24,7 @@ namespace Nz
UInt64 GetSize() const override; UInt64 GetSize() const override;
EmptyStream& operator=(const EmptyStream&) = default; EmptyStream& operator=(const EmptyStream&) = delete;
EmptyStream& operator=(EmptyStream&&) noexcept = default; EmptyStream& operator=(EmptyStream&&) noexcept = default;
private: private:

4
include/Nazara/Core/MemoryStream.hpp
View File

@ -20,7 +20,7 @@ namespace Nz
public: public:
inline MemoryStream(); inline MemoryStream();
inline MemoryStream(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite); inline MemoryStream(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite);
MemoryStream(const MemoryStream&) = default; MemoryStream(const MemoryStream&) = delete;
MemoryStream(MemoryStream&&) noexcept = default; MemoryStream(MemoryStream&&) noexcept = default;
~MemoryStream() = default; ~MemoryStream() = default;
@ -32,7 +32,7 @@ namespace Nz
void SetBuffer(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite); void SetBuffer(ByteArray* byteArray, OpenModeFlags openMode = OpenMode_ReadWrite);
MemoryStream& operator=(const MemoryStream&) = default; MemoryStream& operator=(const MemoryStream&) = delete;
MemoryStream& operator=(MemoryStream&&) noexcept = default; MemoryStream& operator=(MemoryStream&&) noexcept = default;
private: private:

14
include/Nazara/Core/VirtualDirectory.inl
View File

@ -43,7 +43,7 @@ namespace Nz
callback(std::string_view("."), ourselves); callback(std::string_view("."), ourselves);
if (VirtualDirectoryPtr parent = m_parent.lock()) if (VirtualDirectoryPtr parent = m_parent.lock())
{ {
Entry parentEntry = VirtualDirectoryEntry{ parent }; Entry parentEntry = VirtualDirectoryEntry{ { parent } };
if (!CallbackReturn(callback, std::string_view(".."), parentEntry)) if (!CallbackReturn(callback, std::string_view(".."), parentEntry))
return; return;
} }
@ -79,7 +79,7 @@ namespace Nz
else if (std::filesystem::is_directory(status)) else if (std::filesystem::is_directory(status))
{ {
VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(physicalEntry.path(), weak_from_this()); VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(physicalEntry.path(), weak_from_this());
entry = PhysicalDirectoryEntry{ std::move(virtualDir), physicalEntry.path() }; entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, physicalEntry.path() };
} }
else else
continue; continue;
@ -179,7 +179,7 @@ namespace Nz
else if (std::filesystem::is_directory(status)) else if (std::filesystem::is_directory(status))
{ {
VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(filePath, weak_from_this()); VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(filePath, weak_from_this());
entry = PhysicalDirectoryEntry{ std::move(virtualDir), std::move(filePath) }; entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, std::move(filePath) };
} }
else else
return false; //< either not known or of a special type return false; //< either not known or of a special type
@ -247,7 +247,7 @@ namespace Nz
if (entryName == "." || entryName == "..") if (entryName == "." || entryName == "..")
throw std::runtime_error("invalid entry name"); 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& inline auto VirtualDirectory::StoreDirectory(std::string_view path, std::filesystem::path directoryPath) -> PhysicalDirectoryEntry&
@ -318,7 +318,7 @@ namespace Nz
{ {
if (name == ".") if (name == ".")
{ {
Entry entry{ VirtualDirectoryEntry{ shared_from_this() } }; Entry entry{ VirtualDirectoryEntry{ { shared_from_this() } } };
return CallbackReturn(callback, entry); return CallbackReturn(callback, entry);
} }
@ -332,7 +332,7 @@ namespace Nz
if (parentEntry) if (parentEntry)
{ {
Entry entry = VirtualDirectoryEntry{ std::move(parentEntry) }; Entry entry = VirtualDirectoryEntry{ { std::move(parentEntry) } };
return CallbackReturn(callback, entry); return CallbackReturn(callback, entry);
} }
} }
@ -355,7 +355,7 @@ namespace Nz
else if (std::filesystem::is_directory(status)) else if (std::filesystem::is_directory(status))
{ {
VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(filePath, weak_from_this()); VirtualDirectoryPtr virtualDir = std::make_shared<VirtualDirectory>(filePath, weak_from_this());
entry = PhysicalDirectoryEntry{ std::move(virtualDir), std::move(filePath) }; entry = PhysicalDirectoryEntry{ { std::move(virtualDir) }, std::move(filePath) };
} }
else else
return false; //< either not known or of a special type return false; //< either not known or of a special type

2
include/Nazara/Graphics/FramePipeline.hpp
View File

@ -53,7 +53,7 @@ namespace Nz
virtual void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) = 0; virtual void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) = 0;
FramePipeline& operator=(const FramePipeline&) = delete; FramePipeline& operator=(const FramePipeline&) = delete;
FramePipeline& operator=(FramePipeline&&) noexcept = default; FramePipeline& operator=(FramePipeline&&) = delete;
NazaraSignal(OnTransfer, FramePipeline* /*pipeline*/, RenderFrame& /*renderFrame*/, CommandBufferBuilder& /*builder*/); NazaraSignal(OnTransfer, FramePipeline* /*pipeline*/, RenderFrame& /*renderFrame*/, CommandBufferBuilder& /*builder*/);

2
include/Nazara/Renderer/DebugDrawer.hpp
View File

@ -34,7 +34,7 @@ namespace Nz
public: public:
DebugDrawer(RenderDevice& renderDevice, std::size_t maxVertexPerDraw = DefaultVertexBlockSize); DebugDrawer(RenderDevice& renderDevice, std::size_t maxVertexPerDraw = DefaultVertexBlockSize);
DebugDrawer(const DebugDrawer&) = delete; DebugDrawer(const DebugDrawer&) = delete;
DebugDrawer(DebugDrawer&&) = delete; DebugDrawer(DebugDrawer&&) noexcept = default;
~DebugDrawer(); ~DebugDrawer();
void Draw(CommandBufferBuilder& builder); void Draw(CommandBufferBuilder& builder);

4
include/Nazara/Widgets/ButtonWidget.hpp
View File

@ -22,13 +22,13 @@ namespace Nz
public: public:
ButtonWidget(BaseWidget* parent); ButtonWidget(BaseWidget* parent);
ButtonWidget(const ButtonWidget&) = delete; ButtonWidget(const ButtonWidget&) = delete;
ButtonWidget(ButtonWidget&&) = default; ButtonWidget(ButtonWidget&&) = delete;
~ButtonWidget() = default; ~ButtonWidget() = default;
void UpdateText(const AbstractTextDrawer& drawer); void UpdateText(const AbstractTextDrawer& drawer);
ButtonWidget& operator=(const ButtonWidget&) = delete; ButtonWidget& operator=(const ButtonWidget&) = delete;
ButtonWidget& operator=(ButtonWidget&&) = default; ButtonWidget& operator=(ButtonWidget&&) = delete;
NazaraSignal(OnButtonTrigger, const ButtonWidget* /*button*/); NazaraSignal(OnButtonTrigger, const ButtonWidget* /*button*/);

4
include/Nazara/Widgets/ScrollbarButtonWidget.hpp
View File

@ -22,11 +22,11 @@ namespace Nz
public: public:
ScrollbarButtonWidget(BaseWidget* parent); ScrollbarButtonWidget(BaseWidget* parent);
ScrollbarButtonWidget(const ScrollbarButtonWidget&) = delete; ScrollbarButtonWidget(const ScrollbarButtonWidget&) = delete;
ScrollbarButtonWidget(ScrollbarButtonWidget&&) = default; ScrollbarButtonWidget(ScrollbarButtonWidget&&) = delete;
~ScrollbarButtonWidget() = default; ~ScrollbarButtonWidget() = default;
ScrollbarButtonWidget& operator=(const ScrollbarButtonWidget&) = delete; ScrollbarButtonWidget& operator=(const ScrollbarButtonWidget&) = delete;
ScrollbarButtonWidget& operator=(ScrollbarButtonWidget&&) = default; ScrollbarButtonWidget& operator=(ScrollbarButtonWidget&&) = delete;
NazaraSignal(OnButtonGrabbed, ScrollbarButtonWidget* /*emitter*/, int /*x*/, int /*y*/); NazaraSignal(OnButtonGrabbed, ScrollbarButtonWidget* /*emitter*/, int /*x*/, int /*y*/);
NazaraSignal(OnButtonMoved, ScrollbarButtonWidget* /*emitter*/, int /*x*/, int /*y*/); NazaraSignal(OnButtonMoved, ScrollbarButtonWidget* /*emitter*/, int /*x*/, int /*y*/);

4
include/Nazara/Widgets/ScrollbarWidget.hpp
View File

@ -18,7 +18,7 @@ namespace Nz
public: public:
ScrollbarWidget(BaseWidget* parent, ScrollbarOrientation orientation); ScrollbarWidget(BaseWidget* parent, ScrollbarOrientation orientation);
ScrollbarWidget(const ScrollbarWidget&) = delete; ScrollbarWidget(const ScrollbarWidget&) = delete;
ScrollbarWidget(ScrollbarWidget&&) = default; ScrollbarWidget(ScrollbarWidget&&) = delete;
~ScrollbarWidget() = default; ~ScrollbarWidget() = default;
inline ScrollbarOrientation GetOrientation() const; inline ScrollbarOrientation GetOrientation() const;
@ -30,7 +30,7 @@ namespace Nz
inline void SetValue(float newValue); inline void SetValue(float newValue);
ScrollbarWidget& operator=(const ScrollbarWidget&) = delete; ScrollbarWidget& operator=(const ScrollbarWidget&) = delete;
ScrollbarWidget& operator=(ScrollbarWidget&&) = default; ScrollbarWidget& operator=(ScrollbarWidget&&) = delete;
NazaraSignal(OnScrollbarValueUpdate, ScrollbarWidget* /*emitter*/, float /*newValue*/); NazaraSignal(OnScrollbarValueUpdate, ScrollbarWidget* /*emitter*/, float /*newValue*/);