SRDOP: Cleanup, no more CB/GB lists. (Code compiles, not more!)

1 files changed, 7 insertions, 20 deletions

diff --git a/dw/ooffloatsmgr.hh b/dw/ooffloatsmgr.hh
index 250e849f..5ed7d29f 100644
--- a/dw/ooffloatsmgr.hh
+++ b/dw/ooffloatsmgr.hh
@@ -177,9 +177,9 @@ private:
       core::Allocation allocation;
       int clearPosition;
 
-      // These two lists store all floats generated by this textblock,
-      // as long as this textblock is not allocates.
-      SortedFloatsVector *leftFloatsGB, *rightFloatsGB;
+      // These two lists store all floats of a generator, in the order
+      // in which they are defined. Used for optimization
+      lout::container::typed::Vector<Float> *leftFloats, *rightFloats;
 
       TBInfo (OOFFloatsMgr *oofm, OOFAwareWidget *textblock,
               TBInfo *parent, int parentExtIndex);
@@ -205,17 +205,7 @@ private:
       { return (OOFAwareWidget*)getWidget (); }
    };
 
-   // These two lists store all floats, in the order in which they are
-   // defined. Only used for iterators.
-   lout::container::typed::Vector<Float> *leftFloatsAll, *rightFloatsAll;
-
-   // These two lists store all floats whose generators are already
-   // allocated.
-   SortedFloatsVector *leftFloatsCB, *rightFloatsCB;
-
-   // These two attributes are used in the size allocation process;
-   // see sizeAllocateStart and sizeAllocateEnd.
-   int lastAllocatedLeftFloat, lastAllocatedRightFloat;
+   SortedFloatsVector *leftFloats, *rightFloats;
 
    lout::container::typed::HashTable<lout::object::TypedPointer
                                      <dw::core::Widget>, Float> *floatsByWidget;
@@ -242,11 +232,11 @@ private:
       return &(getOOFAwareWidget(textblock)->allocation);
    }
 
-   void moveExternalIndices (SortedFloatsVector *list, int oldStartIndex,
-                             int diff);
+   void moveExternalIndices (lout::container::typed::Vector<Float> *list,
+                             int oldStartIndex, int diff);
    Float *findFloatByWidget (core::Widget *widget);
 
-   void sizeAllocateFloats (Side side, int newLastAllocatedFloat);
+   void sizeAllocateFloats (Side side);
    int getGBWidthForAllocation (Float *vloat);
    int calcFloatX (Float *vloat, Side side, int gbX, int gbWidth);
 
@@ -276,9 +266,6 @@ private:
    { return getOOFAwareWidgetWhenRegistered (widget) != NULL; }
    int getBorder (OOFAwareWidget *textblock, Side side, int y, int h,
                   OOFAwareWidget *lastGB, int lastExtIndex);
-   SortedFloatsVector *getFloatsListForOOFAwareWidget (OOFAwareWidget
-                                                       *textblock,
-                                                       Side side);
    bool hasFloat (OOFAwareWidget *textblock, Side side, int y, int h,
                   OOFAwareWidget *lastGB, int lastExtIndex);