From 2492b561385859b7ef76fe816a8dc845f0b9bd09 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Feb 2016 01:53:51 +0300 Subject: Fix some casts between signed and unsigned in some files. --- src/gui/models/colormodel.cpp | 4 ++-- src/gui/models/extendednamesmodel.cpp | 4 ++-- src/gui/models/modelistmodel.h | 2 +- src/gui/models/namesmodel.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gui/models') diff --git a/src/gui/models/colormodel.cpp b/src/gui/models/colormodel.cpp index 7ba88e9a8..88dee3c93 100644 --- a/src/gui/models/colormodel.cpp +++ b/src/gui/models/colormodel.cpp @@ -45,7 +45,7 @@ std::string ColorModel::getElementAt(int i) { if (i >= getNumberOfElements() || i < 0) return "???"; - return mNames[i]; + return mNames[static_cast(i)]; } const ColorPair *ColorModel::getColorAt(const int i) const @@ -53,7 +53,7 @@ const ColorPair *ColorModel::getColorAt(const int i) const if (i >= static_cast(mColors.size()) || i < 0) return &mColors[0]; - return &mColors[i]; + return &mColors[static_cast(i)]; } void ColorModel::add(const std::string &name, const Color *const color1, diff --git a/src/gui/models/extendednamesmodel.cpp b/src/gui/models/extendednamesmodel.cpp index d9b522d2d..ac65c8b21 100644 --- a/src/gui/models/extendednamesmodel.cpp +++ b/src/gui/models/extendednamesmodel.cpp @@ -42,7 +42,7 @@ std::string ExtendedNamesModel::getElementAt(int i) { if (i >= getNumberOfElements() || i < 0) return "???"; - return mNames[i]; + return mNames[static_cast(i)]; } const Image *ExtendedNamesModel::getImageAt(int i) @@ -50,7 +50,7 @@ const Image *ExtendedNamesModel::getImageAt(int i) if (i >= static_cast(mImages.size()) || i < 0) return nullptr; - return mImages[i]; + return mImages[static_cast(i)]; } void ExtendedNamesModel::clear() diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h index 752bd7ea4..e74dcb69f 100644 --- a/src/gui/models/modelistmodel.h +++ b/src/gui/models/modelistmodel.h @@ -49,7 +49,7 @@ class ModeListModel final : public ListModel * Returns element from container. */ std::string getElementAt(int i) override final - { return mVideoModes[i]; } + { return mVideoModes[static_cast(i)]; } /** * Returns the index corresponding to the given video mode. diff --git a/src/gui/models/namesmodel.cpp b/src/gui/models/namesmodel.cpp index 468c9989b..a66cea6b2 100644 --- a/src/gui/models/namesmodel.cpp +++ b/src/gui/models/namesmodel.cpp @@ -42,7 +42,7 @@ std::string NamesModel::getElementAt(int i) { if (i >= getNumberOfElements() || i < 0) return "???"; - return mNames[i]; + return mNames[static_cast(i)]; } void NamesModel::fillFromArray(const char *const *const arr, std::size_t sz) -- cgit v1.2.3-60-g2f50