Skip to content

Commit

Permalink
Update all classes to properly implement constructors and assignment …
Browse files Browse the repository at this point in the history 
…operators. (#837)

Classes are updated to use C++11 standard '=delete' or '=default' for each of
the copy and move constructors and copy and move assignments.

Other misc formatting updates to any affected classes.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
  • Loading branch information
@imikejackson
imikejackson committed Nov 8, 2018
1 parent c492a41 commit 61f6540
Show file tree
Hide file tree
Showing 211 changed files with 1,583 additions and 1,017 deletions.
6 changes: 5 additions & 1 deletion Source/EbsdLib/AbstractEbsdFields.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ class EbsdLib_EXPORT AbstractEbsdFields

virtual QVector<QString> getFieldNames() = 0;


public:
AbstractEbsdFields(const AbstractEbsdFields&) = delete; // Copy Constructor Not Implemented
AbstractEbsdFields(AbstractEbsdFields&&) = delete; // Move Constructor Not Implemented
AbstractEbsdFields& operator=(const AbstractEbsdFields&) = delete; // Copy Assignment Not Implemented
AbstractEbsdFields& operator=(AbstractEbsdFields&&) = delete; // Move Assignment Not Implemented
};


6 changes: 4 additions & 2 deletions Source/EbsdLib/EbsdHeaderEntry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,11 @@
EbsdHeaderEntry() {}


private:
public:
EbsdHeaderEntry(const EbsdHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdHeaderEntry&) = delete; // Move assignment Not Implemented
EbsdHeaderEntry(EbsdHeaderEntry&&) = delete; // Move Constructor Not Implemented
EbsdHeaderEntry& operator=(const EbsdHeaderEntry&) = delete; // Copy Assignment Not Implemented
EbsdHeaderEntry& operator=(EbsdHeaderEntry&&) = delete; // Move Assignment Not Implemented
};


Expand Down
6 changes: 4 additions & 2 deletions Source/EbsdLib/EbsdImporter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,11 @@ class EbsdLib_EXPORT EbsdImporter
m_PipelineMessage = "";
}

private:
public:
EbsdImporter(const EbsdImporter&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdImporter&) = delete; // Move assignment Not Implemented
EbsdImporter(EbsdImporter&&) = delete; // Move Constructor Not Implemented
EbsdImporter& operator=(const EbsdImporter&) = delete; // Copy Assignment Not Implemented
EbsdImporter& operator=(EbsdImporter&&) = delete; // Move Assignment Not Implemented
};


Expand Down
6 changes: 4 additions & 2 deletions Source/EbsdLib/EbsdReader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,11 @@ class EbsdLib_EXPORT EbsdReader
QMap<QString, EbsdHeaderEntry::Pointer> m_HeaderMap;


private:
public:
EbsdReader(const EbsdReader&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdReader&) = delete; // Move assignment Not Implemented
EbsdReader(EbsdReader&&) = delete; // Move Constructor Not Implemented
EbsdReader& operator=(const EbsdReader&) = delete; // Copy Assignment Not Implemented
EbsdReader& operator=(EbsdReader&&) = delete; // Move Assignment Not Implemented
};


109 changes: 71 additions & 38 deletions Source/EbsdLib/EbsdSetGetMacros.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@
* United States Prime Contract Navy N00173-07-C-2068
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */





#pragma once

#include <string.h>

