aboutsummaryrefslogtreecommitdiff
path: root/src/engine/graphics
diff options
context:
space:
mode:
authorHampusM <hampus@hampusmat.com>2022-03-29 17:40:04 +0200
committerHampusM <hampus@hampusmat.com>2022-06-13 17:56:57 +0200
commita039c8ad36779903571419cb06cd052f8fc41512 (patch)
tree4fdced6941a048bdd4b032fab7012bca00a6028e /src/engine/graphics
parentacf72075ed32e5a679d49ffedc0c28d8ac2aea8b (diff)
refactor: use trailing return types
Diffstat (limited to 'src/engine/graphics')
-rw-r--r--src/engine/graphics/matrix.hpp14
-rw-r--r--src/engine/graphics/matrix.tpp14
-rw-r--r--src/engine/graphics/scene.cpp2
-rw-r--r--src/engine/graphics/scene.hpp4
-rw-r--r--src/engine/graphics/window.cpp2
-rw-r--r--src/engine/graphics/window.hpp2
6 files changed, 19 insertions, 19 deletions
diff --git a/src/engine/graphics/matrix.hpp b/src/engine/graphics/matrix.hpp
index 2c9ba81..f71018b 100644
--- a/src/engine/graphics/matrix.hpp
+++ b/src/engine/graphics/matrix.hpp
@@ -23,21 +23,21 @@ public:
void fill(Element element) noexcept override;
- [[nodiscard]] Element get(const Vector2 &pos) const noexcept override;
+ [[nodiscard]] auto get(const Vector2 &pos) const noexcept -> Element override;
void set(const Vector2 &pos, Element element) noexcept override;
- [[nodiscard]] uint32_t get_row_cnt() const noexcept override;
+ [[nodiscard]] auto get_row_cnt() const noexcept -> uint32_t override;
- [[nodiscard]] uint32_t get_column_cnt() const noexcept override;
+ [[nodiscard]] auto get_column_cnt() const noexcept -> uint32_t override;
- [[nodiscard]] MatrixIterator<Element> begin() const noexcept override;
+ [[nodiscard]] auto begin() const noexcept -> MatrixIterator<Element> override;
- [[nodiscard]] MatrixIterator<Element> end() const noexcept override;
+ [[nodiscard]] auto end() const noexcept -> MatrixIterator<Element> override;
- Matrix &operator=(const Matrix &rhs) noexcept;
+ auto operator=(const Matrix &rhs) noexcept -> Matrix &;
- Matrix &operator=(Matrix &&rhs) noexcept;
+ auto operator=(Matrix &&rhs) noexcept -> Matrix &;
private:
gsl::owner<Element **> _matrix;
diff --git a/src/engine/graphics/matrix.tpp b/src/engine/graphics/matrix.tpp
index e0e65bb..527c61f 100644
--- a/src/engine/graphics/matrix.tpp
+++ b/src/engine/graphics/matrix.tpp
@@ -49,7 +49,7 @@ void Matrix<Element>::fill(Element element) noexcept
}
template <typename Element>
-Element Matrix<Element>::get(const Vector2 &pos) const noexcept
+auto Matrix<Element>::get(const Vector2 &pos) const noexcept -> Element
{
auto x = static_cast<std::size_t>(pos.get_x());
@@ -70,31 +70,31 @@ void Matrix<Element>::set(const Vector2 &pos, Element element) noexcept
}
template <typename Element>
-uint32_t Matrix<Element>::get_row_cnt() const noexcept
+auto Matrix<Element>::get_row_cnt() const noexcept -> uint32_t
{
return _row_cnt;
}
template <typename Element>
-uint32_t Matrix<Element>::get_column_cnt() const noexcept
+auto Matrix<Element>::get_column_cnt() const noexcept -> uint32_t
{
return _column_cnt;
}
template <typename Element>
-MatrixIterator<Element> Matrix<Element>::begin() const noexcept
+auto Matrix<Element>::begin() const noexcept -> MatrixIterator<Element>
{
return MatrixIterator(_matrix, _column_cnt);
}
template <typename Element>
-MatrixIterator<Element> Matrix<Element>::end() const noexcept
+auto Matrix<Element>::end() const noexcept -> MatrixIterator<Element>
{
return MatrixIterator(_matrix + _row_cnt, _column_cnt);
}
template <typename Element>
-Matrix<Element> &Matrix<Element>::operator=(const Matrix &rhs) noexcept
+auto Matrix<Element>::operator=(const Matrix &rhs) noexcept -> Matrix<Element> &
{
if (&rhs != this)
{
@@ -111,7 +111,7 @@ Matrix<Element> &Matrix<Element>::operator=(const Matrix &rhs) noexcept
}
template <typename Element>
-Matrix<Element> &Matrix<Element>::operator=(Matrix &&rhs) noexcept
+auto Matrix<Element>::operator=(Matrix &&rhs) noexcept -> Matrix<Element> &
{
if (&rhs != this)
{
diff --git a/src/engine/graphics/scene.cpp b/src/engine/graphics/scene.cpp
index 24c174f..c27a6d5 100644
--- a/src/engine/graphics/scene.cpp
+++ b/src/engine/graphics/scene.cpp
@@ -45,7 +45,7 @@ void Scene::leave() noexcept
_is_shown = false;
}
-const std::shared_ptr<IMatrix<std::string_view>> &Scene::get_matrix() const noexcept
+auto Scene::get_matrix() const noexcept -> const std::shared_ptr<IMatrix<std::string_view>> &
{
return _matrix;
}
diff --git a/src/engine/graphics/scene.hpp b/src/engine/graphics/scene.hpp
index c4f6d67..3dcaa2d 100644
--- a/src/engine/graphics/scene.hpp
+++ b/src/engine/graphics/scene.hpp
@@ -23,8 +23,8 @@ public:
void leave() noexcept override;
- [[nodiscard]] const std::shared_ptr<IMatrix<std::string_view>> &
- get_matrix() const noexcept override;
+ [[nodiscard]] auto
+ get_matrix() const noexcept -> const std::shared_ptr<IMatrix<std::string_view>> & override;
private:
bool _is_shown;
diff --git a/src/engine/graphics/window.cpp b/src/engine/graphics/window.cpp
index d6bae0c..bb33402 100644
--- a/src/engine/graphics/window.cpp
+++ b/src/engine/graphics/window.cpp
@@ -2,7 +2,7 @@
#include <sys/ioctl.h>
-Bounds Window::size() const noexcept
+auto Window::size() const noexcept -> Bounds
{
winsize window_size = {};
diff --git a/src/engine/graphics/window.hpp b/src/engine/graphics/window.hpp
index c9a9c70..69c04c3 100644
--- a/src/engine/graphics/window.hpp
+++ b/src/engine/graphics/window.hpp
@@ -10,5 +10,5 @@ class Window : public IWindow, public AutoWirable<IWindow, Window>
public:
Window() noexcept = default;
- [[nodiscard]] Bounds size() const noexcept override;
+ [[nodiscard]] auto size() const noexcept -> Bounds override;
};