Skip to content

Commit 4cb6eec

Browse files
committed
Address feedback from code review.
Remove static const from constants.h Fix duplicate variable names in experimental file.
1 parent a292511 commit 4cb6eec

2 files changed

Lines changed: 27 additions & 27 deletions

File tree

Source/Experimental/FilterCallback/FilterParameter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ class DataArrayPathParameter : public IFilterParameter
338338
std::string m_PropertyName = {};
339339
Category m_Category = {};
340340
int m_GroupIndex = {};
341-
int m_DefaultValue = {};
342-
double m_DefaultValue = {};
343-
DataArrayPath m_DefaultValue = {};
341+
int m_DefaultInt = {};
342+
double m_DefaultDouble = {};
343+
DataArrayPath m_DefaultDAP = {};
344344

345345
DataArrayPathParameter(const DataArrayPathParameter&) = delete; // Copy Constructor Not Implemented
346346
void operator=(const DataArrayPathParameter&) = delete; // Move assignment Not Implemented

Source/SIMPLib/Common/Constants.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ namespace SIMPL
6868
using Rgb = uint32_t;
6969
const Rgb RGB_MASK = 0x00ffffff; // masks RGB values
7070
const QString PathSep("|");
71-
static const uint8_t Unchecked = 0;
72-
static const uint8_t PartiallyChecked = 1;
73-
static const uint8_t Checked = 2;
71+
const uint8_t Unchecked = 0;
72+
const uint8_t PartiallyChecked = 1;
73+
const uint8_t Checked = 2;
7474

7575
enum InfoStringFormat
7676
{
@@ -84,9 +84,9 @@ enum InfoStringFormat
8484
/** @brief Constants defined for the Stacking order of images into a 3D Volume */
8585
namespace RefFrameZDir
8686
{
87-
static const unsigned int LowtoHigh = 0;
88-
static const unsigned int HightoLow = 1;
89-
static const unsigned int UnknownRefFrameZDirection = 2;
87+
const unsigned int LowtoHigh = 0;
88+
const unsigned int HightoLow = 1;
89+
const unsigned int UnknownRefFrameZDirection = 2;
9090
} // namespace RefFrameZDir
9191

9292
namespace TypeNames
@@ -115,22 +115,22 @@ static const unsigned int UnknownRefFrameZDirection = 2;
115115

116116
namespace TypeEnums
117117
{
118-
static const int Int8 = 0;
119-
static const int UInt8 = 1;
120-
static const int Int16 = 2;
121-
static const int UInt16 = 3;
122-
static const int Int32 = 4;
123-
static const int UInt32 = 5;
124-
static const int Int64 = 6;
125-
static const int UInt64 = 7;
126-
static const int Float = 8;
127-
static const int Double = 9;
128-
static const int Bool = 10;
129-
static const int SizeT = 11;
130-
131-
static const int UnknownType = 12;
132-
const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
133-
TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
118+
const int Int8 = 0;
119+
const int UInt8 = 1;
120+
const int Int16 = 2;
121+
const int UInt16 = 3;
122+
const int Int32 = 4;
123+
const int UInt32 = 5;
124+
const int Int64 = 6;
125+
const int UInt64 = 7;
126+
const int Float = 8;
127+
const int Double = 9;
128+
const int Bool = 10;
129+
const int SizeT = 11;
130+
131+
const int UnknownType = 12;
132+
const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
133+
TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
134134
}
135135

136136
namespace NumericTypes
@@ -215,8 +215,8 @@ static const unsigned int UnknownRefFrameZDirection = 2;
215215
const QString None("None");
216216
const QString AnyPrimitive("Any");
217217
const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
218-
//static const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
219-
//static const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
218+
// const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
219+
// const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
220220

221221
const QString AttributeMatrixName("AttributeMatrix");
222222
const QString ElementAttributeMatrixName("ElementAttributeMatrix");

0 commit comments

Comments
 (0)