changeset 1347:4704ad910042

remove "using namespace" statements from header files "using namespace" in headers also affects all files that include the header which is unwanted and unexpected in most cases.
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Thu, 15 Oct 2009 20:12:37 +0200
parents 7cdd8e4f8076
children 35218da92a18
files dw/alignedtextblock.cc dw/alignedtextblock.hh dw/events.hh dw/fltkimgbuf.cc dw/fltkplatform.cc dw/fltkui.cc dw/fltkui.hh dw/fltkviewbase.cc dw/fltkviewport.cc dw/fltkviewport.hh dw/imgbuf.hh dw/iterator.cc dw/iterator.hh dw/layout.cc dw/layout.hh dw/platform.hh dw/selection.cc dw/selection.hh dw/style.cc dw/style.hh dw/table.cc dw/table.hh dw/textblock.cc dw/textblock.hh dw/types.cc dw/types.hh dw/ui.cc dw/ui.hh dw/view.hh dw/widget.cc dw/widget.hh src/findbar.cc src/findbar.hh src/form.cc src/html.cc src/ui.hh test/shapes.cc
diffstat 37 files changed, 129 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/dw/alignedtextblock.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/alignedtextblock.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -26,8 +26,8 @@
 
 AlignedTextblock::List::List ()
 {
-   textblocks = new misc::SimpleVector <AlignedTextblock*> (4);
-   values = new misc::SimpleVector <int> (4);
+   textblocks = new lout::misc::SimpleVector <AlignedTextblock*> (4);
+   values = new lout::misc::SimpleVector <int> (4);
    maxValue = 0;
    refCount = 0;
 }
