Merge branch 'object-range' into 'master'

fix ambiguous default ctor of ObjectReferenceIterator



See merge request !124

OpenFlipper/BasePlugin/PluginFunctions.hh

@@ -528,12 +528,12 @@ class DLLEXPORT ObjectIterator {
 class DLLEXPORT ObjectReferenceIterator : public std::iterator<std::forward_iterator_tag, BaseObjectData>
 {
 public:
-    ObjectReferenceIterator(IteratorRestriction _restriction = ALL_OBJECTS, DataType _dataType = DATA_ALL) :
+    explicit ObjectReferenceIterator(IteratorRestriction _restriction = ALL_OBJECTS, DataType _dataType = DATA_ALL) :
         it_(_restriction, _dataType)
     {
     }
 
-    explicit ObjectReferenceIterator(BaseObjectData* _pos = NULL, IteratorRestriction _restriction = ALL_OBJECTS, DataType _dataType = DATA_ALL) :
+    explicit ObjectReferenceIterator(BaseObjectData* _pos, IteratorRestriction _restriction = ALL_OBJECTS, DataType _dataType = DATA_ALL) :
         it_(_pos, _restriction, _dataType)
     {
     }
@@ -650,7 +650,7 @@ private:
  *
  * \note Usage:
  * \code
- * for (auto& object : PluginFunctions::objectReferences(..., ...) {
+ * for (auto& object : PluginFunctions::objectReferences(..., ...)) {
  *     ...
  * }
  * \endcode
@@ -667,7 +667,7 @@ ObjectReferenceRange objectReferences(IteratorRestriction _restriction = ALL_OBJ
  * \note Iterated elements are *pointers* to objects, not object references.
  * Hence, the loop header should be declared as
  * \code
- * for (auto* object : PluginFunctions::objects(..., ...) {
+ * for (auto* object : PluginFunctions::objects(..., ...)) {
  *     ...
  * }
  * \endcode