Removed rangechecked_cast was not working as I hoped.
This commit is contained in:
parent
404d4c856a
commit
817a371220
6 changed files with 4 additions and 58 deletions
|
|
@ -1,5 +1,4 @@
|
||||||
#include "BackupFormatModel.h"
|
#include "BackupFormatModel.h"
|
||||||
#include "rangechecked_cast.h"
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
@ -61,7 +60,7 @@ BackupFormatModel::BackupFormatModel(QObject *parent)
|
||||||
|
|
||||||
int BackupFormatModel::rowCount(const QModelIndex &) const
|
int BackupFormatModel::rowCount(const QModelIndex &) const
|
||||||
{
|
{
|
||||||
int size = rangechecked_cast<int>(g_BackupFormats.size());
|
int size = static_cast<int>(g_BackupFormats.size());
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -79,7 +78,7 @@ QVariant BackupFormatModel::data(const QModelIndex &index, int role) const
|
||||||
const int col = index.column();
|
const int col = index.column();
|
||||||
|
|
||||||
if (role == Qt::DisplayRole) {
|
if (role == Qt::DisplayRole) {
|
||||||
const auto &item = g_BackupFormats.at(rangechecked_cast<size_t>(row));
|
const auto &item = g_BackupFormats.at(static_cast<size_t>(row));
|
||||||
switch (col) {
|
switch (col) {
|
||||||
case ColumnShort:
|
case ColumnShort:
|
||||||
result = item.shortFlag;
|
result = item.shortFlag;
|
||||||
|
|
@ -93,7 +92,7 @@ QVariant BackupFormatModel::data(const QModelIndex &index, int role) const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (role == Qt::ToolTipRole) {
|
else if (role == Qt::ToolTipRole) {
|
||||||
const auto &item = g_BackupFormats.at(rangechecked_cast<size_t>(row));
|
const auto &item = g_BackupFormats.at(static_cast<size_t>(row));
|
||||||
result = item.description;
|
result = item.description;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
#include "ExplainTreeModelItem.h"
|
#include "ExplainTreeModelItem.h"
|
||||||
#include "json/json.h"
|
#include "json/json.h"
|
||||||
#include "rangechecked_cast.h"
|
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
@ -111,7 +110,7 @@ ExplainTreeModelItemPtr ExplainTreeModelItem::child(int row)
|
||||||
|
|
||||||
int ExplainTreeModelItem::childCount() const
|
int ExplainTreeModelItem::childCount() const
|
||||||
{
|
{
|
||||||
return rangechecked_cast<int>(m_childItems.size());
|
return static_cast<int>(m_childItems.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
//int ExplainTreeModelItem::columnCount() const
|
//int ExplainTreeModelItem::columnCount() const
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,6 @@ HEADERS += PasswordManager.h \
|
||||||
SqlAstSelectListEntry.h \
|
SqlAstSelectListEntry.h \
|
||||||
SqlAstSelect.h \
|
SqlAstSelect.h \
|
||||||
SqlAstExpression.h \
|
SqlAstExpression.h \
|
||||||
rangechecked_cast.h \
|
|
||||||
std_utils.h \
|
std_utils.h \
|
||||||
IntegerRange.h
|
IntegerRange.h
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
#ifndef RANGECHECKED_CAST_H
|
|
||||||
#define RANGECHECKED_CAST_H
|
|
||||||
|
|
||||||
#include <boost/assert.hpp>
|
|
||||||
#include <limits>
|
|
||||||
|
|
||||||
template <typename To, typename From>
|
|
||||||
To rangechecked_cast(From f)
|
|
||||||
{
|
|
||||||
// BOOST_ASSERT(f >= std::numeric_limits<To>::lowest());
|
|
||||||
// BOOST_ASSERT(f <= std::numeric_limits<To>::max());
|
|
||||||
return static_cast<To>(f);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // RANGECHECKED_CAST_H
|
|
||||||
|
|
@ -20,7 +20,6 @@ SOURCES += main.cpp \
|
||||||
tst_escapeConnectionStringValue.cpp \
|
tst_escapeConnectionStringValue.cpp \
|
||||||
tst_expected.cpp \
|
tst_expected.cpp \
|
||||||
tst_SqlLexer.cpp \
|
tst_SqlLexer.cpp \
|
||||||
tst_rangechecked_cast.cpp \
|
|
||||||
tst_scopeguard.cpp \
|
tst_scopeguard.cpp \
|
||||||
tst_CsvWriter.cpp \
|
tst_CsvWriter.cpp \
|
||||||
tst_PasswordManager.cpp \
|
tst_PasswordManager.cpp \
|
||||||
|
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
#include <gtest/gtest.h>
|
|
||||||
#include <gmock/gmock-matchers.h>
|
|
||||||
#include "rangechecked_cast.h"
|
|
||||||
#include "PrintTo_Qt.h"
|
|
||||||
|
|
||||||
using namespace testing;
|
|
||||||
|
|
||||||
|
|
||||||
TEST(rangechecked_cast, in_range)
|
|
||||||
{
|
|
||||||
ASSERT_NO_THROW({
|
|
||||||
int8_t in = 42;
|
|
||||||
int expected = 42;
|
|
||||||
auto output = rangechecked_cast<int>(in);
|
|
||||||
ASSERT_EQ(output, expected);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST(rangechecked_cast, above_max)
|
|
||||||
{
|
|
||||||
int64_t in = std::numeric_limits<int>::max() + static_cast<int64_t>(1);
|
|
||||||
ASSERT_THROW({
|
|
||||||
rangechecked_cast<int>(in);
|
|
||||||
},
|
|
||||||
std::runtime_error);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST(rangechecked_cast, below_lowest)
|
|
||||||
{
|
|
||||||
int64_t in = std::numeric_limits<int>::lowest() - static_cast<int64_t>(1);
|
|
||||||
ASSERT_THROW({
|
|
||||||
rangechecked_cast<int>(in);
|
|
||||||
},
|
|
||||||
std::runtime_error);
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue