code cosmetics to the iterator fix

[lyx.git] / src / InsetList.h

diff --git a/src/InsetList.h b/src/InsetList.h
index fc40e450889a960aaad1adaad98e13850aff4c66..33a9fe1e7f27e338240ebe1f919447d58fed090a 100644 (file)
--- a/src/InsetList.h
+++ b/src/InsetList.h
@@ -16,7 +16,7 @@
 
 #include <vector>
 
-class InsetOld;
+class InsetBase;
 class Buffer;
 
 
@@ -24,13 +24,14 @@ class Buffer;
 class InsetList {
 public:
        ///
-       struct InsetTable {
+       class InsetTable {
+       public:
                ///
-               lyx::pos_type pos;
+               InsetTable(lyx::pos_type p, InsetBase * i) : pos(p), inset(i) {}
                ///
-               InsetOld * inset;
+               lyx::pos_type pos;
                ///
-               InsetTable(lyx::pos_type p, InsetOld * i) : pos(p), inset(i) {}
+               InsetBase * inset;
        };
        ///
        typedef std::vector<InsetTable> List;
@@ -42,37 +43,35 @@ public:
        ///
        ~InsetList();
        ///
-       iterator begin() { return list.begin(); }
+       iterator begin() { return list_.begin(); }
        ///
-       iterator end() { return list.end(); }
+       iterator end() { return list_.end(); }
        ///
-       const_iterator begin() const { return list.begin(); }
+       const_iterator begin() const { return list_.begin(); }
        ///
-       const_iterator end() const { return list.end(); }
+       const_iterator end() const { return list_.end(); }
        ///
-       bool empty() const { return list.empty(); }
+       bool empty() const { return list_.empty(); }
        ///
-       iterator insetIterator(lyx::pos_type pos); 
+       iterator insetIterator(lyx::pos_type pos);
        ///
        const_iterator insetIterator(lyx::pos_type pos) const;
        ///
-       void insert(InsetOld * inset, lyx::pos_type pos);
+       void insert(InsetBase * inset, lyx::pos_type pos);
        ///
        void erase(lyx::pos_type pos);
        ///
-       InsetOld * release(lyx::pos_type);
+       InsetBase * release(lyx::pos_type);
        ///
-       InsetOld * get(lyx::pos_type pos) const;
+       InsetBase * get(lyx::pos_type pos) const;
        ///
        void increasePosAfterPos(lyx::pos_type pos);
        ///
        void decreasePosAfterPos(lyx::pos_type pos);
-       ///
-       void insetsOpenCloseBranch(Buffer const & buf);
 
 private:
        ///
-       List list;
+       List list_;
 };
 
 #endif