Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Modules
Visualization
Commits
d534b220
Commit
d534b220
authored
Jan 20, 2020
by
Mark Olesen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
STYLE: formatting consistency for class declarations
parent
e3d971dd
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
84 additions
and
88 deletions
+84
-88
src/catalyst/areaMesh/catalystFaMesh.H
src/catalyst/areaMesh/catalystFaMesh.H
+2
-2
src/catalyst/areaMesh/foamVtkFaMeshAdaptor.H
src/catalyst/areaMesh/foamVtkFaMeshAdaptor.H
+8
-7
src/catalyst/catalystCoprocess.H
src/catalyst/catalystCoprocess.H
+2
-5
src/catalyst/catalystFunctionObject.H
src/catalyst/catalystFunctionObject.H
+5
-5
src/catalyst/catalystInput.H
src/catalyst/catalystInput.H
+6
-6
src/catalyst/catalystTools.H
src/catalyst/catalystTools.H
+3
-4
src/catalyst/cloud/catalystCloud.H
src/catalyst/cloud/catalystCloud.H
+2
-2
src/catalyst/cloud/foamVtkCloudAdaptor.H
src/catalyst/cloud/foamVtkCloudAdaptor.H
+5
-5
src/catalyst/volMesh/catalystFvMesh.H
src/catalyst/volMesh/catalystFvMesh.H
+2
-2
src/catalyst/volMesh/foamVtkFvMeshAdaptor.H
src/catalyst/volMesh/foamVtkFvMeshAdaptor.H
+5
-6
src/paraview-plugins/blockMeshReader/library/vtkPVblockMesh.H
...paraview-plugins/blockMeshReader/library/vtkPVblockMesh.H
+4
-3
src/paraview-plugins/blockMeshReader/plugin/pqFoamBlockMeshControls.h
...-plugins/blockMeshReader/plugin/pqFoamBlockMeshControls.h
+2
-3
src/paraview-plugins/blockMeshReader/plugin/reader/vtkPVblockMeshReader.h
...gins/blockMeshReader/plugin/reader/vtkPVblockMeshReader.h
+1
-1
src/paraview-plugins/common/foamPvCore.H
src/paraview-plugins/common/foamPvCore.H
+3
-4
src/paraview-plugins/foamReader/library/vtkPVFoam.H
src/paraview-plugins/foamReader/library/vtkPVFoam.H
+8
-4
src/paraview-plugins/foamReader/library/vtkPVFoamUpdateInfo.C
...paraview-plugins/foamReader/library/vtkPVFoamUpdateInfo.C
+1
-2
src/paraview-plugins/foamReader/plugin/pqFoamReaderControls.h
...paraview-plugins/foamReader/plugin/pqFoamReaderControls.h
+2
-3
src/paraview-plugins/foamReader/plugin/reader/vtkPVFoamReader.h
...raview-plugins/foamReader/plugin/reader/vtkPVFoamReader.h
+1
-1
src/runTimePostProcessing/contourFilter.H
src/runTimePostProcessing/contourFilter.H
+1
-1
src/runTimePostProcessing/cuttingPlaneFilter.H
src/runTimePostProcessing/cuttingPlaneFilter.H
+1
-1
src/runTimePostProcessing/fieldVisualisationBase.H
src/runTimePostProcessing/fieldVisualisationBase.H
+1
-1
src/runTimePostProcessing/functionObjectCloud.H
src/runTimePostProcessing/functionObjectCloud.H
+1
-1
src/runTimePostProcessing/functionObjectLine.H
src/runTimePostProcessing/functionObjectLine.H
+1
-1
src/runTimePostProcessing/functionObjectSurface.H
src/runTimePostProcessing/functionObjectSurface.H
+1
-1
src/runTimePostProcessing/geometryBase.H
src/runTimePostProcessing/geometryBase.H
+1
-2
src/runTimePostProcessing/geometryCloud.H
src/runTimePostProcessing/geometryCloud.H
+1
-1
src/runTimePostProcessing/geometryPatches.H
src/runTimePostProcessing/geometryPatches.H
+1
-1
src/runTimePostProcessing/geometrySurface.H
src/runTimePostProcessing/geometrySurface.H
+1
-1
src/runTimePostProcessing/pathline.H
src/runTimePostProcessing/pathline.H
+3
-3
src/runTimePostProcessing/pointData.H
src/runTimePostProcessing/pointData.H
+1
-1
src/runTimePostProcessing/runTimePostProcessing.H
src/runTimePostProcessing/runTimePostProcessing.H
+3
-3
src/runTimePostProcessing/scalarBar.H
src/runTimePostProcessing/scalarBar.H
+1
-1
src/runTimePostProcessing/scene.H
src/runTimePostProcessing/scene.H
+3
-3
src/runTimePostProcessing/surface.H
src/runTimePostProcessing/surface.H
+1
-1
No files found.
src/catalyst/areaMesh/catalystFaMesh.H
View file @
d534b220
...
...
@@ -99,7 +99,7 @@ class faMeshInput
{
protected:
// Protected
d
ata
// Protected
D
ata
//- Reference to the time database
const
Time
&
time_
;
...
...
@@ -133,7 +133,7 @@ protected:
public:
//-
Runtime type information
//-
Declare type-name (with debug switch)
ClassName
(
"catalyst::faMesh"
);
...
...
src/catalyst/areaMesh/foamVtkFaMeshAdaptor.H
View file @
d534b220
...
...
@@ -67,7 +67,7 @@ class vtkIndent;
namespace
Foam
{
// Forward
d
eclarations
// Forward
D
eclarations
class
Time
;
class
faMesh
;
template
<
class
Type
>
class
Field
;
...
...
@@ -83,7 +83,7 @@ class faMeshAdaptor
{
public:
//
-
Public Data Members
// Public Data Members
//- Name for internal mesh ("internal")
static
const
word
internalName
;
...
...
@@ -91,6 +91,8 @@ public:
private:
// Private Classes
//- Bookkeeping for vtkPolyData
struct
foamVtpData
:
...
...
@@ -160,15 +162,14 @@ private:
public:
//- Static Data Members
ClassName
(
"vtk::faMeshAdaptor"
);
//- Declare type-name (with debug switch)
ClassName
(
"vtk::faMeshAdaptor"
);
// Constructors
//- Construct f
rom components
faMeshAdaptor
(
const
faMesh
&
mesh
);
//- Construct f
or mesh region
explicit
faMeshAdaptor
(
const
faMesh
&
mesh
);
//- Destructor
...
...
src/catalyst/catalystCoprocess.H
View file @
d534b220
...
...
@@ -56,8 +56,6 @@ namespace catalyst
class
coprocess
{
private:
// Private Data
//- The currently active ParaView Catalyst co-process
...
...
@@ -76,13 +74,13 @@ private:
public:
//- De
fine class name and debug
//- De
clare type-name (with debug switch)
ClassName
(
"catalyst"
);
// Constructors
//-
C
onstruct
null
. Does not initialize catalyst.
//-
Default c
onstruct. Does not initialize catalyst.
constexpr
coprocess
()
noexcept
:
coproc_
(
nullptr
)
...
...
@@ -129,7 +127,6 @@ public:
//- Finalize
void
stop
();
};
...
...
src/catalyst/catalystFunctionObject.H
View file @
d534b220
...
...
@@ -119,7 +119,7 @@ class catalystFunctionObject
:
public
functionObject
{
// Private
d
ata
// Private
D
ata
//- Reference to the time database
const
Time
&
time_
;
...
...
@@ -148,16 +148,16 @@ class catalystFunctionObject
public:
//- Declare type-name (with debug switch)
TypeName
(
"catalyst"
);
// Static Methods
//- Expand strings as filenames, retaining only those that exist
static
label
expand
(
List
<
string
>&
scripts
,
const
dictionary
&
dict
);
//- Runtime type information
TypeName
(
"catalyst"
);
// Constructors
//- Construct from Time and dictionary
...
...
src/catalyst/catalystInput.H
View file @
d534b220
...
...
@@ -52,7 +52,7 @@ SourceFiles
namespace
Foam
{
// Forward
d
eclarations
// Forward
D
eclarations
class
dictionary
;
class
mapPolyMesh
;
class
Time
;
...
...
@@ -66,13 +66,17 @@ namespace catalyst
class
catalystInput
{
// Private
d
ata
// Private
D
ata
//- The Catalyst input channel name
word
name_
;
public:
//- Declare type-name (with debug switch)
ClassName
(
"catalyst::input"
);
// Declare run-time constructor selection table
declareRunTimeSelectionTable
...
...
@@ -100,10 +104,6 @@ public:
);
//- Runtime type information
ClassName
(
"catalyst::input"
);
// Constructors
//- Construct with given Catalyst input channel name
...
...
src/catalyst/catalystTools.H
View file @
d534b220
...
...
@@ -43,7 +43,7 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward
d
eclarations
// Forward
D
eclarations
class
vtkCPDataDescription
;
class
vtkCPProcessor
;
class
vtkMultiBlockDataSet
;
...
...
@@ -52,7 +52,7 @@ template<class T> class vtkSmartPointer;
namespace
Foam
{
// Forward
d
eclarations
// Forward
D
eclarations
class
Ostream
;
class
Time
;
...
...
@@ -64,7 +64,6 @@ namespace catalyst
//- Container holding VTK outputs per Catalyst channel name
typedef
HashTable
<
vtkSmartPointer
<
vtkMultiBlockDataSet
>>
outputChannels
;
//- Print information about data description
void
printInfo
(
Ostream
&
os
,
vtkCPDataDescription
*
descrip
);
...
...
@@ -133,7 +132,7 @@ public:
// Constructors
//- Construct query for given time. Add channels later
dataQuery
(
const
Foam
::
Time
&
when
);
explicit
dataQuery
(
const
Foam
::
Time
&
when
);
//- Destructor
...
...
src/catalyst/cloud/catalystCloud.H
View file @
d534b220
...
...
@@ -98,7 +98,7 @@ class cloudInput
{
protected:
// Protected
d
ata
// Protected
D
ata
//- Reference to the time database
const
Time
&
time_
;
...
...
@@ -123,7 +123,7 @@ protected:
public:
//-
Runtime type information
//-
Declare type-name (with debug switch)
ClassName
(
"catalyst::cloud"
);
...
...
src/catalyst/cloud/foamVtkCloudAdaptor.H
View file @
d534b220
...
...
@@ -65,7 +65,7 @@ namespace vtk
class
cloudAdaptor
{
// Private
d
ata
// Private
D
ata
const
fvMesh
&
mesh_
;
...
...
@@ -95,6 +95,7 @@ class cloudAdaptor
const
UnaryPredicate
&
pred
);
// Constructors
//- No copy construct
...
...
@@ -106,15 +107,14 @@ class cloudAdaptor
public:
//- Static Data Members
ClassName
(
"vtk::cloudAdaptor"
);
//- Declare type-name (with debug switch)
ClassName
(
"vtk::cloudAdaptor"
);
// Constructors
//- Construct for a particular mesh region
cloudAdaptor
(
const
fvMesh
&
mesh
);
explicit
cloudAdaptor
(
const
fvMesh
&
mesh
);
//- Destructor
...
...
src/catalyst/volMesh/catalystFvMesh.H
View file @
d534b220
...
...
@@ -126,7 +126,7 @@ class fvMeshInput
{
protected:
// Protected
d
ata
// Protected
D
ata
//- Channel enumeration from vtk::fvMeshAdaptor
using
channelType
=
vtk
::
fvMeshAdaptor
::
channelType
;
...
...
@@ -169,7 +169,7 @@ protected:
public:
//-
Runtime type information
//-
Declare type-name (with debug switch)
ClassName
(
"catalyst::fvMesh"
);
...
...
src/catalyst/volMesh/foamVtkFvMeshAdaptor.H
View file @
d534b220
...
...
@@ -74,7 +74,7 @@ class vtkIndent;
namespace
Foam
{
// Forward
d
eclarations
// Forward
D
eclarations
class
fvMesh
;
template
<
class
Type
>
class
Field
;
...
...
@@ -89,7 +89,7 @@ class fvMeshAdaptor
{
public:
//
-
Public Data Members
// Public Data Members
//- The types of output blocks. Defined as a bitmask.
enum
channelType
:
unsigned
...
...
@@ -255,15 +255,14 @@ private:
public:
//- Static Data Members
ClassName
(
"vtk::fvMeshAdaptor"
);
//- Declare type-name (with debug switch)
ClassName
(
"vtk::fvMeshAdaptor"
);
// Constructors
//- Construct from components
fvMeshAdaptor
explicit
fvMeshAdaptor
(
const
fvMesh
&
mesh
,
const
channelType
channelsOpt
=
channelType
::
DEFAULT
,
...
...
src/paraview-plugins/blockMeshReader/library/vtkPVblockMesh.H
View file @
d534b220
...
...
@@ -153,9 +153,8 @@ class vtkPVblockMesh
public:
//- Static data members
ClassName
(
"vtkPVblockMesh"
);
//- Declare type-name (with debug switch)
ClassName
(
"vtkPVblockMesh"
);
// Constructors
...
...
@@ -189,6 +188,8 @@ public:
void
renderPointNumbers
(
vtkRenderer
*
renderer
,
const
bool
show
);
// Access
//- Debug information
void
PrintSelf
(
ostream
&
,
vtkIndent
)
const
;
};
...
...
src/paraview-plugins/blockMeshReader/plugin/pqFoamBlockMeshControls.h
View file @
d534b220
...
...
@@ -40,7 +40,7 @@ SourceFiles
#include "pqPropertyWidget.h"
// Forward
d
eclarations (ParaView)
// Forward
D
eclarations (ParaView)
class
vtkSMProperty
;
class
vtkSMIntVectorProperty
;
...
...
@@ -56,7 +56,7 @@ class pqFoamBlockMeshControls
Q_OBJECT
;
typedef
pqPropertyWidget
Superclass
;
// Private
d
ata
// Private
D
ata
//- Refresh (push button)
vtkSMProperty
*
refresh_
;
...
...
@@ -114,7 +114,6 @@ public:
//- Destructor
virtual
~
pqFoamBlockMeshControls
();
};
...
...
src/paraview-plugins/blockMeshReader/plugin/reader/vtkPVblockMeshReader.h
View file @
d534b220
...
...
@@ -118,7 +118,7 @@ public:
protected:
//-
C
onstruct
null
//-
Default c
onstruct
vtkPVblockMeshReader
();
//- Destructor
...
...
src/paraview-plugins/common/foamPvCore.H
View file @
d534b220
...
...
@@ -62,6 +62,7 @@ template<class T> class vtkSmartPointer;
namespace
Foam
{
// Forward Declarations
class
IOobjectList
;
/*---------------------------------------------------------------------------*\
...
...
@@ -165,13 +166,12 @@ public:
return
indices
;
}
};
// End class arrayRange
public:
//-
C
onstruct
null
//-
Default c
onstruct
constexpr
foamPvCore
()
noexcept
{}
...
...
@@ -293,12 +293,11 @@ public:
//- Simple memory used debugging information
static
void
printMemory
();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
};
// End class foamPvCore
}
// End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/paraview-plugins/foamReader/library/vtkPVFoam.H
View file @
d534b220
...
...
@@ -93,7 +93,7 @@ class vtkTextActor;
namespace
Foam
{
// Forward
d
eclarations (OpenFOAM)
// Forward
D
eclarations (OpenFOAM)
class
argList
;
class
Time
;
class
faMesh
;
...
...
@@ -209,6 +209,7 @@ class vtkPVFoam
//- Reset data counters
void
resetCounters
();
// Update information helper functions
//- Internal mesh info
...
...
@@ -430,9 +431,8 @@ class vtkPVFoam
public:
//- Static data members
ClassName
(
"vtkPVFoam"
);
//- Declare type-name (with debug switch)
ClassName
(
"vtkPVFoam"
);
// Constructors
...
...
@@ -475,12 +475,16 @@ public:
// sets to "constant" on error
int
setTime
(
const
std
::
vector
<
double
>&
requestTimes
);
//- The current time index
int
timeIndex
()
const
{
return
timeIndex_
;
}
// Access
//- Debug information
void
PrintSelf
(
ostream
&
,
vtkIndent
)
const
;
...
...
src/paraview-plugins/foamReader/library/vtkPVFoamUpdateInfo.C
View file @
d534b220
...
...
@@ -59,7 +59,6 @@ class zonesEntries
public
regIOobject
,
public
PtrList
<
entry
>
{
public:
// Constructors
...
...
@@ -72,7 +71,7 @@ public:
close
();
}
// Member
f
unctions
// Member
F
unctions
bool
writeData
(
Ostream
&
)
const
{
...
...
src/paraview-plugins/foamReader/plugin/pqFoamReaderControls.h
View file @
d534b220
...
...
@@ -38,7 +38,7 @@ SourceFiles
#include "pqPropertyWidget.h"
// Forward
d
eclarations
// Forward
D
eclarations
class
vtkSMProperty
;
class
vtkSMIntVectorProperty
;
...
...
@@ -54,7 +54,7 @@ class pqFoamReaderControls
Q_OBJECT
;
typedef
pqPropertyWidget
Superclass
;
// Private
d
ata
// Private
D
ata
//- Refresh (push button)
vtkSMProperty
*
refresh_
;
...
...
@@ -123,7 +123,6 @@ public:
//- Destructor
virtual
~
pqFoamReaderControls
();
};
...
...
src/paraview-plugins/foamReader/plugin/reader/vtkPVFoamReader.h
View file @
d534b220
...
...
@@ -191,7 +191,7 @@ public:
protected:
//-
C
onstruct
null
//-
Default c
onstruct
vtkPVFoamReader
();
//- Destructor
...
...
src/runTimePostProcessing/contourFilter.H
View file @
d534b220
...
...
@@ -89,7 +89,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"isoSurface"
);
...
...
src/runTimePostProcessing/cuttingPlaneFilter.H
View file @
d534b220
...
...
@@ -109,7 +109,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"plane"
);
...
...
src/runTimePostProcessing/fieldVisualisationBase.H
View file @
d534b220
...
...
@@ -146,7 +146,7 @@ public:
unsigned
association_
;
scalarMinMax
range_
;
//-
C
onstruct
null
//-
Default c
onstruct
fieldSummary
()
:
nComponents_
(
0
),
...
...
src/runTimePostProcessing/functionObjectCloud.H
View file @
d534b220
...
...
@@ -96,7 +96,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"functionObjectCloud"
);
...
...
src/runTimePostProcessing/functionObjectLine.H
View file @
d534b220
...
...
@@ -83,7 +83,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"functionObjectLine"
);
...
...
src/runTimePostProcessing/functionObjectSurface.H
View file @
d534b220
...
...
@@ -86,7 +86,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"functionObjectSurface"
);
...
...
src/runTimePostProcessing/geometryBase.H
View file @
d534b220
...
...
@@ -69,7 +69,6 @@ class runTimePostProcessing;
namespace
runTimePostPro
{
/*---------------------------------------------------------------------------*\
Class geometryBase Declaration
\*---------------------------------------------------------------------------*/
...
...
@@ -94,7 +93,7 @@ public:
protected:
// Protected
d
ata
// Protected
D
ata
//- Reference to the parent function object
const
runTimePostProcessing
&
parent_
;
...
...
src/runTimePostProcessing/geometryCloud.H
View file @
d534b220
...
...
@@ -141,7 +141,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"geometryCloud"
);
...
...
src/runTimePostProcessing/geometryPatches.H
View file @
d534b220
...
...
@@ -118,7 +118,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (without debug switch)
TypeNameNoDebug
(
"patches"
);
...
...
src/runTimePostProcessing/geometrySurface.H
View file @
d534b220
...
...
@@ -97,7 +97,7 @@ protected:
public:
//-
Run-time type information
//-
Declare type-name, virtual type (with debug switch)
TypeName
(
"geometry"
);
...
...
src/runTimePostProcessing/pathline.H
View file @
d534b220
...
...
@@ -51,7 +51,7 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward
d
eclarations
// Forward
D
eclarations
class
vtkActor
;
class
vtkPolyData
;
class
vtkPolyDataMapper
;
...
...
@@ -90,7 +90,7 @@ public:
protected:
// Protected
d
ata
// Protected
D
ata
//- Representation type
representationType
representation_
;
...
...
@@ -121,7 +121,7 @@ protected:
public: