STYLE: use more standard empty() and valid() in scalarRange

src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C

@@ -73,7 +73,13 @@ Foam::scalarRange::scalarRange(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::scalarRange::isDefined() const
+bool Foam::scalarRange::empty() const
+{
+    return type_ == EMPTY;
+}
+
+
+bool Foam::scalarRange::valid() const
 {
     return type_ != EMPTY;
 }
@@ -149,23 +155,18 @@ bool Foam::scalarRange::selected(const scalar value) const
 
 bool Foam::scalarRange::operator==(const scalarRange& range) const
 {
-    if
+    return
     (
         type_ == range.type_
      && value_ == range.value_
      && value2_ == range.value2_
-    )
-    {
-        return true;
-    }
-
-    return false;
+    );
 }
 
 
 bool Foam::scalarRange::operator!=(const scalarRange& range) const
 {
-    return operator==(range) ? false : true;
+    return !(operator==(range));
 }
 
 

src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H

@@ -87,10 +87,10 @@ public:
 
     // Constructors
 
-        //- Construct Null
+        //- Construct an empty range
         scalarRange();
 
-        //- Construct a Range
+        //- Construct a range from lower to upper
         scalarRange(const scalar lower, const scalar upper);
 
         //- Construct from Istream.
@@ -101,8 +101,11 @@ public:
 
     // Member Functions
 
+        //- Is the range empty?
+        bool empty() const;
+
         //- Is the range non-empty?
-        bool isDefined() const;
+        bool valid() const;
 
         //- Is the range 'EXACT'?
         bool isExact() const;

src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.C

@@ -44,7 +44,7 @@ Foam::scalarRanges::scalarRanges(Istream& is)
     while (is.good())
     {
         scalarRange sr(is);
-        if (sr.isDefined())
+        if (sr.valid())
         {
             lst.append(sr);
         }