From e8b9da145b965ee550a71d6abd1e74cc4914ba8f Mon Sep 17 00:00:00 2001
From: Bryan Godbolt <godbolt@ualberta.ca>
Date: Sun, 29 Aug 2010 18:56:19 -0600
Subject: [PATCH] working on itertator in paramlist

---
 qgroundcontrol.pro        |  3 +++
 src/comm/ParameterList.cc |  2 +-
 src/comm/ParameterList.h  | 13 +++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 9ccffa873a..de1f54a8d5 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -226,6 +226,8 @@ RESOURCES = mavground.qrc
 
 # Include RT-LAB Library
 win32 { 
+exists(src/lib/opalrt/OpalApi.h){
+    message("Building support for Opal-RT")
     LIBS += -LC:\OPAL-RT\RT-LAB7.2.4\Common\bin \
         -lOpalApi
     INCLUDEPATH += src/lib/opalrt
@@ -240,3 +242,4 @@ win32 {
         src/comm/ParameterList.h
     DEFINES += OPAL_RT
 }
+}
diff --git a/src/comm/ParameterList.cc b/src/comm/ParameterList.cc
index 9c7d2430a2..6956f83c14 100644
--- a/src/comm/ParameterList.cc
+++ b/src/comm/ParameterList.cc
@@ -75,7 +75,7 @@ ParameterList::const_iterator::const_iterator()
 
 }
 
-ParameterList::begin()
+const_iterator ParameterList::begin()
 {
 
 }
diff --git a/src/comm/ParameterList.h b/src/comm/ParameterList.h
index 42ca2edfdd..2be6485f5d 100644
--- a/src/comm/ParameterList.h
+++ b/src/comm/ParameterList.h
@@ -41,23 +41,24 @@ namespace OpalRT
 {
     class ParameterList
     {
+    public:
+
         class const_iterator
         {
         public:
             const_iterator();
+            const_iterator(const_iterator& other);
         private:
-            QMap<int, QMap<QGCParamID, Parameter> >::const_iterator componentIter;
-            QMap<QGCParamID, Parameter>::const_iterator paramIter;
+            int componentID;
+            QGCParamID paramID;
         };
-
-    public:
         ParameterList();
         ~ParameterList();
         int setValue(int compid, QGCParamID paramid, float value);
         float getValue(int compid, QGCParamID paramid);
 
-        const_iterator begin() const;
-        const_iterator end() const;
+//        const_iterator begin() const;
+//        const_iterator end() const;
     protected:
         QMap<int, QMap<QGCParamID, Parameter> > *params;
 
-- 
GitLab