From 6b22a0549318d1e7fba0c1d9e28c1acf7b94f8b0 Mon Sep 17 00:00:00 2001
From: Marek Vavrusa <marek@vavrusa.com>
Date: Mon, 4 May 2009 11:41:52 +0200
Subject: [PATCH] List having non-virtual destructor fixed (thanks to Thomas Jarosch) Proposed subset of list API. Tested on examples.

---
 ftdipp/ftdi.cpp |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 ftdipp/ftdi.hpp |   26 +++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp
index 23d3a57..0a22bd5 100644
--- a/ftdipp/ftdi.cpp
+++ b/ftdipp/ftdi.cpp
@@ -401,30 +401,32 @@ int Eeprom::erase()
 class List::Private
 {
 public:
-    Private(struct ftdi_device_list* devlist)
-            : list(devlist)
+    Private(struct ftdi_device_list* _devlist)
+            : devlist(_devlist)
     {}
 
     ~Private()
     {
-        ftdi_list_free(&list);
+        if(devlist)
+            ftdi_list_free(&devlist);
     }
 
-    struct ftdi_device_list* list;
+    std::list<Context> list;
+    struct ftdi_device_list* devlist;
 };
 
 List::List(struct ftdi_device_list* devlist)
-        : ListBase(), d( new Private(devlist) )
+        : d( new Private(devlist) )
 {
     if (devlist != 0)
     {
         // Iterate list
-        for (d->list = devlist; d->list != 0; d->list = d->list->next)
+        for (; devlist != 0; devlist = devlist->next)
         {
             Context c;
-            c.set_usb_device(d->list->dev);
+            c.set_usb_device(devlist->dev);
             c.get_strings();
-            push_back(c);
+            d->list.push_back(c);
         }
     }
 }
@@ -433,6 +435,42 @@ List::~List()
 {
 }
 
+int List::size()
+{
+   return d->list.size();
+}
+
+void List::push_front(const Context& element)
+{
+   d->list.push_front(element);
+}
+
+
+void List::push_back(const Context& element)
+{
+   d->list.push_back(element);
+}
+
+void List::clear()
+{
+    d->list.clear();
+
+    // Free device list
+    ftdi_list_free(&d->devlist);
+    d->devlist = 0;
+}
+
+std::list<Context>::iterator List::begin()
+{
+   return d->list.begin();
+}
+
+std::list<Context>::iterator List::end()
+{
+   return d->list.end();
+}
+
+
 List* List::find_all(int vendor, int product)
 {
     struct ftdi_device_list* dlist = 0;
diff --git a/ftdipp/ftdi.hpp b/ftdipp/ftdi.hpp
index 4c3b7c5..d56660d 100644
--- a/ftdipp/ftdi.hpp
+++ b/ftdipp/ftdi.hpp
@@ -162,11 +162,9 @@ private:
     boost::shared_ptr<Private> d;
 };
 
-typedef std::list<Context> ListBase;
-
 /*! \brief Device list.
  */
-class List : public ListBase
+class List
 {
 public:
     List(struct ftdi_device_list* devlist = 0);
@@ -174,6 +172,28 @@ public:
 
     static List* find_all(int vendor, int product);
 
+    /*! List size */
+    int size();
+
+    /*! Append element */
+    void push_back(const Context& element);    
+    void append(const Context& element)
+    { push_back(element); }
+
+    /*! Prepend element */
+    void push_front(const Context& element);
+    void prepend(const Context& element)
+    { push_front(element); }
+
+    /*! Clear list */
+    void clear();
+
+    /* Iterators */
+    typedef std::list<Context>::iterator iterator;
+    std::list<Context>::iterator begin();
+    std::list<Context>::iterator end();
+
+
 private:
     class Private;
     boost::shared_ptr<Private> d;
-- 
1.7.1