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

Fix a bunch of warnings

Browse Source
This commit is contained in:
SirLynix
2022-11-13 16:12:49 +01:00
parent 71c5133c7a
commit 842e797cc4
34 changed files with 47 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Audio/AudioDevice.hpp
View File

@@ -26,7 +26,7 @@ namespace Nz
public:
AudioDevice() = default;
AudioDevice(const AudioDevice&) = delete;
AudioDevice(AudioDevice&&) = default;
AudioDevice(AudioDevice&&) = delete;
virtual ~AudioDevice();
virtual std::shared_ptr<AudioBuffer> CreateBuffer() = 0;
@@ -52,7 +52,7 @@ namespace Nz
virtual void SetSpeedOfSound(float speed) = 0;
AudioDevice& operator=(const AudioDevice&) = delete;
AudioDevice& operator=(AudioDevice&&) = default;
AudioDevice& operator=(AudioDevice&&) = delete;
NazaraSignal(OnAudioDeviceRelease, AudioDevice* /*audioDevice*/);
};

4
include/Nazara/Audio/DummyAudioDevice.hpp
View File

@@ -21,7 +21,7 @@ namespace Nz
public:
DummyAudioDevice();
DummyAudioDevice(const DummyAudioDevice&) = delete;
DummyAudioDevice(DummyAudioDevice&&) = default;
DummyAudioDevice(DummyAudioDevice&&) = delete;
~DummyAudioDevice() = default;
std::shared_ptr<AudioBuffer> CreateBuffer() override;
@@ -46,7 +46,7 @@ namespace Nz
void SetSpeedOfSound(float speed) override;
DummyAudioDevice& operator=(const DummyAudioDevice&) = delete;
DummyAudioDevice& operator=(DummyAudioDevice&&) = default;
DummyAudioDevice& operator=(DummyAudioDevice&&) = delete;
private:
Quaternionf m_listenerRotation;

4
include/Nazara/Audio/Music.hpp
View File

@@ -28,7 +28,7 @@ namespace Nz
Music();
Music(AudioDevice& device);
Music(const Music&) = delete;
Music(Music&&) noexcept = default;
Music(Music&&) = delete;
~Music();
bool Create(std::shared_ptr<SoundStream> soundStream);
@@ -57,7 +57,7 @@ namespace Nz
void Stop() override;
Music& operator=(const Music&) = delete;
Music& operator=(Music&&) noexcept = default;
Music& operator=(Music&&) = delete;
private:
AudioFormat m_audioFormat;

4
include/Nazara/Audio/OpenALDevice.hpp
View File

@@ -39,7 +39,7 @@ namespace Nz
public:
OpenALDevice(OpenALLibrary& library, ALCdevice* device);
OpenALDevice(const OpenALDevice&) = delete;
OpenALDevice(OpenALDevice&&) = default;
OpenALDevice(OpenALDevice&&) = delete;
~OpenALDevice();
std::shared_ptr<AudioBuffer> CreateBuffer() override;
@@ -69,7 +69,7 @@ namespace Nz
inline ALenum TranslateAudioFormat(AudioFormat format) const;
OpenALDevice& operator=(const OpenALDevice&) = delete;
OpenALDevice& operator=(OpenALDevice&&) = default;
OpenALDevice& operator=(OpenALDevice&&) = delete;
private:
std::array<ALenum, AudioFormatCount> m_audioFormatValues;

4
include/Nazara/Audio/Sound.hpp
View File

@@ -20,7 +20,7 @@ namespace Nz
using SoundEmitter::SoundEmitter;
Sound();
Sound(AudioDevice& audioDevice, std::shared_ptr<SoundBuffer> soundBuffer);
Sound(const Sound&) = default;
Sound(const Sound&) = delete;
Sound(Sound&&) = default;
~Sound();
@@ -46,7 +46,7 @@ namespace Nz
void Stop() override;
Sound& operator=(const Sound&) = default;
Sound& operator=(const Sound&) = delete;
Sound& operator=(Sound&&) = default;
private:

2
include/Nazara/Audio/SoundEmitter.hpp
View File

@@ -57,7 +57,7 @@ namespace Nz
virtual void Stop() = 0;
SoundEmitter& operator=(const SoundEmitter&) = delete;
SoundEmitter& operator=(const SoundEmitter&) = default;
SoundEmitter& operator=(SoundEmitter&&) noexcept = default;
protected:

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

