From 6b0e2a25cf1e98d3f11d4e6c0305dd327048bbb8 Mon Sep 17 00:00:00 2001 From: HampusM Date: Mon, 27 Jun 2022 22:08:43 +0200 Subject: refactor: use int types from std namespace --- src/engine/graphics/matrix.hpp | 8 ++++---- src/engine/graphics/matrix_impl.hpp | 4 ++-- src/engine/graphics/matrix_iterator.hpp | 8 ++++---- src/engine/graphics/matrix_iterator_impl.hpp | 4 ++-- src/engine/graphics/scene.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/engine/graphics') diff --git a/src/engine/graphics/matrix.hpp b/src/engine/graphics/matrix.hpp index 7b4d037..58905ee 100644 --- a/src/engine/graphics/matrix.hpp +++ b/src/engine/graphics/matrix.hpp @@ -28,9 +28,9 @@ public: void set(const Vector2 &pos, Element element) noexcept override; - [[nodiscard]] auto get_row_cnt() const noexcept -> uint32_t override; + [[nodiscard]] auto get_row_cnt() const noexcept -> std::uint32_t override; - [[nodiscard]] auto get_column_cnt() const noexcept -> uint32_t override; + [[nodiscard]] auto get_column_cnt() const noexcept -> std::uint32_t override; [[nodiscard]] auto begin() const noexcept -> MatrixIterator override; @@ -43,8 +43,8 @@ public: private: gsl::owner _matrix; - uint32_t _row_cnt; - uint32_t _column_cnt; + std::uint32_t _row_cnt; + std::uint32_t _column_cnt; void _delete_matrix() noexcept; diff --git a/src/engine/graphics/matrix_impl.hpp b/src/engine/graphics/matrix_impl.hpp index 527c61f..9105149 100644 --- a/src/engine/graphics/matrix_impl.hpp +++ b/src/engine/graphics/matrix_impl.hpp @@ -70,13 +70,13 @@ void Matrix::set(const Vector2 &pos, Element element) noexcept } template -auto Matrix::get_row_cnt() const noexcept -> uint32_t +auto Matrix::get_row_cnt() const noexcept -> std::uint32_t { return _row_cnt; } template -auto Matrix::get_column_cnt() const noexcept -> uint32_t +auto Matrix::get_column_cnt() const noexcept -> std::uint32_t { return _column_cnt; } diff --git a/src/engine/graphics/matrix_iterator.hpp b/src/engine/graphics/matrix_iterator.hpp index 70a59bf..2d91ff1 100644 --- a/src/engine/graphics/matrix_iterator.hpp +++ b/src/engine/graphics/matrix_iterator.hpp @@ -28,7 +28,7 @@ class MatrixRow public: using RowPtr = gsl::owner; - explicit MatrixRow(RowPtr row_ptr, const uint32_t &column_cnt) noexcept; + explicit MatrixRow(RowPtr row_ptr, const std::uint32_t &column_cnt) noexcept; [[nodiscard]] auto begin() const noexcept -> MatrixRowIterator; @@ -37,7 +37,7 @@ public: private: RowPtr _row_ptr; - const uint32_t &_column_cnt; + const std::uint32_t &_column_cnt; }; template @@ -46,7 +46,7 @@ class MatrixIterator public: using RowPtr = gsl::owner; - explicit MatrixIterator(RowPtr row_ptr, const uint32_t &column_cnt) noexcept; + explicit MatrixIterator(RowPtr row_ptr, const std::uint32_t &column_cnt) noexcept; auto operator++() noexcept -> MatrixIterator &; auto operator++(int) noexcept -> MatrixIterator; @@ -59,7 +59,7 @@ public: private: RowPtr _row_ptr; - const uint32_t &_column_cnt; + const std::uint32_t &_column_cnt; }; #include "matrix_iterator_impl.hpp" diff --git a/src/engine/graphics/matrix_iterator_impl.hpp b/src/engine/graphics/matrix_iterator_impl.hpp index 4b2c785..95846fe 100644 --- a/src/engine/graphics/matrix_iterator_impl.hpp +++ b/src/engine/graphics/matrix_iterator_impl.hpp @@ -51,7 +51,7 @@ auto MatrixRowIterator::operator!=(const MatrixRowIterator &rhs) const // Matrix row template -MatrixRow::MatrixRow(RowPtr row_ptr, const uint32_t &column_cnt) noexcept +MatrixRow::MatrixRow(RowPtr row_ptr, const std::uint32_t &column_cnt) noexcept : _row_ptr(row_ptr), _column_cnt(column_cnt) { } @@ -73,7 +73,7 @@ auto MatrixRow::end() const noexcept -> MatrixRowIterator template MatrixIterator::MatrixIterator( RowPtr row_ptr, - const uint32_t &column_cnt) noexcept + const std::uint32_t &column_cnt) noexcept : _row_ptr(row_ptr), _column_cnt(column_cnt) { } diff --git a/src/engine/graphics/scene.cpp b/src/engine/graphics/scene.cpp index e4bdb6e..ff64edd 100644 --- a/src/engine/graphics/scene.cpp +++ b/src/engine/graphics/scene.cpp @@ -39,7 +39,7 @@ void Scene::enter() noexcept // ICANON - Canonical mode (line by line input) // ISIG - Generate the corresponding signals for the characters // INTR, QUIT, SUSP and DSUSP - new_termios.c_lflag &= static_cast(~(ECHO | ICANON | ISIG)); + new_termios.c_lflag &= static_cast(~(ECHO | ICANON | ISIG)); // Set a new terminal state tcsetattr(STDIN_FILENO, TCSAFLUSH, &new_termios); -- cgit v1.2.3-18-g5258