fix a couple of OCLint warning, i.e. short variable names and useless parantheses

DataStructures/ImportEdge.cpp

@@ -27,21 +27,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ImportEdge.h"
 
-bool NodeBasedEdge::operator<(const NodeBasedEdge &e) const
+bool NodeBasedEdge::operator<(const NodeBasedEdge & other) const
 {
-    if (source == e.source)
+    if (source == other.source)
     {
-        if (target == e.target)
+        if (target == other.target)
         {
-            if (weight == e.weight)
+            if (weight == other.weight)
             {
-                return (forward && backward && ((!e.forward) || (!e.backward)));
+                return forward && backward && ((!other.forward) || (!other.backward));
             }
-            return (weight < e.weight);
+            return weight < other.weight;
         }
-        return (target < e.target);
+        return target < other.target;
     }
-    return (source < e.source);
+    return source < other.source;
 }
 
 NodeBasedEdge::NodeBasedEdge(NodeID source,
@@ -63,28 +63,28 @@ NodeBasedEdge::NodeBasedEdge(NodeID source,
     BOOST_ASSERT_MSG(type > 0, "negative edge type");
 }
 
-bool EdgeBasedEdge::operator<(const EdgeBasedEdge &e) const
+bool EdgeBasedEdge::operator<(const EdgeBasedEdge &other) const
 {
-    if (source == e.source)
+    if (source == other.source)
     {
-        if (target == e.target)
+        if (target == other.target)
         {
-            if (weight == e.weight)
+            if (weight == other.weight)
             {
-                return (forward && backward && ((!e.forward) || (!e.backward)));
+                return forward && backward && ((!other.forward) || (!other.backward));
             }
-            return (weight < e.weight);
+            return weight < other.weight;
         }
-        return (target < e.target);
+        return target < other.target;
     }
-    return (source < e.source);
+    return source < other.source;
 }
 
 template <class EdgeT>
-EdgeBasedEdge::EdgeBasedEdge(const EdgeT &myEdge)
-    : source(myEdge.source), target(myEdge.target), edge_id(myEdge.data.via),
-      weight(myEdge.data.distance), forward(myEdge.data.forward),
-      backward(myEdge.data.backward)
+EdgeBasedEdge::EdgeBasedEdge(const EdgeT &other)
+    : source(other.source), target(other.target), edge_id(other.data.via),
+      weight(other.data.distance), forward(other.data.forward),
+      backward(other.data.backward)
 {
 }
 
@@ -95,7 +95,7 @@ EdgeBasedEdge::EdgeBasedEdge()
 }
 
 EdgeBasedEdge::EdgeBasedEdge(
-    const NodeID s, const NodeID t, const NodeID v, const EdgeWeight w, const bool f, const bool b)
-    : source(s), target(t), edge_id(v), weight(w), forward(f), backward(b)
+    const NodeID source, const NodeID target, const NodeID edge_id, const EdgeWeight weight, const bool forward, const bool backward)
+    : source(source), target(target), edge_id(edge_id), weight(weight), forward(forward), backward(backward)
 {
 }

DataStructures/ImportNode.cpp

@@ -31,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 ExternalMemoryNode::ExternalMemoryNode(
-    int lat, int lon, unsigned int id, bool bollard, bool traffic_light)
-    : NodeInfo(lat, lon, id), bollard(bollard), trafficLight(traffic_light)
+    int lat, int lon, unsigned int node_id, bool bollard, bool traffic_light)
+    : NodeInfo(lat, lon, node_id), bollard(bollard), trafficLight(traffic_light)
 {
 }
 
@@ -59,7 +59,7 @@ void ImportNode::Clear()
     keyVals.clear();
     lat = 0;
     lon = 0;
-    id = 0;
+    node_id = 0;
     bollard = false;
     trafficLight = false;
 }

DataStructures/QueryNode.h

@@ -41,16 +41,16 @@ struct NodeInfo
     typedef NodeID key_type; // type of NodeID
     typedef int value_type; // type of lat,lons
 
-    NodeInfo(int lat, int lon, NodeID id) : lat(lat), lon(lon), id(id) {}
+    NodeInfo(int lat, int lon, NodeID node_id) : lat(lat), lon(lon), node_id(node_id) {}
     NodeInfo()
         : lat(std::numeric_limits<int>::max()), lon(std::numeric_limits<int>::max()),
-          id(std::numeric_limits<unsigned>::max())
+          node_id(std::numeric_limits<unsigned>::max())
     {
     }
 
     int lat;
     int lon;
-    NodeID id;
+    NodeID node_id;
 
     static NodeInfo min_value()
     {