#include <QtCore/QString>
#include <cstring>
#include <iostream>
#include <sstream>
#include <stdexcept>
Expand Down Expand Up @@ -124,29 +117,29 @@
/**
* @brief Creates a static "New" method that creates an instance of thisClass
*/
#define EBSD_NEW_SUPERCLASS(thisClass, SuperClass)\
typedef SuperClass::Pointer SuperClass##Type;\
static SuperClass##Type New##SuperClass(void) \
{ \
SuperClass##Type sharedPtr (new thisClass); \
return sharedPtr; \
#define EBSD_NEW_SUPERCLASS(thisClass, SuperClass) \
typedef SuperClass::Pointer SuperClass##Type; \
static SuperClass##Type New##SuperClass(void) \
{ \
SuperClass##Type sharedPtr(new(thisClass)); \
return sharedPtr; \
}

/**
* @brief Implements a Static 'New' Method for a class
*/
#define EBSD_STATIC_NEW_MACRO(thisClass) \
static Pointer New(void) \
{ \
Pointer sharedPtr (new thisClass); \
return sharedPtr; \
#define EBSD_STATIC_NEW_MACRO(thisClass) \
static Pointer New(void) \
{ \
Pointer sharedPtr(new(thisClass)); \
return sharedPtr; \
}

#define EBSD_STATIC_NEW_MACRO_WITH_ARGS(thisClass, args) \
static Pointer New args \
{ \
Pointer sharedPtr (new thisClass); \
return sharedPtr; \
#define EBSD_STATIC_NEW_MACRO_WITH_ARGS(thisClass, args) \
static Pointer New args \
{ \
Pointer sharedPtr(new(thisClass)); \
return sharedPtr; \
}

/** Macro used to add standard methods to all classes, mainly type
Expand Down Expand Up @@ -211,8 +204,11 @@
/**
* @brief Creates a "setter" method to set the property.
*/
#define EBSD_SET_PROPERTY(m_msgType, prpty) \
void set##prpty(m_msgType value) { this->m_##prpty = value; }
#define EBSD_SET_PROPERTY(m_msgType, prpty) \
void set##prpty(const m_msgType& value) \
{ \
this->m_##prpty = value; \
}

/**
* @brief Creates a "getter" method to retrieve the value of the property.
Expand All @@ -237,7 +233,31 @@
EBSD_SET_PROPERTY(m_msgType, prpty)\
EBSD_GET_PROPERTY(m_msgType, prpty)

/**
* @brief Creates a "setter" method to set the property.
*/
#define EBSD_SET_PTR_PROPERTY(m_msgType, prpty) \
void set##prpty(m_msgType value) \
{ \
this->m_##prpty = value; \
}

/**
* @brief Creates a "getter" method to retrieve the value of the property.
*/
#define EBSD_GET_PTR_PROPERTY(m_msgType, prpty) \
m_msgType get##prpty() \
{ \
return m_##prpty; \
}

#define EBSD_PTR_INSTANCE_PROPERTY(m_msgType, prpty) \
private: \
m_msgType m_##prpty; \
\
public: \
EBSD_SET_PTR_PROPERTY(m_msgType, prpty) \
EBSD_GET_PTR_PROPERTY(m_msgType, prpty)

#define EBSD_SET_2DVECTOR_PROPERTY(m_msgType, prpty, varname)\
void set##prpty(m_msgType value[2]) {\
Expand Down Expand Up @@ -296,23 +316,36 @@
/**
* @brief Creates a "setter" method to set the property.
*/
#define EbsdHeader_SET_PROPERTY( HeaderType, m_msgType, prpty, key) \
void set##prpty(m_msgType value) { \
HeaderType* p = dynamic_cast<HeaderType*>(m_HeaderMap[key].get()); \
if (nullptr != p) { p->setValue(value); } else {\
std::cout << "Value for Key: " << key.toStdString() << " was null." << std::endl;} }
#define EbsdHeader_SET_PROPERTY(HeaderType, m_msgType, prpty, key) \
void set##prpty(const m_msgType& value) \
{ \
auto p = dynamic_cast<HeaderType*>(m_HeaderMap[key].get()); \
if(nullptr != p) \
{ \
p->setValue(value); \
} \
else \
{ \
std::cout << "Value for Key: " << key.toStdString() << " was null." << std::endl; \
} \
}

/**
* @brief Creates a "getter" method to retrieve the value of the property.
*/
#define EbsdHeader_GET_PROPERTY(HeaderType, m_msgType, prpty, key) \
m_msgType get##prpty() { \
HeaderType* p = dynamic_cast<HeaderType*>(m_HeaderMap[key].get());\
if (nullptr != p) { return p->getValue(); } else {\
std::cout << "Value for Key: " << key.toStdString() << " was null." << std::endl; return 0;} }

#define EbsdHeader_GET_PROPERTY(HeaderType, m_msgType, prpty, key) \
m_msgType get##prpty() \
{ \
auto p = dynamic_cast<HeaderType*>(m_HeaderMap[key].get()); \
if(nullptr != p) \
{ \
return p->getValue(); \
} \
std::cout << "Value for Key: " << key.toStdString() << " was null." << std::endl; \
return 0; \
}

#define EbsdHeader_INSTANCE_PROPERTY(HeaderType, m_msgType, prpty, key)\
#define EBSDHEADER_INSTANCE_PROPERTY(HeaderType, m_msgType, prpty, key)\
public:\
EbsdHeader_SET_PROPERTY(HeaderType, m_msgType, prpty, key)\
EbsdHeader_GET_PROPERTY(HeaderType, m_msgType, prpty, key)
Expand Down
10 changes: 4 additions & 6 deletions Source/EbsdLib/EbsdTransform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,11 @@ class EbsdLib_EXPORT EbsdTransform
static Ebsd::EbsdToSampleCoordinateMapping IdentifyStandardTransformation(AxisAngleInput_t sampleTransformation, AxisAngleInput_t eulerTransformation);


protected:



private:
public:
EbsdTransform(const EbsdTransform&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdTransform&) = delete; // Move assignment Not Implemented
EbsdTransform(EbsdTransform&&) = delete; // Move Constructor Not Implemented
EbsdTransform& operator=(const EbsdTransform&) = delete; // Copy Assignment Not Implemented
EbsdTransform& operator=(EbsdTransform&&) = delete; // Move Assignment Not Implemented
};