@@ -31,7 +31,7 @@ namespace Nz
inline InstancedRenderable();
InstancedRenderable(const InstancedRenderable&) = delete;
InstancedRenderable(InstancedRenderable&&) noexcept = default;
~InstancedRenderable();
virtual ~InstancedRenderable();
virtual void BuildElement(ElementRendererRegistry& registry, const ElementData& elementData, std::size_t passIndex, std::vector<RenderElementOwner>& elements) const = 0;

7
include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp
View File

@@ -18,19 +18,12 @@ namespace Nz
{
public:
using Framebuffer::Framebuffer;
OpenGLFramebuffer() = default;
OpenGLFramebuffer(const OpenGLFramebuffer&) = delete;
OpenGLFramebuffer(OpenGLFramebuffer&&) noexcept = default;
~OpenGLFramebuffer() = default;
virtual void Activate() const = 0;
virtual std::size_t GetColorBufferCount() const = 0;
virtual const Vector2ui& GetSize() const = 0;
OpenGLFramebuffer& operator=(const OpenGLFramebuffer&) = delete;
OpenGLFramebuffer& operator=(OpenGLFramebuffer&&) noexcept = default;
};
}

6
include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp
View File

@@ -21,9 +21,6 @@ namespace Nz
{
public:
OpenGLRenderImage(OpenGLRenderWindow& owner);
OpenGLRenderImage(const OpenGLRenderImage&) = delete;
OpenGLRenderImage(OpenGLRenderImage&&) noexcept = default;
~OpenGLRenderImage() = default;
void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) override;
@@ -33,9 +30,6 @@ namespace Nz
void SubmitCommandBuffer(CommandBuffer* commandBuffer, QueueTypeFlags queueTypeFlags) override;
OpenGLRenderImage& operator=(const OpenGLRenderImage&) = delete;
OpenGLRenderImage& operator=(OpenGLRenderImage&&) = delete;
private:
OpenGLRenderWindow& m_owner;
OpenGLUploadPool m_uploadPool;

6
include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp
View File

@@ -26,17 +26,11 @@ namespace Nz
OpenGLShaderModule(OpenGLDevice& device, nzsl::ShaderStageTypeFlags shaderStages, const nzsl::Ast::Module& shaderModule, const nzsl::ShaderWriter::States& states = {});
OpenGLShaderModule(OpenGLDevice& device, nzsl::ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const nzsl::ShaderWriter::States& states = {});
OpenGLShaderModule(const OpenGLShaderModule&) = delete;
OpenGLShaderModule(OpenGLShaderModule&&) noexcept = default;
~OpenGLShaderModule() = default;
nzsl::ShaderStageTypeFlags Attach(GL::Program& program, const nzsl::GlslWriter::BindingMapping& bindingMapping, std::vector<ExplicitBinding>* explicitBindings) const;
inline const std::vector<ExplicitBinding>& GetExplicitBindings() const;
OpenGLShaderModule& operator=(const OpenGLShaderModule&) = delete;
OpenGLShaderModule& operator=(OpenGLShaderModule&&) noexcept = default;
struct ExplicitBinding
{
std::string name;

6
include/Nazara/VulkanRenderer/VulkanFramebuffer.hpp
View File

@@ -18,14 +18,8 @@ namespace Nz
{
public:
using Framebuffer::Framebuffer;
VulkanFramebuffer(const VulkanFramebuffer&) = delete;
VulkanFramebuffer(VulkanFramebuffer&&) noexcept = default;
~VulkanFramebuffer() = default;
virtual const Vk::Framebuffer& GetFramebuffer() const = 0;
VulkanFramebuffer& operator=(const VulkanFramebuffer&) = delete;
VulkanFramebuffer& operator=(VulkanFramebuffer&&) noexcept = default;
};
}

2
include/Nazara/VulkanRenderer/VulkanRenderImage.hpp
View File

@@ -25,7 +25,7 @@ namespace Nz
public:
VulkanRenderImage(VulkanRenderWindow& owner);
VulkanRenderImage(const VulkanRenderImage&) = delete;
VulkanRenderImage(VulkanRenderImage&&) noexcept = default;
VulkanRenderImage(VulkanRenderImage&&) = delete;
~VulkanRenderImage();
void Execute(const std::function<void(CommandBufferBuilder& builder)>& callback, QueueTypeFlags queueTypeFlags) override;

8
include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
View File

@@ -22,20 +22,12 @@ namespace Nz
public:
struct Stage;
VulkanShaderModule() = default;
VulkanShaderModule(const VulkanShaderModule&) = delete;
VulkanShaderModule(VulkanShaderModule&&) = delete;
~VulkanShaderModule() = default;
bool Create(Vk::Device& device, nzsl::ShaderStageTypeFlags shaderStages, const nzsl::Ast::Module& shaderModule, const nzsl::ShaderWriter::States& states);
bool Create(Vk::Device& device, nzsl::ShaderStageTypeFlags shaderStages, ShaderLanguage lang, const void* source, std::size_t sourceSize, const nzsl::ShaderWriter::States& states);
inline const Vk::ShaderModule& GetHandle() const;
inline const std::vector<Stage>& GetStages() const;
VulkanShaderModule& operator=(const VulkanShaderModule&) = delete;
VulkanShaderModule& operator=(VulkanShaderModule&&) = delete;
struct Stage
{
nzsl::ShaderStageType stage;

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

@@ -23,7 +23,7 @@ namespace Nz
AbstractTextAreaWidget(BaseWidget* parent);
AbstractTextAreaWidget(const AbstractTextAreaWidget&) = delete;
AbstractTextAreaWidget(AbstractTextAreaWidget&&) = default;
AbstractTextAreaWidget(AbstractTextAreaWidget&&) = delete;
~AbstractTextAreaWidget() = default;
virtual void Clear();
@@ -69,7 +69,7 @@ namespace Nz
virtual void Write(const std::string& text, std::size_t glyphPosition) = 0;
AbstractTextAreaWidget& operator=(const AbstractTextAreaWidget&) = delete;
AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = default;
AbstractTextAreaWidget& operator=(AbstractTextAreaWidget&&) = delete;
NazaraSignal(OnTextAreaCursorMove, const AbstractTextAreaWidget* /*textArea*/, Vector2ui* /*newCursorPosition*/);
NazaraSignal(OnTextAreaKeyBackspace, const AbstractTextAreaWidget* /*textArea*/, bool* /*ignoreDefaultAction*/);

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

@@ -21,7 +21,7 @@ namespace Nz
public:
CheckboxWidget(BaseWidget* parent);
CheckboxWidget(const CheckboxWidget&) = delete;
CheckboxWidget(CheckboxWidget&&) = default;
CheckboxWidget(CheckboxWidget&&) = delete;
~CheckboxWidget() = default;
inline void EnableTristate(bool enabled);
@@ -34,7 +34,7 @@ namespace Nz
inline void SwitchToNextState();
CheckboxWidget& operator=(const CheckboxWidget&) = delete;
CheckboxWidget& operator=(CheckboxWidget&&) = default;
CheckboxWidget& operator=(CheckboxWidget&&) = delete;
NazaraSignal(OnCheckboxStateUpdate, const CheckboxWidget* /*button*/, CheckboxState /*newState*/);

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

@@ -24,7 +24,7 @@ namespace Nz
inline ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, float cornerSize, float cornerTexCoords);
ImageButtonWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material, std::shared_ptr<MaterialInstance> hoveredMaterial, std::shared_ptr<MaterialInstance> pressedMaterial, float cornerSize, float cornerTexCoords);
ImageButtonWidget(const ImageButtonWidget&) = delete;
ImageButtonWidget(ImageButtonWidget&&) = default;
ImageButtonWidget(ImageButtonWidget&&) = delete;
~ImageButtonWidget() = default;
inline const Color& GetColor() const;
@@ -43,7 +43,7 @@ namespace Nz
inline void SetTextureCoords(const Rectf& coords);
ImageButtonWidget& operator=(const ImageButtonWidget&) = delete;
ImageButtonWidget& operator=(ImageButtonWidget&&) = default;
ImageButtonWidget& operator=(ImageButtonWidget&&) = delete;
NazaraSignal(OnButtonTrigger, const ImageButtonWidget* /*button*/);

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

