summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dw/ooffloatsmgr.cc4
-rw-r--r--dw/ooffloatsmgr.hh4
-rw-r--r--dw/oofposabsmgr.cc4
-rw-r--r--dw/oofposabsmgr.hh4
-rw-r--r--dw/oofposfixedmgr.cc4
-rw-r--r--dw/oofposfixedmgr.hh4
-rw-r--r--dw/oofpositionedmgr.cc4
-rw-r--r--dw/oofpositionedmgr.hh4
-rw-r--r--dw/outofflowmgr.cc4
-rw-r--r--dw/outofflowmgr.hh4
-rw-r--r--dw/textblock.cc6
-rw-r--r--dw/textblock.hh6
-rw-r--r--dw/textblock_linebreaking.cc2
13 files changed, 47 insertions, 7 deletions
diff --git a/dw/ooffloatsmgr.cc b/dw/ooffloatsmgr.cc
index ff3d243b..762fea1b 100644
--- a/dw/ooffloatsmgr.cc
+++ b/dw/ooffloatsmgr.cc
@@ -29,6 +29,8 @@ using namespace dw::core::style;
namespace dw {
+namespace oof {
+
OOFFloatsMgr::WidgetInfo::WidgetInfo (OOFFloatsMgr *oofm, Widget *widget)
{
this->oofm = oofm;
@@ -2252,4 +2254,6 @@ Widget *OOFFloatsMgr::getWidget (int i)
return rightFloatsAll->get(i - leftFloatsAll->size())->getWidget ();
}
+} // namespace oof
+
} // namespace dw
diff --git a/dw/ooffloatsmgr.hh b/dw/ooffloatsmgr.hh
index e40f1b30..cca83af1 100644
--- a/dw/ooffloatsmgr.hh
+++ b/dw/ooffloatsmgr.hh
@@ -5,6 +5,8 @@
namespace dw {
+namespace oof {
+
class OOFFloatsMgr: public OutOfFlowMgr
{
friend class WidgetInfo;
@@ -372,6 +374,8 @@ public:
core::Widget *getWidget (int i);
};
+} // namespace oof
+
} // namespace dw
#endif // __DW_OOFFLOATSMGR_HH__
diff --git a/dw/oofposabsmgr.cc b/dw/oofposabsmgr.cc
index 3ddc1ed2..21409e35 100644
--- a/dw/oofposabsmgr.cc
+++ b/dw/oofposabsmgr.cc
@@ -22,6 +22,8 @@
namespace dw {
+namespace oof {
+
OOFPosAbsMgr::OOFPosAbsMgr (Textblock *containingBlock) :
OOFPositionedMgr (containingBlock)
{
@@ -57,4 +59,6 @@ int OOFPosAbsMgr::cbBoxRestHeight ()
- containingBlock->getStyle()->padding.bottom;
}
+} // namespace oof
+
} // namespace dw
diff --git a/dw/oofposabsmgr.hh b/dw/oofposabsmgr.hh
index 839c0a1c..eb460881 100644
--- a/dw/oofposabsmgr.hh
+++ b/dw/oofposabsmgr.hh
@@ -5,6 +5,8 @@
namespace dw {
+namespace oof {
+
class OOFPosAbsMgr: public OOFPositionedMgr
{
protected:
@@ -18,6 +20,8 @@ public:
~OOFPosAbsMgr ();
};
+} // namespace oof
+
} // namespace dw
#endif // __DW_OOFPOSABSMGR_HH__
diff --git a/dw/oofposfixedmgr.cc b/dw/oofposfixedmgr.cc
index defb8182..f0d591a7 100644
--- a/dw/oofposfixedmgr.cc
+++ b/dw/oofposfixedmgr.cc
@@ -21,6 +21,8 @@
namespace dw {
+namespace oof {
+
OOFPosFixedMgr::OOFPosFixedMgr (Textblock *containingBlock) :
OOFPositionedMgr (containingBlock)
{
@@ -53,4 +55,6 @@ int OOFPosFixedMgr::cbBoxRestHeight ()
return 0;
}
+} // namespace oof
+
} // namespace dw
diff --git a/dw/oofposfixedmgr.hh b/dw/oofposfixedmgr.hh
index f3fc6011..02b0820f 100644
--- a/dw/oofposfixedmgr.hh
+++ b/dw/oofposfixedmgr.hh
@@ -5,6 +5,8 @@
namespace dw {
+namespace oof {
+
class OOFPosFixedMgr: public OOFPositionedMgr
{
protected:
@@ -18,6 +20,8 @@ public:
~OOFPosFixedMgr ();
};
+} // namespace oof
+
} // namespace dw
#endif // __DW_OOFPOSFIXEDMGR_HH__
diff --git a/dw/oofpositionedmgr.cc b/dw/oofpositionedmgr.cc
index 963ad941..13eeda2a 100644
--- a/dw/oofpositionedmgr.cc
+++ b/dw/oofpositionedmgr.cc
@@ -29,6 +29,8 @@ using namespace dw::core::style;
namespace dw {
+namespace oof {
+
OOFPositionedMgr::OOFPositionedMgr (Textblock *containingBlock)
{
DBG_OBJ_CREATE ("dw::OOFPositionedMgr");
@@ -525,4 +527,6 @@ Widget *OOFPositionedMgr::getWidget (int i)
return children->get (i);
}
+} // namespace oof
+
} // namespace dw
diff --git a/dw/oofpositionedmgr.hh b/dw/oofpositionedmgr.hh
index dc6943ed..d19c60b6 100644
--- a/dw/oofpositionedmgr.hh
+++ b/dw/oofpositionedmgr.hh
@@ -5,6 +5,8 @@
namespace dw {
+namespace oof {
+
class OOFPositionedMgr: public OutOfFlowMgr
{
protected:
@@ -94,6 +96,8 @@ public:
core::Widget *getWidget (int i);
};
+} // namespace oof
+
} // namespace dw
#endif // __DW_OOFPOSITIONEDMGR_HH__
diff --git a/dw/outofflowmgr.cc b/dw/outofflowmgr.cc
index 29d45f89..60670f74 100644
--- a/dw/outofflowmgr.cc
+++ b/dw/outofflowmgr.cc
@@ -25,6 +25,8 @@
namespace dw {
+namespace oof {
+
OutOfFlowMgr::OutOfFlowMgr ()
{
}
@@ -33,4 +35,6 @@ OutOfFlowMgr::~OutOfFlowMgr ()
{
}
+} // namespace oof
+
} // namespace dw
diff --git a/dw/outofflowmgr.hh b/dw/outofflowmgr.hh
index 1ac5b7ec..475b93b8 100644
--- a/dw/outofflowmgr.hh
+++ b/dw/outofflowmgr.hh
@@ -7,6 +7,8 @@ namespace dw {
class Textblock;
+namespace oof {
+
/**
* \brief Represents additional data for containing blocks.
*/
@@ -70,6 +72,8 @@ public:
virtual core::Widget *getWidget (int i) = 0;
};
+} // namespace oof
+
} // namespace dw
#endif // __DW_OUTOFFLOWMGR_HH__
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 9089cc6b..b399a076 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -2354,14 +2354,14 @@ void Textblock::initOutOfFlowMgrs ()
{
if (containingBlock[OOFM_FLOATS]->outOfFlowMgr[OOFM_FLOATS] == NULL) {
containingBlock[OOFM_FLOATS]->outOfFlowMgr[OOFM_FLOATS] =
- new OOFFloatsMgr (containingBlock[OOFM_FLOATS]);
+ new oof::OOFFloatsMgr (containingBlock[OOFM_FLOATS]);
DBG_OBJ_ASSOC (containingBlock[OOFM_FLOATS],
containingBlock[OOFM_FLOATS]->outOfFlowMgr[OOFM_FLOATS]);
}
if (containingBlock[OOFM_ABSOLUTE]->outOfFlowMgr[OOFM_ABSOLUTE] == NULL) {
containingBlock[OOFM_ABSOLUTE]->outOfFlowMgr[OOFM_ABSOLUTE] =
- new OOFPosAbsMgr (containingBlock[OOFM_ABSOLUTE]);
+ new oof::OOFPosAbsMgr (containingBlock[OOFM_ABSOLUTE]);
DBG_OBJ_ASSOC (containingBlock[OOFM_ABSOLUTE],
containingBlock[OOFM_ABSOLUTE]
->outOfFlowMgr[OOFM_ABSOLUTE]);
@@ -2369,7 +2369,7 @@ void Textblock::initOutOfFlowMgrs ()
if (containingBlock[OOFM_FIXED]->outOfFlowMgr[OOFM_FIXED] == NULL) {
containingBlock[OOFM_FIXED]->outOfFlowMgr[OOFM_FIXED] =
- new OOFPosFixedMgr (containingBlock[OOFM_FIXED]);
+ new oof::OOFPosFixedMgr (containingBlock[OOFM_FIXED]);
DBG_OBJ_ASSOC (containingBlock[OOFM_FIXED],
containingBlock[OOFM_FIXED]->outOfFlowMgr[OOFM_FIXED]);
}
diff --git a/dw/textblock.hh b/dw/textblock.hh
index df2a8343..f7db7b1c 100644
--- a/dw/textblock.hh
+++ b/dw/textblock.hh
@@ -252,7 +252,7 @@ protected:
PARENT_REF_OOFM_MASK = (1 << PARENT_REF_OOFM_BITS) - 1 };
Textblock *containingBlock[NUM_OOFM];
- OutOfFlowMgr *outOfFlowMgr[NUM_OOFM];
+ oof::OutOfFlowMgr *outOfFlowMgr[NUM_OOFM];
inline bool isParentRefOOF (int parentRef)
{ return parentRef != -1 && (parentRef & PARENT_REF_OOFM_MASK); }
@@ -271,7 +271,7 @@ protected:
inline int getParentRefOOFIndex (int parentRef)
{ assert (isParentRefOOF (parentRef));
return (parentRef & PARENT_REF_OOFM_MASK) - 1; }
- inline OutOfFlowMgr *getParentRefOutOfFlowMgr (int parentRef)
+ inline oof::OutOfFlowMgr *getParentRefOutOfFlowMgr (int parentRef)
{ return outOfFlowMgr[getParentRefOOFIndex (parentRef)]; }
inline bool isWidgetOOF (Widget *widget)
@@ -284,7 +284,7 @@ protected:
{ return getParentRefOOFSubRef (widget->parentRef); }
inline int getWidgetOOFIndex (Widget *widget)
{ return getParentRefOOFIndex (widget->parentRef); }
- inline OutOfFlowMgr *getWidgetOutOfFlowMgr (Widget *widget)
+ inline oof::OutOfFlowMgr *getWidgetOutOfFlowMgr (Widget *widget)
{ return getParentRefOutOfFlowMgr (widget->parentRef); }
static inline bool testWidgetFloat (Widget *widget)
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc
index 4cb62631..f242d721 100644
--- a/dw/textblock_linebreaking.cc
+++ b/dw/textblock_linebreaking.cc
@@ -1946,7 +1946,7 @@ void Textblock::calcBorders (int lastOofRef, int height)
int y = yOffsetOfPossiblyMissingLine (lines->size ());
for (int i = 0; i < NUM_OOFM; i++) {
- OutOfFlowMgr *oofm = containingBlock[i]->outOfFlowMgr[i];
+ oof::OutOfFlowMgr *oofm = containingBlock[i]->outOfFlowMgr[i];
if (oofm) {
// Consider the example:
//