--- a/dw/alignedtextblock.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/alignedtextblock.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -16,8 +16,8 @@
    class List
    {
    private:
-      misc::SimpleVector <AlignedTextblock*> *textblocks;
-      misc::SimpleVector <int> *values;
+      lout::misc::SimpleVector <AlignedTextblock*> *textblocks;
+      lout::misc::SimpleVector <int> *values;
       int maxValue, refCount;
 
       ~List ();
--- a/dw/events.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/events.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -28,7 +28,7 @@
  * The dw::core::Event hierarchy describes events in a platform independent
  * way.
  */
-class Event: public object::Object
+class Event: public lout::object::Object
 {
 public:
 };
--- a/dw/fltkimgbuf.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkimgbuf.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -33,7 +33,7 @@
 namespace dw {
 namespace fltk {
 
-using namespace container::typed;
+using namespace lout::container::typed;
 
 FltkImgbuf::FltkImgbuf (Type type, int width, int height)
 {
@@ -67,11 +67,11 @@
 
    refCount = 1;
    deleteOnUnref = true;
-   copiedRows = new misc::BitSet (height);
+   copiedRows = new lout::misc::BitSet (height);
 
    // The list is only used for root buffers.
    if (isRoot())
-      scaledBuffers = new container::typed::List <FltkImgbuf> (true);
+      scaledBuffers = new lout::container::typed::List <FltkImgbuf> (true);
    else
       scaledBuffers = NULL;
 
--- a/dw/fltkplatform.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkplatform.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -34,6 +34,7 @@
 namespace fltk {
 
 using namespace ::fltk;
+using namespace lout;
 
 /**
  * \todo Distinction between italics and oblique would be nice.
--- a/dw/fltkui.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkui.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -47,8 +47,8 @@
 
 enum { RELIEF_X_THICKNESS = 3, RELIEF_Y_THICKNESS = 3 };
 
-using namespace object;
-using namespace container::typed;
+using namespace lout::object;
+using namespace lout::container::typed;
 
 FltkResource::FltkResource (FltkPlatform *platform)
 {
@@ -71,7 +71,7 @@
  */
 void FltkResource::init (FltkPlatform *platform)
 {
-   viewsAndWidgets = new container::typed::List <ViewAndWidget> (true);
+   viewsAndWidgets = new lout::container::typed::List <ViewAndWidget> (true);
    platform->attachResource (this);
 }
 
@@ -393,7 +393,7 @@
                                                       *widget, bool relief):
    FltkSpecificResource <dw::core::ui::ComplexButtonResource> (platform)
 {
-   viewsAndViews = new container::typed::List <ViewAndView> (true);
+   viewsAndViews = new lout::container::typed::List <ViewAndView> (true);
    this->relief = relief;
    FltkResource::init (platform);
    ComplexButtonResource::init (widget);
@@ -853,7 +853,7 @@
 FltkRadioButtonResource::Group::Group (FltkRadioButtonResource
                                        *radioButtonResource)
 {
-   list = new container::typed::List <FltkRadioButtonResource> (false);
+   list = new lout::container::typed::List <FltkRadioButtonResource> (false);
    connect (radioButtonResource);
 }
 
--- a/dw/fltkui.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkui.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -14,8 +14,6 @@
 namespace dw {
 namespace fltk {
 
-using namespace lout;
-
 /**
  * \brief FLTK implementation of dw::core::ui.
  *
@@ -174,20 +172,20 @@
 /**
  * ...
  */
-class FltkResource: public object::Object
+class FltkResource: public lout::object::Object
 {
 private:
    bool enabled;
 
 protected:
-   class ViewAndWidget: public object::Object
+   class ViewAndWidget: public lout::object::Object
    {
    public:
       FltkView *view;
       ::fltk::Widget *widget;
    };
 
-   container::typed::List <ViewAndWidget> *viewsAndWidgets;
+   lout::container::typed::List <ViewAndWidget> *viewsAndWidgets;
    core::Allocation allocation;
    FltkPlatform *platform;
 
@@ -262,7 +260,7 @@
    static void widgetCallback (::fltk::Widget *widget, void *data);
 
 protected:
-   class ViewAndView: public object::Object
+   class ViewAndView: public lout::object::Object
    {
    public:
       FltkView *topView, *flatView;
@@ -270,7 +268,7 @@
 
    FltkView *lastFlatView;
 
-   container::typed::List <ViewAndView> *viewsAndViews;
+   lout::container::typed::List <ViewAndView> *viewsAndViews;
 
    void attachView (FltkView *view);
    void detachView (FltkView *view);
@@ -396,10 +394,10 @@
          public dw::core::ui::RadioButtonResource::GroupIterator
       {
       private:
-         container::typed::Iterator <FltkRadioButtonResource> it;
+         lout::container::typed::Iterator <FltkRadioButtonResource> it;
 
       public:
-         inline FltkGroupIterator (container::typed::List
+         inline FltkGroupIterator (lout::container::typed::List
                                    <FltkRadioButtonResource>
                                    *list)
             { it = list->iterator (); }
@@ -409,7 +407,7 @@
          void unref ();
       };
 
-      container::typed::List <FltkRadioButtonResource> *list;
+      lout::container::typed::List <FltkRadioButtonResource> *list;
 
    protected:
       ~Group ();
@@ -417,7 +415,7 @@
    public:
       Group (FltkRadioButtonResource *radioButtonResource);
 
-      inline container::typed::Iterator <FltkRadioButtonResource> iterator ()
+      inline lout::container::typed::Iterator <FltkRadioButtonResource> iterator ()
       {
          return list->iterator ();
       }
@@ -454,7 +452,7 @@
    public FltkSpecificResource <I>
 {
 protected:
-   class Item: public object::Object
+   class Item: public lout::object::Object
    {
    public:
       enum Type { ITEM, START, END } type;
@@ -470,19 +468,19 @@
       ::fltk::ItemGroup *createNewGroupWidget ();
    };
 
-   class WidgetStack: public object::Object
+   class WidgetStack: public lout::object::Object
    {
    public:
       ::fltk::Menu *widget;
-      container::typed::Stack <object::TypedPointer < ::fltk::Menu> > *stack;
+      lout::container::typed::Stack <lout::object::TypedPointer < ::fltk::Menu> > *stack;
 
       WidgetStack (::fltk::Menu *widget);
       ~WidgetStack ();
    };
 
-   container::typed::List <WidgetStack> *widgetStacks;
-   container::typed::List <Item> *allItems;
-   container::typed::Vector <Item> *items;
+   lout::container::typed::List <WidgetStack> *widgetStacks;
+   lout::container::typed::List <Item> *allItems;
+   lout::container::typed::Vector <Item> *items;
 
    Item *createNewItem (typename Item::Type type,
                         const char *name = NULL,
@@ -540,7 +538,7 @@
 
 private:
    static void widgetCallback (::fltk::Widget *widget, void *data);
-   misc::SimpleVector <bool> itemsSelected;
+   lout::misc::SimpleVector <bool> itemsSelected;
    int showRows;
    ListResource::SelectionMode mode;
 public:
--- a/dw/fltkviewbase.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkviewbase.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -73,7 +73,7 @@
    int d = damage ();
 
    if ((d & DAMAGE_VALUE) && !(d & DAMAGE_EXPOSE)) {
-      container::typed::Iterator <core::Rectangle> it;
+      lout::container::typed::Iterator <core::Rectangle> it;
 
       for (it = drawRegion.rectangles (); it.hasNext (); ) {
          draw (it.getNext (), DRAW_BUFFERED);
--- a/dw/fltkviewport.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkviewport.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -29,6 +29,7 @@
 #include "../lout/msg.h"
 
 using namespace fltk;
+using namespace lout;
 using namespace lout::object;
 using namespace lout::container::typed;
 
--- a/dw/fltkviewport.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/fltkviewport.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -26,7 +26,8 @@
    ::fltk::Scrollbar *vscrollbar, *hscrollbar;
 
    GadgetOrientation gadgetOrientation[4];
-   container::typed::List <object::TypedPointer < ::fltk::Widget> > *gadgets;
+   lout::container::typed::List <lout::object::TypedPointer < ::fltk::Widget> >
+      *gadgets;
 
    void adjustScrollbarsAndGadgetsAllocation ();
    void adjustScrollbarValues ();
--- a/dw/imgbuf.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/imgbuf.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -8,8 +8,6 @@
 namespace dw {
 namespace core {
 
-using namespace lout;
-
 /**
  * \brief The platform independent interface for image buffers.
  *
@@ -158,7 +156,7 @@
  *
  * \sa \ref dw-images-and-backgrounds
  */
-class Imgbuf: public object::Object, public lout::signal::ObservedObject
+class Imgbuf: public lout::object::Object, public lout::signal::ObservedObject
 {
 public:
    enum Type { RGB, RGBA, GRAY, INDEXED, INDEXED_ALPHA };
--- a/dw/iterator.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/iterator.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -22,6 +22,8 @@
 #include "core.hh"
 #include <limits.h>
 
+using namespace lout;
+
 namespace dw {
 namespace core {
 
--- a/dw/iterator.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/iterator.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -16,7 +16,7 @@
  *
  * \sa dw::core::Widget::iterator
  */
-class Iterator: public object::Object, public misc::Comparable
+class Iterator: public lout::object::Object, public lout::misc::Comparable
 {
 protected:
    Iterator(Widget *widget, Content::Type mask, bool atEnd);
@@ -100,8 +100,8 @@
 public:
    EmptyIterator (Widget *widget, Content::Type mask, bool atEnd);
 
-   object::Object *clone();
-   int compareTo(misc::Comparable *other);
+   lout::object::Object *clone();
+   int compareTo(lout::misc::Comparable *other);
    bool next ();
    bool prev ();
    void highlight (int start, int end, HighlightLayer layer);
@@ -126,7 +126,7 @@
    TextIterator (Widget *widget, Content::Type mask, bool atEnd,
                  const char *text);
 
-   int compareTo(misc::Comparable *other);
+   int compareTo(lout::misc::Comparable *other);
 
    bool next ();
    bool prev ();
@@ -142,13 +142,13 @@
  * iterators do not have the limitation, that iteration is only done within
  * a widget, instead, child widgets are iterated through recursively.
  */
-class DeepIterator: public object::Object, public misc::Comparable
+class DeepIterator: public lout::object::Object, public lout::misc::Comparable
 {
 private:
-   class Stack: public container::typed::Vector<Iterator>
+   class Stack: public lout::container::typed::Vector<Iterator>
    {
    public:
-      inline Stack (): container::typed::Vector<Iterator> (4, false) { }
+      inline Stack (): lout::container::typed::Vector<Iterator> (4, false) { }
       ~Stack ();
       inline Iterator *getTop () { return get (size () - 1); }
       inline void push (Iterator *it) { put(it, -1); }
@@ -172,7 +172,7 @@
    DeepIterator(Iterator *it);
    ~DeepIterator();
 
-   object::Object *clone ();
+   lout::object::Object *clone ();
 
    DeepIterator *createVariant(Iterator *it);
    inline Iterator *getTopIterator () { return stack.getTop(); }
@@ -183,7 +183,7 @@
    bool next ();
    bool prev ();
    inline DeepIterator *cloneDeepIterator() { return (DeepIterator*)clone(); }
-   int compareTo(misc::Comparable *other);
+   int compareTo(lout::misc::Comparable *other);
 
    /**
     * \brief Highlight a part of the current content.
@@ -216,7 +216,7 @@
                          start, end, hpos, vpos); }
 };
 
-class CharIterator: public object::Object, public misc::Comparable
+class CharIterator: public lout::object::Object, public lout::misc::Comparable
 {
 public:
    // START and END must not clash with any char value
@@ -233,8 +233,8 @@
    CharIterator (Widget *widget);
    ~CharIterator ();
 
-   object::Object *clone();
-   int compareTo(misc::Comparable *other);
+   lout::object::Object *clone();
+   int compareTo(lout::misc::Comparable *other);
 
    bool next ();
    bool prev ();
--- a/dw/layout.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/layout.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -25,6 +25,7 @@
 #include "../lout/debug.hh"
 #include "../lout/misc.hh"
 
+using namespace lout;
 using namespace lout::container;
 using namespace lout::object;
 
--- a/dw/layout.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/layout.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -13,7 +13,7 @@
  *
  * \sa\ref dw-overview, \ref dw-layout-widgets, \ref dw-layout-views
  */
-class Layout: public object::Object
+class Layout: public lout::object::Object
 {
    friend class Widget;
 
@@ -47,7 +47,7 @@
 
    Emitter emitter;
 
-   class Anchor: public object::Object
+   class Anchor: public lout::object::Object
    {
    public:
       char *name;
@@ -58,7 +58,7 @@
    };
 
    Platform *platform;
-   container::typed::List <View> *views;
+   lout::container::typed::List <View> *views;
    Widget *topLevel, *widgetAtPoint;
 
    /* The state, which must be projected into the views. */
@@ -80,7 +80,7 @@
    bool scrollIdleNotInterrupted;
 
    /* Anchors of the widget tree */
-   container::typed::HashTable <object::String, Anchor> *anchorsTable;
+   lout::container::typed::HashTable <lout::object::String, Anchor> *anchorsTable;
 
    SelectionState selectionState;
    FindtextState findtextState;
@@ -141,7 +141,7 @@
    Layout (Platform *platform);
    ~Layout ();
 
-   misc::ZoneAllocator *textZone;
+   lout::misc::ZoneAllocator *textZone;
 
    void addWidget (Widget *widget);
    void setWidget (Widget *widget);
--- a/dw/platform.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/platform.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -13,7 +13,7 @@
  *
  * \sa\ref dw-overview
  */
-class Platform: public object::Object
+class Platform: public lout::object::Object
 {
 public:
    /*
--- a/dw/selection.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/selection.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -23,6 +23,8 @@
 
 #include <string.h>
 
+using namespace lout;
+
 /*
  * strndup() is a GNU extension.
  */
--- a/dw/selection.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/selection.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -8,8 +8,6 @@
 namespace dw {
 namespace core {
 
-using namespace lout;
-
 /**
  * \brief This class handles selections, as well as activation of links,
  *    which is closely related.
--- a/dw/style.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/style.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -27,6 +27,8 @@
 #include "core.hh"
 #include "../lout/msg.h"
 
+using namespace lout;
+
 namespace dw {
 namespace core {
 namespace style {
--- a/dw/style.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/style.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -406,7 +406,7 @@
 /**
  * \sa dw::core::style
  */
-class StyleAttrs : public object::Object
+class StyleAttrs : public lout::object::Object
 {
 public:
    Font *font;
@@ -467,7 +467,7 @@
 
    inline bool hasBackground () { return backgroundColor != NULL; }
 
-   bool equals (object::Object *other);
+   bool equals (lout::object::Object *other);
    int hashValue ();
 };
 
@@ -480,7 +480,7 @@
 private:
    static int totalRef;
    int refCount;
-   static container::typed::HashTable <StyleAttrs, Style> *styleTable;
+   static lout::container::typed::HashTable <StyleAttrs, Style> *styleTable;
 
    Style (StyleAttrs *attrs);
 
@@ -510,10 +510,10 @@
 /**
  * \sa dw::core::style
  */
-class TooltipAttrs: public object::String
+class TooltipAttrs: public lout::object::String
 {
 public:
-   TooltipAttrs(const char *text): object::String(text) { }
+   TooltipAttrs(const char *text): lout::object::String(text) { }
 };
 
 /**
@@ -542,7 +542,7 @@
 /**
  * \sa dw::core::style
  */
-class FontAttrs: public object::Object
+class FontAttrs: public lout::object::Object
 {
 public:
    const char *name;
@@ -550,7 +550,7 @@
    int weight;
    FontStyle style;
 
-   bool equals(object::Object *other);
+   bool equals(lout::object::Object *other);
    int hashValue();
 };
 
@@ -588,7 +588,7 @@
 /**
  * \sa dw::core::style
  */
-class ColorAttrs: public object::Object
+class ColorAttrs: public lout::object::Object
 {
 protected:
    int color;
@@ -601,7 +601,7 @@
 
    inline int getColor () { return color; }
 
-   bool equals(object::Object *other);
+   bool equals(lout::object::Object *other);
    int hashValue();
 };
 
--- a/dw/table.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/table.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -25,6 +25,7 @@
 
 #define MAX misc::max
 
+using namespace lout;
 
 namespace dw {
 
--- a/dw/table.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/table.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -361,8 +361,8 @@
       TableIterator (Table *table, core::Content::Type mask, bool atEnd);
       TableIterator (Table *table, core::Content::Type mask, int index);
 
-      object::Object *clone();
-      int compareTo(misc::Comparable *other);
+      lout::object::Object *clone();
+      int compareTo(lout::misc::Comparable *other);
 
       bool next ();
       bool prev ();
@@ -377,37 +377,37 @@
    int availWidth, availAscent, availDescent;  // set by set...
 
    int numRows, numCols, curRow, curCol;
-   misc::SimpleVector<Child*> *children;
+   lout::misc::SimpleVector<Child*> *children;
 
    int redrawX, redrawY;
 
    /**
     * \brief The extremes of all columns.
     */
-   misc::SimpleVector<core::Extremes> *colExtremes;
+   lout::misc::SimpleVector<core::Extremes> *colExtremes;
 
    /**
     * \brief The widths of all columns.
     */
-   misc::SimpleVector<int> *colWidths;
+   lout::misc::SimpleVector<int> *colWidths;
 
    /**
     * Row cumulative height array: cumHeight->size() is numRows + 1,
     * cumHeight->get(0) is 0, cumHeight->get(numRows) is the total table
     * height.
     */
-   misc::SimpleVector<int> *cumHeight;
+   lout::misc::SimpleVector<int> *cumHeight;
    /**
     * If a Cell has rowspan > 1, it goes into this array
     */
-   misc::SimpleVector<int> *rowSpanCells;
+   lout::misc::SimpleVector<int> *rowSpanCells;
    /**
     * If a Cell has colspan > 1, it goes into this array
     */
-   misc::SimpleVector<int> *colSpanCells;
-   misc::SimpleVector<int> *baseline;
+   lout::misc::SimpleVector<int> *colSpanCells;
+   lout::misc::SimpleVector<int> *baseline;
 
-   misc::SimpleVector<core::style::Style*> *rowStyle;
+   lout::misc::SimpleVector<core::style::Style*> *rowStyle;
 
    /**
     * hasColPercent becomes true when any cell specifies a percentage width.
@@ -415,7 +415,7 @@
     */
    enum { LEN_AUTO = -1, LEN_ABS = -2};
    int hasColPercent;
-   misc::SimpleVector<float> *colPercents;
+   lout::misc::SimpleVector<float> *colPercents;
 
    inline bool childDefined(int n)
    {
@@ -438,7 +438,7 @@
    void setCumHeight (int row, int value)
    {
       if (value != cumHeight->get (row)) {
-         redrawY = misc::min ( redrawY, value );
+         redrawY = lout::misc::min ( redrawY, value );
          cumHeight->set (row, value);
       }
    }
@@ -446,7 +446,7 @@
    inline void setColWidth (int col, int value)
    {
       if (value != colWidths->get (col)) {
-         redrawX = misc::min (redrawX, value);
+         redrawX = lout::misc::min (redrawX, value);
          colWidths->set (col, value);
       }
    }
--- a/dw/textblock.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/textblock.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <limits.h>
 
+using namespace lout;
+
 namespace dw {
 
 int Textblock::CLASS_ID = -1;
--- a/dw/textblock.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/textblock.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -6,8 +6,6 @@
 
 namespace dw {
 
-using namespace lout;
-
 /**
  * \brief A Widget for rendering text blocks, i.e. paragraphs or sequences
  *    of paragraphs.
@@ -185,8 +183,8 @@
       TextblockIterator (Textblock *textblock, core::Content::Type mask,
                          int index);
 
-      object::Object *clone();
-      int compareTo(misc::Comparable *other);
+      lout::object::Object *clone();
+      int compareTo(lout::misc::Comparable *other);
 
       bool next ();
       bool prev ();
@@ -239,8 +237,8 @@
    int lastLineParMax;
    int wrapRef;  /* [0 based] */
 
-   misc::SimpleVector <Line> *lines;
-   misc::SimpleVector <Word> *words;
+   lout::misc::SimpleVector <Line> *lines;
+   lout::misc::SimpleVector <Word> *words;
 
    struct {int index, nChar;}
       hlStart[core::HIGHLIGHT_NUM_LAYERS], hlEnd[core::HIGHLIGHT_NUM_LAYERS];
--- a/dw/types.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/types.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -22,6 +22,8 @@
 #include "core.hh"
 #include "../lout/msg.h"
 
+using namespace lout;
+
 namespace dw {
 namespace core {
 
--- a/dw/types.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/types.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -8,8 +8,6 @@
 namespace dw {
 namespace core {
 
-using namespace lout;
-
 enum HPosition
 {
    HPOS_LEFT,
@@ -52,7 +50,7 @@
 /**
  * \brief Abstract interface for different shapes.
  */
-class Shape: public object::Object
+class Shape: public lout::object::Object
 {
 public:
    virtual bool isPointWithin (int x, int y) = 0;
@@ -97,7 +95,7 @@
 class Polygon: public Shape
 {
 private:
-   misc::SimpleVector<Point> *points;
+   lout::misc::SimpleVector<Point> *points;
    int minx, miny, maxx, maxy;
 
    /**
@@ -132,7 +130,7 @@
 class Region
 {
 private:
-   container::typed::List <Rectangle> *rectangleList;
+   lout::container::typed::List <Rectangle> *rectangleList;
 
 public:
    Region ();
@@ -142,7 +140,7 @@
 
    void addRectangle (Rectangle *r);
 
-   container::typed::Iterator <Rectangle> rectangles ()
+   lout::container::typed::Iterator <Rectangle> rectangles ()
    {
       return rectangleList->iterator ();
    };
--- a/dw/ui.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/ui.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -27,7 +27,8 @@
 namespace core {
 namespace ui {
 
-using namespace object;
+using namespace lout;
+using namespace lout::object;
 
 int Embed::CLASS_ID = -1;
 
--- a/dw/ui.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/ui.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -531,7 +531,7 @@
 /**
  * \brief A factory for the common resource.
  */
-class ResourceFactory: public object::Object
+class ResourceFactory: public lout::object::Object
 {
 public:
    virtual LabelButtonResource *createLabelButtonResource (const char *label)
--- a/dw/view.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/view.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -13,7 +13,7 @@
  *
  * \sa\ref dw-overview, \ref dw-layout-views
  */
-class View: public object::Object
+class View: public lout::object::Object
 {
 public:
    /*
--- a/dw/widget.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/widget.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -24,6 +24,7 @@
 #include "../lout/msg.h"
 #include "../lout/debug.hh"
 
+using namespace lout;
 using namespace lout::object;
 
 namespace dw {
--- a/dw/widget.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/dw/widget.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -20,7 +20,7 @@
  *
  * \sa\ref dw-overview, \ref dw-layout-widgets
  */
-class Widget: public identity::IdentifiableObject
+class Widget: public lout::identity::IdentifiableObject
 {
    friend class Layout;
 
--- a/src/findbar.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/src/findbar.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -18,6 +18,8 @@
 #include "uicmd.hh"
 #include "bw.h"
 
+using namespace fltk;
+
 /*
  * Local sub class
  * (Used to handle escape in the findbar, may also avoid some shortcuts).
--- a/src/findbar.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/src/findbar.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -9,22 +9,20 @@
 #include <fltk/Group.h>
 #include <fltk/CheckButton.h>
 
-using namespace fltk;
-
 /*
  * Searchbar to find text in page.
  */
-class Findbar : public Group {
-   Button *clrb;
-   HighlightButton *hide_btn, *next_btn, *prev_btn;
-   CheckButton *check_btn;
-   xpmImage *hideImg;
-   Input *i;
+class Findbar : public fltk::Group {
+   fltk::Button *clrb;
+   fltk::HighlightButton *hide_btn, *next_btn, *prev_btn;
+   fltk::CheckButton *check_btn;
+   fltk::xpmImage *hideImg;
+   fltk::Input *i;
 
-   static void search_cb (Widget *, void *);
-   static void searchBackwards_cb (Widget *, void *);
-   static void search_cb2 (Widget *, void *);
-   static void hide_cb (Widget *, void *);
+   static void search_cb (fltk::Widget *, void *);
+   static void searchBackwards_cb (fltk::Widget *, void *);
+   static void search_cb2 (fltk::Widget *, void *);
+   static void hide_cb (fltk::Widget *, void *);
 
 public:
    Findbar(int width, int height);
--- a/src/form.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/src/form.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -25,6 +25,7 @@
 #include "nav.h"
 #include "uicmd.hh"
 
+using namespace lout;
 using namespace dw;
 using namespace dw::core;
 using namespace dw::core::style;
--- a/src/html.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/src/html.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -58,6 +58,7 @@
 /*-----------------------------------------------------------------------------
  * Name spaces
  *---------------------------------------------------------------------------*/
+using namespace lout;
 using namespace dw;
 using namespace dw::core;
 using namespace dw::core::ui;
--- a/src/ui.hh	Sat Oct 10 03:04:12 2009 +0000
+++ b/src/ui.hh	Thu Oct 15 20:12:37 2009 +0200
@@ -16,8 +16,6 @@
 
 #include "findbar.hh"
 
-using namespace fltk;
-
 typedef enum {
    UI_BACK = 0,
    UI_FORW,
@@ -48,15 +46,15 @@
    CustTabGroup *Tabs;
    char *TabTooltip;
 
-   Group *TopGroup;
-   Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools,
+   fltk::Group *TopGroup;
+   fltk::Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools,
           *Clear, *Search, *FullScreen, *BugMeter, *FileButton;
-   Input  *Location;
-   PackedGroup *ProgBox;
+   fltk::Input  *Location;
+   fltk::PackedGroup *ProgBox;
    CustProgressBox *PProg, *IProg;
-   Group *Panel, *StatusPanel;
-   Widget *Main;
-   Output *Status;
+   fltk::Group *Panel, *StatusPanel;
+   fltk::Widget *Main;
+   fltk::Output *Status;
 
    int MainIdx;
    // Panel customization variables
@@ -67,13 +65,13 @@
    Findbar *findbar;
    int PointerOnLink;
 
-   PackedGroup *make_toolbar(int tw, int th);
-   PackedGroup *make_location();
-   PackedGroup *make_progress_bars(int wide, int thin_up);
+   fltk::PackedGroup *make_toolbar(int tw, int th);
+   fltk::PackedGroup *make_location();
+   fltk::PackedGroup *make_progress_bars(int wide, int thin_up);
    void make_menubar(int x, int y, int w, int h);
-   Widget *make_filemenu_button();
-   Group *make_panel(int ww);
-   Group *make_status_panel(int ww);
+   fltk::Widget *make_filemenu_button();
+   fltk::Group *make_panel(int ww);
+   fltk::Group *make_status_panel(int ww);
 
 public:
 
--- a/test/shapes.cc	Sat Oct 10 03:04:12 2009 +0000
+++ b/test/shapes.cc	Thu Oct 15 20:12:37 2009 +0200
@@ -22,7 +22,7 @@
 #include "../dw/core.hh"
 
 using namespace dw::core;
-using namespace misc;
+using namespace lout::misc;
 
 int main()
 {