@@ -19,7 +19,7 @@ namespace Nz
public:
ImageWidget(BaseWidget* parent, std::shared_ptr<MaterialInstance> material);
ImageWidget(const ImageWidget&) = delete;
ImageWidget(ImageWidget&&) = default;
ImageWidget(ImageWidget&&) = delete;
~ImageWidget() = default;
inline const Color& GetColor() const;
@@ -32,7 +32,7 @@ namespace Nz
inline void SetTextureRect(const Rectf& rect);
ImageWidget& operator=(const ImageWidget&) = delete;
ImageWidget& operator=(ImageWidget&&) = default;
ImageWidget& operator=(ImageWidget&&) = delete;
private:
void Layout() override;

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

@@ -21,13 +21,13 @@ namespace Nz
public:
LabelWidget(BaseWidget* parent);
LabelWidget(const LabelWidget&) = delete;
LabelWidget(LabelWidget&&) = default;
LabelWidget(LabelWidget&&) = delete;
~LabelWidget() = default;
void UpdateText(const AbstractTextDrawer& drawer);
LabelWidget& operator=(const LabelWidget&) = delete;
LabelWidget& operator=(LabelWidget&&) = default;
LabelWidget& operator=(LabelWidget&&) = delete;
private:
void OnMouseEnter() override;

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

@@ -17,7 +17,7 @@ namespace Nz
public:
RichTextAreaWidget(BaseWidget* parent);
RichTextAreaWidget(const RichTextAreaWidget&) = delete;
RichTextAreaWidget(RichTextAreaWidget&&) = default;
RichTextAreaWidget(RichTextAreaWidget&&) = delete;
~RichTextAreaWidget() = default;
void AppendText(const std::string& text);
@@ -47,7 +47,7 @@ namespace Nz
void Write(const std::string& text, std::size_t glyphPosition) override;
RichTextAreaWidget& operator=(const RichTextAreaWidget&) = delete;
RichTextAreaWidget& operator=(RichTextAreaWidget&&) = default;
RichTextAreaWidget& operator=(RichTextAreaWidget&&) = delete;
private:
void CopySelectionToClipboard(const Vector2ui& selectionBegin, const Vector2ui& selectionEnd) override;

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

@@ -20,7 +20,7 @@ namespace Nz
public:
ScrollAreaWidget(BaseWidget* parent, BaseWidget* content);
ScrollAreaWidget(const ScrollAreaWidget&) = delete;
ScrollAreaWidget(ScrollAreaWidget&&) = default;
ScrollAreaWidget(ScrollAreaWidget&&) = delete;
~ScrollAreaWidget() = default;
void EnableScrollbar(bool enable);
@@ -36,7 +36,7 @@ namespace Nz
void ScrollToRatio(float ratio);
ScrollAreaWidget& operator=(const ScrollAreaWidget&) = delete;
ScrollAreaWidget& operator=(ScrollAreaWidget&&) = default;
ScrollAreaWidget& operator=(ScrollAreaWidget&&) = delete;
private:
void Layout() override;

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

@@ -40,7 +40,7 @@ namespace Nz
void OnMouseEnter() override;
void OnMouseExit() override;
void OnRenderLayerUpdated(int baseRenderLayer);
void OnRenderLayerUpdated(int baseRenderLayer) override;
std::unique_ptr<ScrollbarWidgetStyle> m_style;
ImageButtonWidget* m_scrollBackButton;

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

@@ -17,7 +17,7 @@ namespace Nz
public:
TextAreaWidget(BaseWidget* parent);
TextAreaWidget(const TextAreaWidget&) = delete;
TextAreaWidget(TextAreaWidget&&) = default;
TextAreaWidget(TextAreaWidget&&) = delete;
~TextAreaWidget() = default;
void AppendText(const std::string& text);
@@ -52,7 +52,7 @@ namespace Nz
void Write(const std::string& text, std::size_t glyphPosition) override;
TextAreaWidget& operator=(const TextAreaWidget&) = delete;
TextAreaWidget& operator=(TextAreaWidget&&) = default;
TextAreaWidget& operator=(TextAreaWidget&&) = delete;
NazaraSignal(OnTextChanged, const AbstractTextAreaWidget* /*textArea*/, const std::string& /*text*/);