summaryrefslogtreecommitdiff
path: root/src/gui/models
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-07 01:53:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-07 01:53:51 +0300
commit2492b561385859b7ef76fe816a8dc845f0b9bd09 (patch)
tree62633f8cd7c027c2a8e1bae61264a79394aeb751 /src/gui/models
parentce14a018a6f66aa1309ebe71a8217082d83cd0da (diff)
downloadmv-2492b561385859b7ef76fe816a8dc845f0b9bd09.tar.gz
mv-2492b561385859b7ef76fe816a8dc845f0b9bd09.tar.bz2
mv-2492b561385859b7ef76fe816a8dc845f0b9bd09.tar.xz
mv-2492b561385859b7ef76fe816a8dc845f0b9bd09.zip
Fix some casts between signed and unsigned in some files.
Diffstat (limited to 'src/gui/models')
-rw-r--r--src/gui/models/colormodel.cpp4
-rw-r--r--src/gui/models/extendednamesmodel.cpp4
-rw-r--r--src/gui/models/modelistmodel.h2
-rw-r--r--src/gui/models/namesmodel.cpp2
4 files changed, 6 insertions, 6 deletions
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<size_t>(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<int>(mColors.size()) || i < 0)
return &mColors[0];
- return &mColors[i];
+ return &mColors[static_cast<size_t>(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<size_t>(i)];
}
const Image *ExtendedNamesModel::getImageAt(int i)
@@ -50,7 +50,7 @@ const Image *ExtendedNamesModel::getImageAt(int i)
if (i >= static_cast<int>(mImages.size()) || i < 0)
return nullptr;
- return mImages[i];
+ return mImages[static_cast<size_t>(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<size_t>(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<size_t>(i)];
}
void NamesModel::fillFromArray(const char *const *const arr, std::size_t sz)