From d24dfea03626842269fcf33ac8dcd14c9f690484 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 29 Jul 2015 14:26:32 -0400 Subject: [PATCH] Remove unnecessary public/private/protected labels --- include/cantera/Edge.h | 2 -- include/cantera/IdealGasMix.h | 2 -- include/cantera/IncompressibleSolid.h | 2 -- include/cantera/Metal.h | 2 -- include/cantera/numerics/Func1.h | 20 -------------------- include/cantera/numerics/ResidEval.h | 3 --- include/cantera/thermo/MetalPhase.h | 2 -- include/cantera/thermo/RedlichKwongMFTP.h | 3 --- include/cantera/thermo/SemiconductorPhase.h | 2 -- include/cantera/thermo/SingleSpeciesTP.h | 1 - include/cantera/thermo/VPStandardStateTP.h | 3 --- include/cantera/transport/MixTransport.h | 1 - include/cantera/transport/SimpleTransport.h | 1 - include/cantera/transport/TransportFactory.h | 1 - src/base/xml.cpp | 1 - 15 files changed, 46 deletions(-) diff --git a/include/cantera/Edge.h b/include/cantera/Edge.h index 725816504..f22d8ac7c 100644 --- a/include/cantera/Edge.h +++ b/include/cantera/Edge.h @@ -42,8 +42,6 @@ public: protected: bool m_ok; XML_Node* m_r; - -private: }; } diff --git a/include/cantera/IdealGasMix.h b/include/cantera/IdealGasMix.h index aec2423ac..bd24df2f6 100644 --- a/include/cantera/IdealGasMix.h +++ b/include/cantera/IdealGasMix.h @@ -61,8 +61,6 @@ protected: bool m_ok; XML_Node* m_r; std::string m_id; - -private: }; } diff --git a/include/cantera/IncompressibleSolid.h b/include/cantera/IncompressibleSolid.h index 48b1cb920..ae208e2bd 100644 --- a/include/cantera/IncompressibleSolid.h +++ b/include/cantera/IncompressibleSolid.h @@ -33,8 +33,6 @@ public: protected: bool m_ok; XML_Node* m_r; - -private: }; } diff --git a/include/cantera/Metal.h b/include/cantera/Metal.h index a7508c78e..c195038e2 100644 --- a/include/cantera/Metal.h +++ b/include/cantera/Metal.h @@ -32,8 +32,6 @@ public: protected: bool m_ok; XML_Node* m_r; - -private: }; } diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h index 672a5d92c..ecd87fc56 100644 --- a/include/cantera/numerics/Func1.h +++ b/include/cantera/numerics/Func1.h @@ -204,8 +204,6 @@ public: return cos(m_c * t); } virtual Func1& derivative() const; - -protected: }; /// exp @@ -239,9 +237,6 @@ public: } virtual Func1& derivative() const; - -protected: - }; /// pow @@ -274,9 +269,6 @@ public: return pow(t, m_c); } virtual Func1& derivative() const; - -protected: - }; /** @@ -507,8 +499,6 @@ public: virtual int order() const { return 1; } - -protected: }; /** @@ -584,7 +574,6 @@ public: virtual int order() const { return 0; } -protected: }; /** @@ -641,8 +630,6 @@ public: virtual int order() const { return 0; } - -protected: }; @@ -710,8 +697,6 @@ public: virtual int order() const { return 1; } - -protected: }; /** @@ -779,8 +764,6 @@ public: virtual int order() const { return 2; } - -protected: }; // @@ -837,7 +820,6 @@ public: protected: doublereal m_A, m_t0, m_tau; -private: }; @@ -1059,8 +1041,6 @@ public: protected: Func1* m_func; - -private: }; } diff --git a/include/cantera/numerics/ResidEval.h b/include/cantera/numerics/ResidEval.h index 9cef80545..fa839ec13 100644 --- a/include/cantera/numerics/ResidEval.h +++ b/include/cantera/numerics/ResidEval.h @@ -170,9 +170,6 @@ protected: */ std::vector m_alg; std::map m_constrain; - -private: - }; } diff --git a/include/cantera/thermo/MetalPhase.h b/include/cantera/thermo/MetalPhase.h index 5df3b7057..18e8f0abe 100644 --- a/include/cantera/thermo/MetalPhase.h +++ b/include/cantera/thermo/MetalPhase.h @@ -121,8 +121,6 @@ public: setDensity(rho); } -protected: - private: doublereal m_press; }; diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h index 0a63effaa..622ca88dc 100644 --- a/include/cantera/thermo/RedlichKwongMFTP.h +++ b/include/cantera/thermo/RedlichKwongMFTP.h @@ -144,7 +144,6 @@ protected: */ virtual void calcDensity(); -protected: //! Set the temperature (K) /*! * This function sets the temperature, and makes sure that @@ -429,7 +428,6 @@ private: */ void readXMLCrossFluid(XML_Node& pureFluidParam); -private: //! @internal Initialize the internal lengths in this object. /*! * Note this is not a virtual function and only handles this object @@ -473,7 +471,6 @@ public: */ virtual doublereal liquidVolEst(doublereal TKelvin, doublereal& pres) const; -public: //! Calculates the density given the temperature and the pressure and a guess at the density. /*! * Note, below T_c, this is a multivalued function. We do not cross the vapor dome in this. diff --git a/include/cantera/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h index 8dae8170d..f7e972184 100644 --- a/include/cantera/thermo/SemiconductorPhase.h +++ b/include/cantera/thermo/SemiconductorPhase.h @@ -117,8 +117,6 @@ public: return m_bandgap; } -protected: - private: doublereal m_press; doublereal m_emass; diff --git a/include/cantera/thermo/SingleSpeciesTP.h b/include/cantera/thermo/SingleSpeciesTP.h index edee5fe0f..5d6cbe8b0 100644 --- a/include/cantera/thermo/SingleSpeciesTP.h +++ b/include/cantera/thermo/SingleSpeciesTP.h @@ -489,7 +489,6 @@ protected: //! Dimensionless entropy at the (mtlast, m_p0) mutable vector_fp m_s0_R; -protected: /** * @internal * This crucial internal routine calls the species thermo diff --git a/include/cantera/thermo/VPStandardStateTP.h b/include/cantera/thermo/VPStandardStateTP.h index 2c5555ac5..7d5ae6951 100644 --- a/include/cantera/thermo/VPStandardStateTP.h +++ b/include/cantera/thermo/VPStandardStateTP.h @@ -451,7 +451,6 @@ public: virtual void getStandardVolumes_ref(doublereal* vol) const; //@} -public: //! @name Initialization Methods - For Internal use (VPStandardState) /*! * The following methods are used in the process of constructing @@ -536,8 +535,6 @@ protected: doublereal m_P0; // -> suggest making this private! -protected: - //! Pointer to the VPSS manager that calculates all of the standard state //! info efficiently. mutable VPSSMgr* m_VPSS_ptr; diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h index 51c6aec4c..52d8e996b 100644 --- a/include/cantera/transport/MixTransport.h +++ b/include/cantera/transport/MixTransport.h @@ -175,7 +175,6 @@ private: */ void updateCond_T(); -private: //! vector of species thermal conductivities (W/m /K) /*! * These are used in wilke's rule to calculate the viscosity of the diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h index d730c6f48..65dae559a 100644 --- a/include/cantera/transport/SimpleTransport.h +++ b/include/cantera/transport/SimpleTransport.h @@ -689,7 +689,6 @@ private: vector_fp m_fluxes; -private: //! Boolean indicating that the top-level mixture viscosity is current /*! * This is turned false for every change in T, P, or C. diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h index 747e8ed07..0dec21aaa 100644 --- a/include/cantera/transport/TransportFactory.h +++ b/include/cantera/transport/TransportFactory.h @@ -132,7 +132,6 @@ private: */ virtual void initSolidTransport(Transport* tr, thermo_t* thermo, int log_level=0); -private: //! Static instance of the factor -> This is the only instance of this //! object allowed static TransportFactory* s_factory; diff --git a/src/base/xml.cpp b/src/base/xml.cpp index 4eab88934..e1c3494b6 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -48,7 +48,6 @@ protected: virtual ~XML_Error() throw() { } -protected: //! Line number of the file int m_line;