loplugin:constfields in scaddins,sccomp

Change-Id: I4d21cfcc65c099fbddbe5146fc1b8a6257971e32
Reviewed-on: https://gerrit.libreoffice.org/61555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 36 insertions, 38 deletions

diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index f0eaac926dfb..05f3e7afdd8a 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -198,11 +198,11 @@ struct FuncDataBase
     const sal_Char*         pIntName;
     const char*             pUINameID;          // resource ID to UI name
     const char**            pDescrID;           // resource ID to description, parameter names and ~ description
-    bool                    bDouble;            // name already exist in Calc
-    bool                    bWithOpt;           // first parameter is internal
+    bool const              bDouble;            // name already exist in Calc
+    bool const              bWithOpt;           // first parameter is internal
     const char**            pCompListID;        // list of valid names
-    sal_uInt16              nNumOfParams;       // number of named / described parameters
-    FDCategory              eCat;               // function category
+    sal_uInt16 const        nNumOfParams;       // number of named / described parameters
+    FDCategory const        eCat;               // function category
     const char*             pSuffix;            // if bDouble, append a suffix other than "_ADD" for UI
 };
 
@@ -210,15 +210,15 @@ struct FuncDataBase
 class FuncData final
 {
 private:
-    OUString                aIntName;
+    OUString const          aIntName;
     const char*             pUINameID;
     const char**            pDescrID;           // leads also to parameter descriptions!
-    bool                    bDouble;            // flag for names that already exist in Calc
-    bool                    bWithOpt;           // has internal parameter on first position
+    bool const              bDouble;            // flag for names that already exist in Calc
+    bool const              bWithOpt;           // has internal parameter on first position
 
-    sal_uInt16              nParam;             // num of parameters
+    sal_uInt16 const        nParam;             // num of parameters
     std::vector<OUString>   aCompList;          // list of all valid names
-    FDCategory              eCat;               // function category
+    FDCategory const        eCat;               // function category
     OUString                aSuffix;            // if bDouble and not empty, append a suffix other than "_ADD" for UI
 
 public:
@@ -521,10 +521,10 @@ class ConvertData
 {
 protected:
     friend class ConvertDataList;
-    double                  fConst;
-    OUString                  aName;
-    ConvertDataClass        eClass;
-    bool                bPrefixSupport;
+    double const              fConst;
+    OUString const            aName;
+    ConvertDataClass const    eClass;
+    bool const                bPrefixSupport;
 public:
                             ConvertData(
                                 const sal_Char      pUnitName[],
@@ -551,7 +551,7 @@ public:
 
 class ConvertDataLinear final : public ConvertData
 {
-    double                  fOffs;
+    double const            fOffs;
 public:
     inline                  ConvertDataLinear(
                                 const sal_Char      pUnitName[],
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 51b2899daeef..10e98c0c8e30 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -50,23 +50,23 @@ struct ScaFuncDataBase
     const char*                 pUINameID;          // resource ID to UI name
     const char**                pDescrID;           // resource ID to description, parameter names and ~ description
     const char**                pCompListID;        // list of valid names
-    sal_uInt16                  nParamCount;        // number of named / described parameters
-    ScaCategory                 eCat;               // function category
-    bool                        bDouble;            // name already exist in Calc
-    bool                        bWithOpt;           // first parameter is internal
+    sal_uInt16 const            nParamCount;        // number of named / described parameters
+    ScaCategory const           eCat;               // function category
+    bool const                  bDouble;            // name already exist in Calc
+    bool const                  bWithOpt;           // first parameter is internal
 };
 
 class ScaFuncData final
 {
 private:
-    OUString                    aIntName;           // internal name (get***)
+    OUString const              aIntName;           // internal name (get***)
     const char*                 pUINameID;          // resource ID to UI name
     const char**                pDescrID;           // leads also to parameter descriptions!
-    sal_uInt16                  nParamCount;        // num of parameters
+    sal_uInt16 const            nParamCount;        // num of parameters
     std::vector<OUString>       aCompList;          // list of all valid names
-    ScaCategory                 eCat;               // function category
-    bool                    bDouble;            // name already exist in Calc
-    bool                    bWithOpt;           // first parameter is internal
+    ScaCategory const           eCat;               // function category
+    bool const                   bDouble;            // name already exist in Calc
+    bool const                   bWithOpt;           // first parameter is internal
 
 public:
                                 ScaFuncData(const ScaFuncDataBase& rBaseData);
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 6ee27108c2ba..76257fbd8e78 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -66,23 +66,23 @@ struct ScaFuncDataBase
     // (English) function names again.
     // see also: GetExcelName() or GetCompNames() or getCompatibilityNames()
     const char*                 pCompName;
-    sal_uInt16                  nParamCount;        // number of named / described parameters
-    ScaCategory                 eCat;               // function category
-    bool                        bDouble;            // name already exist in Calc
-    bool                        bWithOpt;           // first parameter is internal
+    sal_uInt16 const            nParamCount;        // number of named / described parameters
+    ScaCategory const           eCat;               // function category
+    bool const                  bDouble;            // name already exist in Calc
+    bool const                  bWithOpt;           // first parameter is internal
 };
 
 class ScaFuncData final
 {
 private:
-    OUString                aIntName;           // internal name (get***)
+    OUString const          aIntName;           // internal name (get***)
     const char*             pUINameID;          // resource ID to UI name
     const char**            pDescrID;           // leads also to parameter descriptions!
-    sal_uInt16              nParamCount;        // num of parameters
+    sal_uInt16 const        nParamCount;        // num of parameters
     std::vector<OUString>   aCompList;          // list of all valid names
-    ScaCategory             eCat;               // function category
-    bool                    bDouble;            // name already exist in Calc
-    bool                    bWithOpt;           // first parameter is internal
+    ScaCategory const       eCat;               // function category
+    bool const              bDouble;            // name already exist in Calc
+    bool const              bWithOpt;           // first parameter is internal
 
 public:
     ScaFuncData(const ScaFuncDataBase& rBaseData);
diff --git a/sccomp/source/solver/DifferentialEvolution.hxx b/sccomp/source/solver/DifferentialEvolution.hxx
index 7d18821350aa..a71af6d82fe7 100644
--- a/sccomp/source/solver/DifferentialEvolution.hxx
+++ b/sccomp/source/solver/DifferentialEvolution.hxx
@@ -29,12 +29,12 @@ template <typename DataProvider> class DifferentialEvolutionAlgorithm
 
     DataProvider& mrDataProvider;
 
-    size_t mnPopulationSize;
+    size_t const mnPopulationSize;
     std::vector<Individual> maPopulation;
 
     std::random_device maRandomDevice;
     std::mt19937 maGenerator;
-    size_t mnDimensionality;
+    size_t const mnDimensionality;
 
     std::uniform_int_distribution<> maRandomPopulation;
     std::uniform_int_distribution<> maRandomDimensionality;
diff --git a/sccomp/source/solver/ParticelSwarmOptimization.hxx b/sccomp/source/solver/ParticelSwarmOptimization.hxx
index ec76474ddece..61eed529785d 100644
--- a/sccomp/source/solver/ParticelSwarmOptimization.hxx
+++ b/sccomp/source/solver/ParticelSwarmOptimization.hxx
@@ -49,7 +49,7 @@ private:
 
     DataProvider& mrDataProvider;
 
-    size_t mnNumOfParticles;
+    size_t const mnNumOfParticles;
 
     std::vector<Particle> maSwarm;
 
diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx
index 2a549fb0e0a8..11d1cb2e8f18 100644
--- a/sccomp/source/solver/SwarmSolver.cxx
+++ b/sccomp/source/solver/SwarmSolver.cxx
@@ -116,7 +116,6 @@ private:
 
     // results
     bool mbSuccess;
-    double mfResultValue;
 
     uno::Sequence<double> maSolution;
     OUString maStatus;
@@ -140,7 +139,6 @@ public:
         , mnTimeout(60000)
         , mnAlgorithm(0)
         , mbSuccess(false)
-        , mfResultValue(0.0)
     {
         registerProperty("NonNegative", PROP_NONNEGATIVE, 0, &mbNonNegative,
                          cppu::UnoType<decltype(mbNonNegative)>::get());
@@ -212,7 +210,7 @@ public:
     virtual void SAL_CALL setMaximize(sal_Bool bMaximize) override { mbMaximize = bMaximize; }
 
     virtual sal_Bool SAL_CALL getSuccess() override { return mbSuccess; }
-    virtual double SAL_CALL getResultValue() override { return mfResultValue; }
+    virtual double SAL_CALL getResultValue() override { return 0; }
 
     virtual uno::Sequence<double> SAL_CALL getSolution() override { return maSolution; }