8 changes: 5 additions & 3 deletions Source/EbsdLib/H5EbsdVolumeInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,11 @@ class EbsdLib_EXPORT H5EbsdVolumeInfo

QString m_Manufacturer;

H5EbsdVolumeInfo(const H5EbsdVolumeInfo&); //Not Implemented
void operator=(const H5EbsdVolumeInfo&); //Not Implemented

public:
H5EbsdVolumeInfo(const H5EbsdVolumeInfo&) = delete; // Copy Constructor Not Implemented
H5EbsdVolumeInfo(H5EbsdVolumeInfo&&) = delete; // Move Constructor Not Implemented
H5EbsdVolumeInfo& operator=(const H5EbsdVolumeInfo&) = delete; // Copy Assignment Not Implemented
H5EbsdVolumeInfo& operator=(H5EbsdVolumeInfo&&) = delete; // Move Assignment Not Implemented
};


5 changes: 4 additions & 1 deletion Source/EbsdLib/H5EbsdVolumeReader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,11 @@ class EbsdLib_EXPORT H5EbsdVolumeReader : public H5EbsdVolumeInfo
QSet<QString> m_ArrayNames;
bool m_ReadAllArrays;

public:
H5EbsdVolumeReader(const H5EbsdVolumeReader&) = delete; // Copy Constructor Not Implemented
void operator=(const H5EbsdVolumeReader&) = delete; // Move assignment Not Implemented
H5EbsdVolumeReader(H5EbsdVolumeReader&&) = delete; // Move Constructor Not Implemented
H5EbsdVolumeReader& operator=(const H5EbsdVolumeReader&) = delete; // Copy Assignment Not Implemented
H5EbsdVolumeReader& operator=(H5EbsdVolumeReader&&) = delete; // Move Assignment Not Implemented
};


Expand Down
6 changes: 4 additions & 2 deletions Source/EbsdLib/HKL/CtfFields.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ class EbsdLib_EXPORT CtfFields : public AbstractEbsdFields
return features;
}

private:
public:
CtfFields(const CtfFields&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfFields&) = delete; // Move assignment Not Implemented
CtfFields(CtfFields&&) = delete; // Move Constructor Not Implemented
CtfFields& operator=(const CtfFields&) = delete; // Copy Assignment Not Implemented
CtfFields& operator=(CtfFields&&) = delete; // Move Assignment Not Implemented
};


5 changes: 4 additions & 1 deletion Source/EbsdLib/HKL/CtfHeaderEntry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,11 @@ class EbsdLib_EXPORT CtfHeaderEntry : public EbsdHeaderEntry
T m_value;
QString m_key;

public:
CtfHeaderEntry(const CtfHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfHeaderEntry&) = delete; // Move assignment Not Implemented
CtfHeaderEntry(CtfHeaderEntry&&) = delete; // Move Constructor Not Implemented
CtfHeaderEntry& operator=(const CtfHeaderEntry&) = delete; // Copy Assignment Not Implemented
CtfHeaderEntry& operator=(CtfHeaderEntry&&) = delete; // Move Assignment Not Implemented
};

/**
Expand Down
6 changes: 4 additions & 2 deletions Source/EbsdLib/HKL/CtfPhase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ class EbsdLib_EXPORT CtfPhase

void convertEuropeanDecimals(QByteArray& line);

private:
public:
CtfPhase(const CtfPhase&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfPhase&) = delete; // Move assignment Not Implemented
CtfPhase(CtfPhase&&) = delete; // Move Constructor Not Implemented
CtfPhase& operator=(const CtfPhase&) = delete; // Copy Assignment Not Implemented
CtfPhase& operator=(CtfPhase&&) = delete; // Move Assignment Not Implemented
};

Loading

0 comments on commit 61f6540

Please sign in to comment.