Commit 328769b2 authored by Andrew Heather's avatar Andrew Heather
Browse files

STYLE: Code clean-up

parent 41e4d68f
......@@ -232,15 +232,15 @@ Foam::Function1Types::CSV<Type>::CSV
template<class Type>
Foam::Function1Types::CSV<Type>::CSV(const CSV<Type>& tbl)
Foam::Function1Types::CSV<Type>::CSV(const CSV<Type>& csv)
:
TableBase<Type>(tbl),
nHeaderLine_(tbl.nHeaderLine_),
refColumn_(tbl.refColumn_),
componentColumns_(tbl.componentColumns_),
separator_(tbl.separator_),
mergeSeparators_(tbl.mergeSeparators_),
fName_(tbl.fName_)
TableBase<Type>(csv),
nHeaderLine_(csv.nHeaderLine_),
refColumn_(csv.refColumn_),
componentColumns_(csv.componentColumns_),
separator_(csv.separator_),
mergeSeparators_(csv.mergeSeparators_),
fName_(csv.fName_)
{}
......
......@@ -105,7 +105,7 @@ class CSV
Type readValue(const List<string>&);
//- Disallow default bitwise assignment
void operator=(const CSV<Type>&);
void operator=(const CSV<Type>&) = delete;
public:
......@@ -125,7 +125,7 @@ public:
);
//- Copy constructor
CSV(const CSV<Type>& tbl);
explicit CSV(const CSV<Type>& csv);
//- Construct and return a clone
virtual tmp<Function1<Type>> clone() const
......
......@@ -67,7 +67,7 @@ class Constant
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const Constant<Type>&);
void operator=(const Constant<Type>&) = delete;
public:
......@@ -90,7 +90,7 @@ public:
Constant(const word& entryName, Istream& is);
//- Copy constructor
Constant(const Constant<Type>& cnst);
explicit Constant(const Constant<Type>& cnst);
//- Construct and return a clone
virtual tmp<Function1<Type>> clone() const
......
......@@ -66,7 +66,7 @@ class Function1
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const Function1<Type>&);
void operator=(const Function1<Type>&) = delete;
protected:
......@@ -101,10 +101,10 @@ public:
// Constructors
//- Construct from entry name
Function1(const word& entryName);
explicit Function1(const word& entryName);
//- Copy constructor
Function1(const Function1<Type>& f1);
explicit Function1(const Function1<Type>& f1);
//- Construct and return a clone
virtual tmp<Function1<Type>> clone() const = 0;
......@@ -255,7 +255,6 @@ public:
#ifdef NoRepository
#include "Function1.C"
#include "Constant.H"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -61,7 +61,7 @@ class OneConstant
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const OneConstant<Type>&);
void operator=(const OneConstant<Type>&) = delete;
public:
......@@ -73,7 +73,7 @@ public:
// Constructors
//- Construct from entry name
OneConstant(const word& entryName);
explicit OneConstant(const word& entryName);
//- Construct from entry name and dictionary
OneConstant(const word& entryName, const dictionary& dict);
......
......@@ -77,7 +77,7 @@ class Polynomial
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const Polynomial<Type>&);
void operator=(const Polynomial<Type>&) = delete;
public:
......@@ -98,7 +98,7 @@ public:
);
//- Copy constructor
Polynomial(const Polynomial& poly);
explicit Polynomial(const Polynomial& poly);
//- Destructor
......
......@@ -105,7 +105,7 @@ class Scale
void read(const dictionary& coeffs);
//- Disallow default bitwise assignment
void operator=(const Scale<Type>&);
void operator=(const Scale<Type>&) = delete;
public:
......@@ -124,7 +124,7 @@ public:
);
//- Copy constructor
Scale(const Scale<Type>& se);
explicit Scale(const Scale<Type>& se);
//- Destructor
......
......@@ -117,7 +117,7 @@ class Sine
void read(const dictionary& coeffs);
//- Disallow default bitwise assignment
void operator=(const Sine<Type>&);
void operator=(const Sine<Type>&) = delete;
public:
......@@ -136,7 +136,7 @@ public:
);
//- Copy constructor
Sine(const Sine<Type>& se);
explicit Sine(const Sine<Type>& se);
//- Destructor
......
......@@ -124,7 +124,7 @@ class Square
void read(const dictionary& coeffs);
//- Disallow default bitwise assignment
void operator=(const Square<Type>&);
void operator=(const Square<Type>&) = delete;
public:
......@@ -143,7 +143,7 @@ public:
);
//- Copy constructor
Square(const Square<Type>& se);
explicit Square(const Square<Type>& se);
//- Destructor
......
......@@ -69,7 +69,7 @@ class Table
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const Table<Type>&);
void operator=(const Table<Type>&) = delete;
public:
......@@ -84,7 +84,7 @@ public:
Table(const word& entryName, const dictionary& dict);
//- Copy constructor
Table(const Table<Type>& tbl);
explicit Table(const Table<Type>& tbl);
//- Destructor
......
......@@ -106,7 +106,7 @@ public:
TableBase(const word& name, const dictionary& dict);
//- Copy constructor. Note: steals interpolator, tableSamples
TableBase(const TableBase<Type>& tbl);
explicit TableBase(const TableBase<Type>& tbl);
//- Destructor
......
......@@ -84,7 +84,7 @@ class TableFile
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const TableFile<Type>&);
void operator=(const TableFile<Type>&) = delete;
public:
......@@ -99,7 +99,7 @@ public:
TableFile(const word& entryName, const dictionary& dict);
//- Copy constructor
TableFile(const TableFile<Type>& tbl);
explicit TableFile(const TableFile<Type>& tbl);
//- Destructor
......
......@@ -61,7 +61,7 @@ class ZeroConstant
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const ZeroConstant<Type>&);
void operator=(const ZeroConstant<Type>&) = delete;
public:
......
......@@ -49,7 +49,7 @@ namespace Function1Types
{
/*---------------------------------------------------------------------------*\
Class halfCosineRamp Declaration
Class halfCosineRamp Declaration
\*---------------------------------------------------------------------------*/
class halfCosineRamp
......@@ -59,7 +59,7 @@ class halfCosineRamp
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const halfCosineRamp&);
void operator=(const halfCosineRamp&) = delete;
public:
......
......@@ -59,7 +59,7 @@ class linearRamp
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const linearRamp&);
void operator=(const linearRamp&) = delete;
public:
......
......@@ -49,7 +49,7 @@ namespace Function1Types
{
/*---------------------------------------------------------------------------*\
Class quadraticRamp Declaration
Class quadraticRamp Declaration
\*---------------------------------------------------------------------------*/
class quadraticRamp
......@@ -59,7 +59,7 @@ class quadraticRamp
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const quadraticRamp&);
void operator=(const quadraticRamp&) = delete;
public:
......
......@@ -49,7 +49,7 @@ namespace Function1Types
{
/*---------------------------------------------------------------------------*\
Class quarterCosineRamp Declaration
Class quarterCosineRamp Declaration
\*---------------------------------------------------------------------------*/
class quarterCosineRamp
......@@ -59,7 +59,7 @@ class quarterCosineRamp
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const quarterCosineRamp&);
void operator=(const quarterCosineRamp&) = delete;
public:
......
......@@ -49,7 +49,7 @@ namespace Function1Types
{
/*---------------------------------------------------------------------------*\
Class quarterSineRamp Declaration
Class quarterSineRamp Declaration
\*---------------------------------------------------------------------------*/
class quarterSineRamp
......@@ -59,7 +59,7 @@ class quarterSineRamp
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const quarterSineRamp&);
void operator=(const quarterSineRamp&) = delete;
public:
......
......@@ -109,7 +109,7 @@ private:
void read(const dictionary& coeffs);
//- Disallow default bitwise assignment
void operator=(const ramp&);
void operator=(const ramp&) = delete;
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment