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/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*/);