Permalink
Browse files

Modernize copy constructor, operator()=, destructor. Use CMake Auto-M…

…oc to generate moc files.
  • Loading branch information...
imikejackson committed Dec 1, 2017
1 parent 06a99a9 commit 96966e72cd16f1ae4f58819e594943211f3c3aab
Showing 690 changed files with 871 additions and 2,149 deletions.
@@ -111,9 +111,8 @@
private:
EbsdHeaderEntry(const EbsdHeaderEntry&); // Copy Constructor Not Implemented
void operator=(const EbsdHeaderEntry&); // Operator '=' Not Implemented
EbsdHeaderEntry(const EbsdHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdHeaderEntry&) = delete; // Operator '=' Not Implemented
};
@@ -142,8 +142,8 @@ class EbsdLib_EXPORT EbsdImporter
}
private:
EbsdImporter(const EbsdImporter&); // Copy Constructor Not Implemented
void operator=(const EbsdImporter&); // Operator '=' Not Implemented
EbsdImporter(const EbsdImporter&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdImporter&) = delete; // Operator '=' Not Implemented
};
@@ -59,9 +59,7 @@ EbsdReader::EbsdReader() :
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
EbsdReader::~EbsdReader()
{
}
EbsdReader::~EbsdReader() = default;
// -----------------------------------------------------------------------------
//
@@ -208,9 +208,8 @@ class EbsdLib_EXPORT EbsdReader
private:
EbsdReader(const EbsdReader&); // Copy Constructor Not Implemented
void operator=(const EbsdReader&); // Operator '=' Not Implemented
EbsdReader(const EbsdReader&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdReader&) = delete; // Operator '=' Not Implemented
};
#endif /* EBSDREADER_H_ */
@@ -112,9 +112,7 @@ Ebsd::EbsdToSampleCoordinateMapping EbsdTransform::IdentifyStandardTransformatio
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
EbsdTransform::~EbsdTransform()
{
}
EbsdTransform::~EbsdTransform() = default;
// -----------------------------------------------------------------------------
//
@@ -83,9 +83,8 @@ class EbsdLib_EXPORT EbsdTransform
private:
EbsdTransform(const EbsdTransform&); // Copy Constructor Not Implemented
void operator=(const EbsdTransform&); // Operator '=' Not Implemented
EbsdTransform(const EbsdTransform&) = delete; // Copy Constructor Not Implemented
void operator=(const EbsdTransform&) = delete; // Operator '=' Not Implemented
};
#endif /* EBSDTRANSFORM_H_ */
@@ -150,10 +150,8 @@ class EbsdLib_EXPORT H5EbsdVolumeReader : public H5EbsdVolumeInfo
QSet<QString> m_ArrayNames;
bool m_ReadAllArrays;
H5EbsdVolumeReader(const H5EbsdVolumeReader&); // Copy Constructor Not Implemented
void operator=(const H5EbsdVolumeReader&); // Operator '=' Not Implemented
H5EbsdVolumeReader(const H5EbsdVolumeReader&) = delete; // Copy Constructor Not Implemented
void operator=(const H5EbsdVolumeReader&) = delete; // Operator '=' Not Implemented
};
@@ -49,9 +49,7 @@ CtfFields::CtfFields()
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
CtfFields::~CtfFields()
{
}
CtfFields::~CtfFields() = default;
// -----------------------------------------------------------------------------
//
@@ -80,8 +80,8 @@ class EbsdLib_EXPORT CtfFields : public AbstractEbsdFields
}
private:
CtfFields(const CtfFields&); // Copy Constructor Not Implemented
void operator=(const CtfFields&); // Operator '=' Not Implemented
CtfFields(const CtfFields&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfFields&) = delete; // Operator '=' Not Implemented
};
#endif /* CTFFIELDS_H_ */
@@ -106,8 +106,8 @@ class EbsdLib_EXPORT CtfHeaderEntry : public EbsdHeaderEntry
T m_value;
QString m_key;
CtfHeaderEntry(const CtfHeaderEntry&); // Copy Constructor Not Implemented
void operator=(const CtfHeaderEntry&); // Operator '=' Not Implemented
CtfHeaderEntry(const CtfHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfHeaderEntry&) = delete; // Operator '=' Not Implemented
};
/**
@@ -156,8 +156,8 @@ class CtfStringHeaderEntry : public EbsdHeaderEntry
QString m_value;
QString m_key;
CtfStringHeaderEntry(const CtfStringHeaderEntry&); // Copy Constructor Not Implemented
void operator=(const CtfStringHeaderEntry&); // Operator '=' Not Implemented
CtfStringHeaderEntry(const CtfStringHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfStringHeaderEntry&) = delete; // Operator '=' Not Implemented
};
@@ -97,8 +97,8 @@ class EbsdLib_EXPORT CtfPhase
void convertEuropeanDecimals(QByteArray& line);
private:
CtfPhase(const CtfPhase&); // Copy Constructor Not Implemented
void operator=(const CtfPhase&); // Operator '=' Not Implemented
CtfPhase(const CtfPhase&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfPhase&) = delete; // Operator '=' Not Implemented
};
#endif /* _CTFPHASE_H_ */
@@ -214,8 +214,8 @@ class EbsdLib_EXPORT CtfReader : public EbsdReader
*/
int parseDataLine(QByteArray& line, size_t row, size_t col, size_t i, size_t xCells, size_t yCells );
CtfReader(const CtfReader&); // Copy Constructor Not Implemented
void operator=(const CtfReader&); // Operator '=' Not Implemented
CtfReader(const CtfReader&) = delete; // Copy Constructor Not Implemented
void operator=(const CtfReader&) = delete; // Operator '=' Not Implemented
};
@@ -114,9 +114,7 @@ H5CtfImporter::H5CtfImporter():
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
H5CtfImporter::~H5CtfImporter()
{
}
H5CtfImporter::~H5CtfImporter() = default;
// -----------------------------------------------------------------------------
//
@@ -124,8 +124,8 @@ class EbsdLib_EXPORT H5CtfImporter : public EbsdImporter
int m_NumSlicesImported;
int m_FileVersion;
H5CtfImporter(const H5CtfImporter&); // Copy Constructor Not Implemented
void operator=(const H5CtfImporter&); // Operator '=' Not Implemented
H5CtfImporter(const H5CtfImporter&) = delete; // Copy Constructor Not Implemented
void operator=(const H5CtfImporter&) = delete; // Operator '=' Not Implemented
};
#endif /* _H5CTFIMPORTER_H_ */
@@ -140,8 +140,8 @@ class EbsdLib_EXPORT H5CtfReader : public CtfReader
QSet<QString> m_ArrayNames;
bool m_ReadAllArrays;
H5CtfReader(const H5CtfReader&); // Copy Constructor Not Implemented
void operator=(const H5CtfReader&); // Operator '=' Not Implemented
H5CtfReader(const H5CtfReader&) = delete; // Copy Constructor Not Implemented
void operator=(const H5CtfReader&) = delete; // Operator '=' Not Implemented
};
#endif /* _H5CTFREADER_H_ */
@@ -128,10 +128,8 @@ class EbsdLib_EXPORT H5CtfVolumeReader : public H5EbsdVolumeReader
private:
QVector<CtfPhase::Pointer> m_Phases;
H5CtfVolumeReader(const H5CtfVolumeReader&); // Copy Constructor Not Implemented
void operator=(const H5CtfVolumeReader&); // Operator '=' Not Implemented
H5CtfVolumeReader(const H5CtfVolumeReader&) = delete; // Copy Constructor Not Implemented
void operator=(const H5CtfVolumeReader&) = delete; // Operator '=' Not Implemented
/**
* @brief Allocats a contiguous chunk of memory to store values from the .ang file
@@ -47,9 +47,7 @@ AngFields::AngFields()
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
AngFields::~AngFields()
{
}
AngFields::~AngFields() = default;
// -----------------------------------------------------------------------------
//
@@ -79,8 +79,8 @@ class EbsdLib_EXPORT AngFields : public AbstractEbsdFields
private:
AngFields(const AngFields&); // Copy Constructor Not Implemented
void operator=(const AngFields&); // Operator '=' Not Implemented
AngFields(const AngFields&) = delete; // Copy Constructor Not Implemented
void operator=(const AngFields&) = delete; // Operator '=' Not Implemented
};
@@ -101,8 +101,8 @@ class EbsdLib_EXPORT AngHeaderEntry : public EbsdHeaderEntry
T m_value;
QString m_key;
AngHeaderEntry(const AngHeaderEntry&); // Copy Constructor Not Implemented
void operator=(const AngHeaderEntry&); // Operator '=' Not Implemented
AngHeaderEntry(const AngHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const AngHeaderEntry&) = delete; // Operator '=' Not Implemented
};
/**
@@ -152,8 +152,8 @@ class AngStringHeaderEntry : public EbsdHeaderEntry
QString m_value;
QString m_key;
AngStringHeaderEntry(const AngStringHeaderEntry&); // Copy Constructor Not Implemented
void operator=(const AngStringHeaderEntry&); // Operator '=' Not Implemented
AngStringHeaderEntry(const AngStringHeaderEntry&) = delete; // Copy Constructor Not Implemented
void operator=(const AngStringHeaderEntry&) = delete; // Operator '=' Not Implemented
};
@@ -54,10 +54,7 @@ AngPhase::AngPhase() :
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
AngPhase::~AngPhase()
{
}
AngPhase::~AngPhase() = default;
// -----------------------------------------------------------------------------
//
@@ -135,9 +135,8 @@ class EbsdLib_EXPORT HKLFamily
HKLFamily() {}
private:
HKLFamily(const HKLFamily&); // Copy Constructor Not Implemented
void operator=(const HKLFamily&); // Operator '=' Not Implemented
HKLFamily(const HKLFamily&) = delete; // Copy Constructor Not Implemented
void operator=(const HKLFamily&) = delete; // Operator '=' Not Implemented
};
@@ -199,8 +198,8 @@ class EbsdLib_EXPORT AngPhase
AngPhase();
private:
AngPhase(const AngPhase&); // Copy Constructor Not Implemented
void operator=(const AngPhase&); // Operator '=' Not Implemented
AngPhase(const AngPhase&) = delete; // Copy Constructor Not Implemented
void operator=(const AngPhase&) = delete; // Operator '=' Not Implemented
};
@@ -69,10 +69,7 @@ H5AngImporter::H5AngImporter() :
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
H5AngImporter::~H5AngImporter()
{
}
H5AngImporter::~H5AngImporter() = default;
#define WRITE_ANG_HEADER_DATA(reader, m_msgType, prpty, key)\
{\
@@ -131,8 +131,8 @@ class EbsdLib_EXPORT H5AngImporter : public EbsdImporter
float yRes;
int m_FileVersion;
H5AngImporter(const H5AngImporter&); // Copy Constructor Not Implemented
void operator=(const H5AngImporter&); // Operator '=' Not Implemented
H5AngImporter(const H5AngImporter&) = delete; // Copy Constructor Not Implemented
void operator=(const H5AngImporter&) = delete; // Operator '=' Not Implemented
};
@@ -175,8 +175,8 @@ class EbsdLib_EXPORT H5AngReader : public AngReader
QSet<QString> m_ArrayNames;
bool m_ReadAllArrays;
H5AngReader(const H5AngReader&); // Copy Constructor Not Implemented
void operator=(const H5AngReader&); // Operator '=' Not Implemented
H5AngReader(const H5AngReader&) = delete; // Copy Constructor Not Implemented
void operator=(const H5AngReader&) = delete; // Operator '=' Not Implemented
};
#endif /* _H5ANGREADER_H_ */
@@ -182,8 +182,8 @@ class EbsdLib_EXPORT H5OIMReader : public AngReader
QSet<QString> m_ArrayNames;
bool m_ReadAllArrays;
H5OIMReader(const H5OIMReader&); // Copy Constructor Not Implemented
void operator=(const H5OIMReader&); // Operator '=' Not Implemented
H5OIMReader(const H5OIMReader&) = delete; // Copy Constructor Not Implemented
void operator=(const H5OIMReader&) = delete; // Operator '=' Not Implemented
};
#endif /* _H5OIMReader_H_ */
@@ -89,9 +89,8 @@ class OrientationLib_EXPORT AngleFileLoader
private:
AngleFileLoader(const AngleFileLoader&); // Copy Constructor Not Implemented
void operator=(const AngleFileLoader&); // Operator '=' Not Implemented
AngleFileLoader(const AngleFileLoader&) = delete; // Copy Constructor Not Implemented
void operator=(const AngleFileLoader&) = delete; // Operator '=' Not Implemented
};
@@ -205,9 +205,7 @@ CubicLowOps::CubicLowOps()
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
CubicLowOps::~CubicLowOps()
{
}
CubicLowOps::~CubicLowOps() = default;
// -----------------------------------------------------------------------------
//
@@ -183,8 +183,8 @@ class OrientationLib_EXPORT CubicLowOps : public LaueOps
QuatF& q1, QuatF& q2,
float& n1, float& n2, float& n3);
private:
CubicLowOps(const CubicLowOps&); // Copy Constructor Not Implemented
void operator=(const CubicLowOps&); // Operator '=' Not Implemented
CubicLowOps(const CubicLowOps&) = delete; // Copy Constructor Not Implemented
void operator=(const CubicLowOps&) = delete; // Operator '=' Not Implemented
};
#endif /* CubicLowOPS_H_ */
@@ -289,9 +289,7 @@ CubicOps::CubicOps()
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
CubicOps::~CubicOps()
{
}
CubicOps::~CubicOps() = default;
// -----------------------------------------------------------------------------
//
@@ -204,8 +204,8 @@ class OrientationLib_EXPORT CubicOps : public LaueOps
std::vector< std::pair<double, double> > rodri2pair(std::vector<double>, std::vector<double>, std::vector<double>);
private:
CubicOps(const CubicOps&); // Copy Constructor Not Implemented
void operator=(const CubicOps&); // Operator '=' Not Implemented
CubicOps(const CubicOps&) = delete; // Copy Constructor Not Implemented
void operator=(const CubicOps&) = delete; // Operator '=' Not Implemented
};
#endif /* CUBICOPS_H_ */
@@ -142,9 +142,7 @@ HexagonalLowOps::HexagonalLowOps()
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
HexagonalLowOps::~HexagonalLowOps()
{
}
HexagonalLowOps::~HexagonalLowOps() = default;
// -----------------------------------------------------------------------------
//
@@ -184,8 +184,8 @@ class OrientationLib_EXPORT HexagonalLowOps : public LaueOps
float& n1, float& n2, float& n3);
private:
HexagonalLowOps(const HexagonalLowOps&); // Copy Constructor Not Implemented
void operator=(const HexagonalLowOps&); // Operator '=' Not Implemented
HexagonalLowOps(const HexagonalLowOps&) = delete; // Copy Constructor Not Implemented
void operator=(const HexagonalLowOps&) = delete; // Operator '=' Not Implemented
};
#endif /* HexagonalLowOPS_H_ */
Oops, something went wrong.

0 comments on commit 96966e7

Please sign in to comment.