Skip to content

Commit 09a87cb

Browse files
ritchiecarrollritchiecarroll
committed
clang clean-up for data sets
1 parent 7654383 commit 09a87cb

4 files changed

Lines changed: 19 additions & 11 deletions

File tree

‎src/lib/data/DataColumn.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const char* sttp::data::EnumName(DataType type)
5454

5555
const DataColumnPtr DataColumn::NullPtr = nullptr;
5656

57-
DataColumn::DataColumn(DataTablePtr parent, string name, DataType type, string expression) :
57+
DataColumn::DataColumn(DataTablePtr parent, string name, const DataType type, string expression) :
5858
m_parent(std::move(parent)),
5959
m_name(std::move(name)),
6060
m_type(type),

‎src/lib/data/DataRow.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
//******************************************************************************************************
2323

2424
#pragma warning(disable:26444)
25+
26+
// ReSharper disable CppClangTidyClangDiagnosticExitTimeDestructors
27+
// ReSharper disable CppClangTidyClangDiagnosticCoveredSwitchDefault
28+
// ReSharper disable CppClangTidyClangDiagnosticSwitchEnum
2529
// ReSharper disable CppExpressionWithoutSideEffects
2630
// ReSharper disable once CppUnusedIncludeDirective
2731
#include "../filterexpressions/FilterExpressions.h"
@@ -71,7 +75,7 @@ int32_t DataRow::GetColumnIndex(const string& columnName) const
7175
return column->Index();
7276
}
7377

74-
DataColumnPtr DataRow::ValidateColumnType(const int32_t columnIndex, DataType targetType, bool read) const
78+
DataColumnPtr DataRow::ValidateColumnType(const int32_t columnIndex, const DataType targetType, const bool read) const
7579
{
7680
const DataColumnPtr column = m_parent->Column(columnIndex);
7781

@@ -90,7 +94,7 @@ DataColumnPtr DataRow::ValidateColumnType(const int32_t columnIndex, DataType ta
9094
if (!read && column->Computed())
9195
throw DataSetException("Cannot assign value to DataColumn \"" + column->Name() + " for table \"" + m_parent->Name() + "\", column is computed with an expression");
9296

93-
return column;
97+
return column; // NOLINT
9498
}
9599

96100
ExpressionTreePtr DataRow::GetExpressionTree(const DataColumnPtr& column)
@@ -123,7 +127,7 @@ ExpressionTreePtr DataRow::GetExpressionTree(const DataColumnPtr& column)
123127
return static_cast<FilterExpressionParser*>(m_values[columnIndex])->GetExpressionTrees()[0];
124128
}
125129

126-
Object DataRow::GetComputedValue(const DataColumnPtr& column, DataType targetType)
130+
Object DataRow::GetComputedValue(const DataColumnPtr& column, const DataType targetType)
127131
{
128132
try
129133
{
@@ -446,7 +450,7 @@ Object DataRow::GetComputedValue(const DataColumnPtr& column, DataType targetTyp
446450
}
447451

448452
template<class T>
449-
Nullable<T> DataRow::GetValue(const int32_t columnIndex, DataType targetType)
453+
Nullable<T> DataRow::GetValue(const int32_t columnIndex, const DataType targetType)
450454
{
451455
const DataColumnPtr& column = ValidateColumnType(columnIndex, targetType, true);
452456

@@ -462,7 +466,7 @@ Nullable<T> DataRow::GetValue(const int32_t columnIndex, DataType targetType)
462466
}
463467

464468
template<class T>
465-
void DataRow::SetValue(const int32_t columnIndex, const Nullable<T>& value, DataType targetType)
469+
void DataRow::SetValue(const int32_t columnIndex, const Nullable<T>& value, const DataType targetType)
466470
{
467471
ValidateColumnType(columnIndex, targetType);
468472

‎src/lib/data/DataSet.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
//
2222
//******************************************************************************************************
2323

24+
// ReSharper disable CppClangTidyClangDiagnosticExitTimeDestructors
25+
// ReSharper disable CppClangTidyClangDiagnosticCoveredSwitchDefault
2426
#include "DataSet.h"
2527
#include "../pugixml.hpp"
2628

@@ -191,7 +193,7 @@ DataSetPtr DataSet::FromXml(const std::vector<uint8_t>& buffer)
191193
return dataSet;
192194
}
193195

194-
DataSetPtr DataSet::FromXml(const uint8_t* buffer, uint32_t length)
196+
DataSetPtr DataSet::FromXml(const uint8_t* buffer, const uint32_t length)
195197
{
196198
DataSetPtr dataSet = NewSharedPtr<DataSet>();
197199
dataSet->ReadXml(buffer, length);

‎src/lib/data/DataTable.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
//
2222
//******************************************************************************************************
2323

24+
// ReSharper disable CppClangTidyClangDiagnosticExitTimeDestructors
25+
// ReSharper disable CppClangTidyClangDiagnosticCoveredSwitchDefault
2426
#include "DataTable.h"
2527
#include "DataSet.h"
2628

@@ -67,7 +69,7 @@ const DataColumnPtr& DataTable::Column(const string& columnName) const
6769
return DataColumn::NullPtr;
6870
}
6971

70-
const DataColumnPtr& DataTable::Column(int32_t index) const
72+
const DataColumnPtr& DataTable::Column(const int32_t index) const
7173
{
7274
if (index < 0 || index >= ConvertInt32(m_columns.size()))
7375
return DataColumn::NullPtr;
@@ -80,12 +82,12 @@ const DataColumnPtr& DataTable::operator[](const string& columnName) const
8082
return Column(columnName);
8183
}
8284

83-
const DataColumnPtr& DataTable::operator[](int32_t index) const
85+
const DataColumnPtr& DataTable::operator[](const int32_t index) const
8486
{
8587
return Column(index);
8688
}
8789

88-
DataColumnPtr DataTable::CreateColumn(const string& name, DataType type, string expression)
90+
DataColumnPtr DataTable::CreateColumn(const string& name, const DataType type, string expression)
8991
{
9092
return NewSharedPtr<DataColumn, DataTablePtr, string, DataType, string>(shared_from_this(), name, type, std::move(expression));
9193
}
@@ -100,7 +102,7 @@ int32_t DataTable::ColumnCount() const
100102
return ConvertInt32(m_columns.size());
101103
}
102104

103-
const DataRowPtr& DataTable::Row(int32_t index)
105+
const DataRowPtr& DataTable::Row(const int32_t index)
104106
{
105107
if (index < 0 || index >= ConvertInt32(m_rows.size()))
106108
return DataRow::NullPtr;

0 commit comments

Comments
 (0)