REFAC: replace IsAlphaNum() by a lambda

Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx

@@ -37,11 +37,6 @@ namespace otb
 {
 namespace Wrapper
 {
-/** Utility function to negate std::isalnum */
-bool IsNotAlphaNum(char c)
-  {
-  return !std::isalnum(c);
-  }
 
 class ComputeConfusionMatrix : public Application
 {
@@ -198,7 +193,7 @@ private:
         {
         std::string key, item = feature.ogr().GetFieldDefnRef(iField)->GetNameRef();
         key = item;
-        std::string::iterator end = std::remove_if(key.begin(),key.end(),IsNotAlphaNum);
+        std::string::iterator end = std::remove_if(key.begin(),key.end(), [](char c){return !std::isalnum(c);});
         std::transform(key.begin(), end, key.begin(), tolower);
         
         OGRFieldType fieldType = feature.ogr().GetFieldDefnRef(iField)->GetType();

Modules/Applications/AppClassification/app/otbPolygonClassStatistics.cxx

@@ -32,12 +32,6 @@ namespace otb
 namespace Wrapper
 {
 
-/** Utility function to negate std::isalnum */
-bool IsNotAlphaNum(char c)
-  {
-  return !std::isalnum(c);
-  }
-
 class PolygonClassStatistics : public Application
 {
 public:
@@ -141,7 +135,7 @@ private:
         {
         std::string key, item = feature.ogr().GetFieldDefnRef(iField)->GetNameRef();
         key = item;
-        std::string::iterator end = std::remove_if(key.begin(),key.end(),IsNotAlphaNum);
+        std::string::iterator end = std::remove_if(key.begin(),key.end(), [](char c){return !std::isalnum(c);});
         std::transform(key.begin(), end, key.begin(), tolower);
 
         OGRFieldType fieldType = feature.ogr().GetFieldDefnRef(iField)->GetType();

Modules/Applications/AppClassification/app/otbSampleExtraction.cxx

@@ -27,12 +27,6 @@ namespace otb
 {
 namespace Wrapper
 {
-/** Utility function to negate std::isalnum */
-bool IsNotAlphaNum(char c)
-  {
-  return !std::isalnum(c);
-  }
-
 class SampleExtraction : public Application
 {
 public:
@@ -139,7 +133,7 @@ private:
         {
         std::string key, item = feature.ogr().GetFieldDefnRef(iField)->GetNameRef();
         key = item;
-        std::string::iterator end = std::remove_if(key.begin(),key.end(),IsNotAlphaNum);
+        std::string::iterator end = std::remove_if(key.begin(),key.end(), [](char c){return !std::isalnum(c);});
         std::transform(key.begin(), end, key.begin(), tolower);
         
         OGRFieldType fieldType = feature.ogr().GetFieldDefnRef(iField)->GetType();

Modules/Applications/AppClassification/app/otbSampleSelection.cxx

@@ -32,13 +32,6 @@ namespace otb
 {
 namespace Wrapper
 {
-
-/** Utility function to negate std::isalnum */
-bool IsNotAlphaNum(char c)
-  {
-  return !std::isalnum(c);
-  }
-
 class SampleSelection : public Application
 {
 public:
@@ -243,7 +236,7 @@ private:
         {
         std::string key, item = feature.ogr().GetFieldDefnRef(iField)->GetNameRef();
         key = item;
-        std::string::iterator end = std::remove_if(key.begin(),key.end(),IsNotAlphaNum);
+        std::string::iterator end = std::remove_if(key.begin(), key.end(), [](char c){return !std::isalnum(c);});
         std::transform(key.begin(), end, key.begin(), tolower);
 
         OGRFieldType fieldType = feature.ogr().GetFieldDefnRef(iField)->GetType();

Modules/Applications/AppClassification/include/otbTrainVectorBase.h

@@ -43,12 +43,6 @@ namespace otb
 namespace Wrapper
 {
 
-/** Utility function to negate std::isalnum */
-bool IsNotAlphaNum(char c)
-{
-  return !std::isalnum( c );
-}
-
 template <class TInputValue, class TOutputValue>
 class TrainVectorBase : public LearningApplicationBase<TInputValue, TOutputValue>
 {

Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx

@@ -124,7 +124,7 @@ TrainVectorBase<TInputValue, TOutputValue>
       {
       std::string key, item = feature.ogr().GetFieldDefnRef( iField )->GetNameRef();
       key = item;
-      std::string::iterator end = std::remove_if( key.begin(), key.end(), IsNotAlphaNum );
+      std::string::iterator end = std::remove_if( key.begin(), key.end(), [](char c){return !std::isalnum(c);} );
       std::transform( key.begin(), end, key.begin(), tolower );
 
       OGRFieldType fieldType = feature.ogr().GetFieldDefnRef( iField )->GetType();

Modules/Applications/AppClassification/include/otbVectorPrediction.h

@@ -86,12 +86,6 @@ public:
   }
 
 private:
-  /** Utility function to negate std::isalnum */
-  static bool IsNotAlphaNum(char c)
-  {
-    return !std::isalnum(c);
-  }
-
   void DoInit() override;
 
   /** Method defining the parameters used in the application and their documentation, specialized for RegressionMode=1 and RegrssionMode=0 */

Modules/Applications/AppClassification/include/otbVectorPrediction.hxx

@@ -60,9 +60,8 @@ void           VectorPrediction<RegressionMode>::DoUpdateParameters()
       auto fieldDefn = layerDefn.GetFieldDefn(iField);
       std::string item = fieldDefn->GetNameRef();
       std::string key(item);
-      key.erase(std::remove_if(key.begin(), key.end(), IsNotAlphaNum), key.end());
+      key.erase(std::remove_if(key.begin(), key.end(), [](char c){return !std::isalnum(c);}), key.end());
       std::transform(key.begin(), key.end(), key.begin(), tolower);
-
       auto fieldType = fieldDefn->GetType();
       if (fieldType == OFTInteger || fieldType == OFTInteger64 || fieldType == OFTReal)
       {

Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx

@@ -32,13 +32,6 @@ namespace otb
 {
 namespace Wrapper
 {
-  
-/** Utility function to negate std::isalnum */
-bool IsNotAlphaNum(char c)
-{
-return !std::isalnum(c);
-}
-
 /**
  * \class VectorDimensionalityReduction
  *
@@ -180,7 +173,7 @@ private:
         {
         std::string item = layerDefn.GetFieldDefn(iField)->GetNameRef();
         std::string key(item);
-        std::string::iterator end = std::remove_if( key.begin(), key.end(), IsNotAlphaNum );
+        std::string::iterator end = std::remove_if( key.begin(), key.end(), [](char c){return !std::isalnum(c);});
         std::transform( key.begin(), end, key.begin(), tolower );
         std::string tmpKey = "feat." + key.substr( 0, static_cast<unsigned long>( end - key.begin() ) );
         AddChoice(tmpKey,item);