Commit d534b220 authored by Mark Olesen's avatar Mark Olesen

STYLE: formatting consistency for class declarations

parent e3d971dd
...@@ -99,7 +99,7 @@ class faMeshInput ...@@ -99,7 +99,7 @@ class faMeshInput
{ {
protected: protected:
// Protected data // Protected Data
//- Reference to the time database //- Reference to the time database
const Time& time_; const Time& time_;
...@@ -133,7 +133,7 @@ protected: ...@@ -133,7 +133,7 @@ protected:
public: public:
//- Runtime type information //- Declare type-name (with debug switch)
ClassName("catalyst::faMesh"); ClassName("catalyst::faMesh");
......
...@@ -67,7 +67,7 @@ class vtkIndent; ...@@ -67,7 +67,7 @@ class vtkIndent;
namespace Foam namespace Foam
{ {
// Forward declarations // Forward Declarations
class Time; class Time;
class faMesh; class faMesh;
template<class Type> class Field; template<class Type> class Field;
...@@ -83,7 +83,7 @@ class faMeshAdaptor ...@@ -83,7 +83,7 @@ class faMeshAdaptor
{ {
public: public:
//- Public Data Members // Public Data Members
//- Name for internal mesh ("internal") //- Name for internal mesh ("internal")
static const word internalName; static const word internalName;
...@@ -91,6 +91,8 @@ public: ...@@ -91,6 +91,8 @@ public:
private: private:
// Private Classes
//- Bookkeeping for vtkPolyData //- Bookkeeping for vtkPolyData
struct foamVtpData struct foamVtpData
: :
...@@ -160,15 +162,14 @@ private: ...@@ -160,15 +162,14 @@ private:
public: public:
//- Static Data Members //- Declare type-name (with debug switch)
ClassName("vtk::faMeshAdaptor");
ClassName("vtk::faMeshAdaptor");
// Constructors // Constructors
//- Construct from components //- Construct for mesh region
faMeshAdaptor(const faMesh& mesh); explicit faMeshAdaptor(const faMesh& mesh);
//- Destructor //- Destructor
......
...@@ -56,8 +56,6 @@ namespace catalyst ...@@ -56,8 +56,6 @@ namespace catalyst
class coprocess class coprocess
{ {
private:
// Private Data // Private Data
//- The currently active ParaView Catalyst co-process //- The currently active ParaView Catalyst co-process
...@@ -76,13 +74,13 @@ private: ...@@ -76,13 +74,13 @@ private:
public: public:
//- Define class name and debug //- Declare type-name (with debug switch)
ClassName("catalyst"); ClassName("catalyst");
// Constructors // Constructors
//- Construct null. Does not initialize catalyst. //- Default construct. Does not initialize catalyst.
constexpr coprocess() noexcept constexpr coprocess() noexcept
: :
coproc_(nullptr) coproc_(nullptr)
...@@ -129,7 +127,6 @@ public: ...@@ -129,7 +127,6 @@ public:
//- Finalize //- Finalize
void stop(); void stop();
}; };
......
...@@ -119,7 +119,7 @@ class catalystFunctionObject ...@@ -119,7 +119,7 @@ class catalystFunctionObject
: :
public functionObject public functionObject
{ {
// Private data // Private Data
//- Reference to the time database //- Reference to the time database
const Time& time_; const Time& time_;
...@@ -148,16 +148,16 @@ class catalystFunctionObject ...@@ -148,16 +148,16 @@ class catalystFunctionObject
public: public:
//- Declare type-name (with debug switch)
TypeName("catalyst");
// Static Methods // Static Methods
//- Expand strings as filenames, retaining only those that exist //- Expand strings as filenames, retaining only those that exist
static label expand(List<string>& scripts, const dictionary& dict); static label expand(List<string>& scripts, const dictionary& dict);
//- Runtime type information
TypeName("catalyst");
// Constructors // Constructors
//- Construct from Time and dictionary //- Construct from Time and dictionary
......
...@@ -52,7 +52,7 @@ SourceFiles ...@@ -52,7 +52,7 @@ SourceFiles
namespace Foam namespace Foam
{ {
// Forward declarations // Forward Declarations
class dictionary; class dictionary;
class mapPolyMesh; class mapPolyMesh;
class Time; class Time;
...@@ -66,13 +66,17 @@ namespace catalyst ...@@ -66,13 +66,17 @@ namespace catalyst
class catalystInput class catalystInput
{ {
// Private data // Private Data
//- The Catalyst input channel name //- The Catalyst input channel name
word name_; word name_;
public: public:
//- Declare type-name (with debug switch)
ClassName("catalyst::input");
// Declare run-time constructor selection table // Declare run-time constructor selection table
declareRunTimeSelectionTable declareRunTimeSelectionTable
...@@ -100,10 +104,6 @@ public: ...@@ -100,10 +104,6 @@ public:
); );
//- Runtime type information
ClassName("catalyst::input");
// Constructors // Constructors
//- Construct with given Catalyst input channel name //- Construct with given Catalyst input channel name
......
...@@ -43,7 +43,7 @@ SourceFiles ...@@ -43,7 +43,7 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward declarations // Forward Declarations
class vtkCPDataDescription; class vtkCPDataDescription;
class vtkCPProcessor; class vtkCPProcessor;
class vtkMultiBlockDataSet; class vtkMultiBlockDataSet;
...@@ -52,7 +52,7 @@ template<class T> class vtkSmartPointer; ...@@ -52,7 +52,7 @@ template<class T> class vtkSmartPointer;
namespace Foam namespace Foam
{ {
// Forward declarations // Forward Declarations
class Ostream; class Ostream;
class Time; class Time;
...@@ -64,7 +64,6 @@ namespace catalyst ...@@ -64,7 +64,6 @@ namespace catalyst
//- Container holding VTK outputs per Catalyst channel name //- Container holding VTK outputs per Catalyst channel name
typedef HashTable<vtkSmartPointer<vtkMultiBlockDataSet>> outputChannels; typedef HashTable<vtkSmartPointer<vtkMultiBlockDataSet>> outputChannels;
//- Print information about data description //- Print information about data description
void printInfo(Ostream& os, vtkCPDataDescription* descrip); void printInfo(Ostream& os, vtkCPDataDescription* descrip);
...@@ -133,7 +132,7 @@ public: ...@@ -133,7 +132,7 @@ public:
// Constructors // Constructors
//- Construct query for given time. Add channels later //- Construct query for given time. Add channels later
dataQuery(const Foam::Time& when); explicit dataQuery(const Foam::Time& when);
//- Destructor //- Destructor
......
...@@ -98,7 +98,7 @@ class cloudInput ...@@ -98,7 +98,7 @@ class cloudInput
{ {
protected: protected:
// Protected data // Protected Data
//- Reference to the time database //- Reference to the time database
const Time& time_; const Time& time_;
...@@ -123,7 +123,7 @@ protected: ...@@ -123,7 +123,7 @@ protected:
public: public:
//- Runtime type information //- Declare type-name (with debug switch)
ClassName("catalyst::cloud"); ClassName("catalyst::cloud");
......
...@@ -65,7 +65,7 @@ namespace vtk ...@@ -65,7 +65,7 @@ namespace vtk
class cloudAdaptor class cloudAdaptor
{ {
// Private data // Private Data
const fvMesh& mesh_; const fvMesh& mesh_;
...@@ -95,6 +95,7 @@ class cloudAdaptor ...@@ -95,6 +95,7 @@ class cloudAdaptor
const UnaryPredicate& pred const UnaryPredicate& pred
); );
// Constructors // Constructors
//- No copy construct //- No copy construct
...@@ -106,15 +107,14 @@ class cloudAdaptor ...@@ -106,15 +107,14 @@ class cloudAdaptor
public: public:
//- Static Data Members //- Declare type-name (with debug switch)
ClassName("vtk::cloudAdaptor");
ClassName("vtk::cloudAdaptor");
// Constructors // Constructors
//- Construct for a particular mesh region //- Construct for a particular mesh region
cloudAdaptor(const fvMesh& mesh); explicit cloudAdaptor(const fvMesh& mesh);
//- Destructor //- Destructor
......
...@@ -126,7 +126,7 @@ class fvMeshInput ...@@ -126,7 +126,7 @@ class fvMeshInput
{ {
protected: protected:
// Protected data // Protected Data
//- Channel enumeration from vtk::fvMeshAdaptor //- Channel enumeration from vtk::fvMeshAdaptor
using channelType = vtk::fvMeshAdaptor::channelType; using channelType = vtk::fvMeshAdaptor::channelType;
...@@ -169,7 +169,7 @@ protected: ...@@ -169,7 +169,7 @@ protected:
public: public:
//- Runtime type information //- Declare type-name (with debug switch)
ClassName("catalyst::fvMesh"); ClassName("catalyst::fvMesh");
......
...@@ -74,7 +74,7 @@ class vtkIndent; ...@@ -74,7 +74,7 @@ class vtkIndent;
namespace Foam namespace Foam
{ {
// Forward declarations // Forward Declarations
class fvMesh; class fvMesh;
template<class Type> class Field; template<class Type> class Field;
...@@ -89,7 +89,7 @@ class fvMeshAdaptor ...@@ -89,7 +89,7 @@ class fvMeshAdaptor
{ {
public: public:
//- Public Data Members // Public Data Members
//- The types of output blocks. Defined as a bitmask. //- The types of output blocks. Defined as a bitmask.
enum channelType : unsigned enum channelType : unsigned
...@@ -255,15 +255,14 @@ private: ...@@ -255,15 +255,14 @@ private:
public: public:
//- Static Data Members //- Declare type-name (with debug switch)
ClassName("vtk::fvMeshAdaptor");
ClassName("vtk::fvMeshAdaptor");
// Constructors // Constructors
//- Construct from components //- Construct from components
fvMeshAdaptor explicit fvMeshAdaptor
( (
const fvMesh& mesh, const fvMesh& mesh,
const channelType channelsOpt = channelType::DEFAULT, const channelType channelsOpt = channelType::DEFAULT,
......
...@@ -153,9 +153,8 @@ class vtkPVblockMesh ...@@ -153,9 +153,8 @@ class vtkPVblockMesh
public: public:
//- Static data members //- Declare type-name (with debug switch)
ClassName("vtkPVblockMesh");
ClassName("vtkPVblockMesh");
// Constructors // Constructors
...@@ -189,6 +188,8 @@ public: ...@@ -189,6 +188,8 @@ public:
void renderPointNumbers(vtkRenderer* renderer, const bool show); void renderPointNumbers(vtkRenderer* renderer, const bool show);
// Access
//- Debug information //- Debug information
void PrintSelf(ostream&, vtkIndent) const; void PrintSelf(ostream&, vtkIndent) const;
}; };
......
...@@ -40,7 +40,7 @@ SourceFiles ...@@ -40,7 +40,7 @@ SourceFiles
#include "pqPropertyWidget.h" #include "pqPropertyWidget.h"
// Forward declarations (ParaView) // Forward Declarations (ParaView)
class vtkSMProperty; class vtkSMProperty;
class vtkSMIntVectorProperty; class vtkSMIntVectorProperty;
...@@ -56,7 +56,7 @@ class pqFoamBlockMeshControls ...@@ -56,7 +56,7 @@ class pqFoamBlockMeshControls
Q_OBJECT; Q_OBJECT;
typedef pqPropertyWidget Superclass; typedef pqPropertyWidget Superclass;
// Private data // Private Data
//- Refresh (push button) //- Refresh (push button)
vtkSMProperty* refresh_; vtkSMProperty* refresh_;
...@@ -114,7 +114,6 @@ public: ...@@ -114,7 +114,6 @@ public:
//- Destructor //- Destructor
virtual ~pqFoamBlockMeshControls(); virtual ~pqFoamBlockMeshControls();
}; };
......
...@@ -118,7 +118,7 @@ public: ...@@ -118,7 +118,7 @@ public:
protected: protected:
//- Construct null //- Default construct
vtkPVblockMeshReader(); vtkPVblockMeshReader();
//- Destructor //- Destructor
......
...@@ -62,6 +62,7 @@ template<class T> class vtkSmartPointer; ...@@ -62,6 +62,7 @@ template<class T> class vtkSmartPointer;
namespace Foam namespace Foam
{ {
// Forward Declarations
class IOobjectList; class IOobjectList;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
...@@ -165,13 +166,12 @@ public: ...@@ -165,13 +166,12 @@ public:
return indices; return indices;
} }
}; // End class arrayRange }; // End class arrayRange
public: public:
//- Construct null //- Default construct
constexpr foamPvCore() noexcept {} constexpr foamPvCore() noexcept {}
...@@ -293,12 +293,11 @@ public: ...@@ -293,12 +293,11 @@ public:
//- Simple memory used debugging information //- Simple memory used debugging information
static void printMemory(); static void printMemory();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
}; // End class foamPvCore
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
...@@ -93,7 +93,7 @@ class vtkTextActor; ...@@ -93,7 +93,7 @@ class vtkTextActor;
namespace Foam namespace Foam
{ {
// Forward declarations (OpenFOAM) // Forward Declarations (OpenFOAM)
class argList; class argList;
class Time; class Time;
class faMesh; class faMesh;
...@@ -209,6 +209,7 @@ class vtkPVFoam ...@@ -209,6 +209,7 @@ class vtkPVFoam
//- Reset data counters //- Reset data counters
void resetCounters(); void resetCounters();
// Update information helper functions // Update information helper functions
//- Internal mesh info //- Internal mesh info
...@@ -430,9 +431,8 @@ class vtkPVFoam ...@@ -430,9 +431,8 @@ class vtkPVFoam
public: public:
//- Static data members //- Declare type-name (with debug switch)
ClassName("vtkPVFoam");
ClassName("vtkPVFoam");
// Constructors // Constructors
...@@ -475,12 +475,16 @@ public: ...@@ -475,12 +475,16 @@ public:
// sets to "constant" on error // sets to "constant" on error
int setTime(const std::vector<double>& requestTimes); int setTime(const std::vector<double>& requestTimes);