adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ClassIDs are now actually typeinfo name pointers.

Browse Source 
I'll see, next, about the `instanceOf` thing, and going with
more normal RTTI routes.
This commit is contained in:
ADAM David Alan Martin
2025-08-09 05:11:24 -04:00
parent abbb7fdbf9
commit c107600de6
26 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dw/alignedtablecell.cc
View File

@ -27,13 +27,13 @@ using namespace lout;
namespace dw {
int AlignedTableCell::CLASS_ID = -1;
std::intptr_t AlignedTableCell::CLASS_ID = -1;
AlignedTableCell::AlignedTableCell (AlignedTableCell *ref, bool limitTextWidth):
AlignedTextblock (limitTextWidth)
{
DBG_OBJ_CREATE ("dw::AlignedTableCell");
registerName ("dw::AlignedTableCell", &CLASS_ID);
registerName ("dw::AlignedTableCell", typeid(*this), &CLASS_ID);
/** \bug ignoreLine1OffsetSometimes does not work? */
//ignoreLine1OffsetSometimes = true;

2
dw/alignedtablecell.hh
View File

@ -33,7 +33,7 @@ protected:
void setMaxValue (int maxValue, int value);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
AlignedTableCell(AlignedTableCell *ref, bool limitTextWidth);
~AlignedTableCell();

4
dw/alignedtextblock.cc
View File

@ -58,13 +58,13 @@ void AlignedTextblock::List::unref(int pos)
delete this;
}
int AlignedTextblock::CLASS_ID = -1;
std::intptr_t AlignedTextblock::CLASS_ID = -1;
AlignedTextblock::AlignedTextblock (bool limitTextWidth):
Textblock (limitTextWidth)
{
DBG_OBJ_CREATE ("dw::AlignedTextblock");
registerName ("dw::AlignedTextblock", &CLASS_ID);
registerName ("dw::AlignedTextblock", typeid(*this), &CLASS_ID);
}
void AlignedTextblock::setRefTextblock (AlignedTextblock *ref)

2
dw/alignedtextblock.hh
View File

@ -51,7 +51,7 @@ protected:
void updateValue ();
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
~AlignedTextblock();
};

4
dw/image.cc
View File

@ -131,12 +131,12 @@ int ImageMapsList::link (object::Object *key, int x, int y)
// ----------------------------------------------------------------------
int Image::CLASS_ID = -1;
std::intptr_t Image::CLASS_ID = -1;
Image::Image(const char *altText)
{
DBG_OBJ_CREATE ("dw::Image");
registerName ("dw::Image", &CLASS_ID);
registerName ("dw::Image", typeid(*this), &CLASS_ID);
this->altText = altText ? dStrdup (altText) : NULL;
altTextWidth = -1; // not yet calculated
buffer = NULL;

2
dw/image.hh
View File

@ -145,7 +145,7 @@ protected:
//core::Iterator *iterator (Content::Type mask, bool atEnd);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
Image(const char *altText);
~Image();

4
dw/listitem.cc
View File

@ -25,13 +25,13 @@
namespace dw {
int ListItem::CLASS_ID = -1;
std::intptr_t ListItem::CLASS_ID = -1;
ListItem::ListItem (ListItem *ref, bool limitTextWidth):
AlignedTextblock (limitTextWidth)
{
DBG_OBJ_CREATE ("dw::ListItem");
registerName ("dw::ListItem", &CLASS_ID);
registerName ("dw::ListItem", typeid(*this), &CLASS_ID);
setRefTextblock (ref);
}

2
dw/listitem.hh
View File

@ -13,7 +13,7 @@ protected:
void setMaxValue (int maxValue, int value);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
ListItem(ListItem *ref, bool limitTextWidth);
~ListItem();

4
dw/oofawarewidget.cc
View File

@ -38,12 +38,12 @@ const char *OOFAwareWidget::OOFM_NAME[NUM_OOFM] = {
"FLOATS", "ABSOLUTE", "RELATIVE", "FIXED"
};
int OOFAwareWidget::CLASS_ID = -1;
std::intptr_t OOFAwareWidget::CLASS_ID = -1;
OOFAwareWidget::OOFAwareWidget ()
{
DBG_OBJ_CREATE ("dw::oof::OOFAwareWidget");
registerName ("dw::oof::OOFAwareWidget", &CLASS_ID);
registerName ("dw::oof::OOFAwareWidget", typeid(*this), &CLASS_ID);
for (int i = 0; i < NUM_OOFM; i++) {
oofContainer[i] = NULL;

2
dw/oofawarewidget.hh
View File

@ -195,7 +195,7 @@ public:
SL_START, SL_BACKGROUND, SL_SC_BOTTOM, SL_IN_FLOW, SL_OOF_REF,
SL_OOF_CONT, SL_SC_TOP, SL_END };
static int CLASS_ID;
static std::intptr_t CLASS_ID;
OOFAwareWidget ();
~OOFAwareWidget ();

4
dw/regardingborder.cc
View File

@ -23,12 +23,12 @@
namespace dw {
int RegardingBorder::CLASS_ID = -1;
std::intptr_t RegardingBorder::CLASS_ID = -1;
RegardingBorder::RegardingBorder ()
{
DBG_OBJ_CREATE ("dw::RegardingBorder");
registerName ("dw::RegardingBorder", &CLASS_ID);
registerName ("dw::RegardingBorder", typeid(*this), &CLASS_ID);
}
RegardingBorder::~RegardingBorder ()

2
dw/regardingborder.hh
View File

@ -13,7 +13,7 @@ namespace dw {
class RegardingBorder: public oof::OOFAwareWidget
{
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
RegardingBorder ();
~RegardingBorder ();

4
dw/ruler.cc
View File

@ -26,12 +26,12 @@
namespace dw {
int Ruler::CLASS_ID = -1;
std::intptr_t Ruler::CLASS_ID = -1;
Ruler::Ruler ()
{
DBG_OBJ_CREATE ("dw::Ruler");
registerName ("dw::Ruler", &CLASS_ID);
registerName ("dw::Ruler", typeid(*this), &CLASS_ID);
}
Ruler::~Ruler ()

2
dw/ruler.hh
View File

@ -30,7 +30,7 @@ protected:
core::GettingWidgetAtPointContext *context);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
Ruler ();
~Ruler ();

4
dw/simpletablecell.cc
View File

@ -27,13 +27,13 @@ using namespace lout;
namespace dw {
int SimpleTableCell::CLASS_ID = -1;
std::intptr_t SimpleTableCell::CLASS_ID = -1;
SimpleTableCell::SimpleTableCell (bool limitTextWidth):
Textblock (limitTextWidth)
{
DBG_OBJ_CREATE ("dw::SimpleTableCell");
registerName ("dw::SimpleTableCell", &CLASS_ID);
registerName ("dw::SimpleTableCell", typeid(*this), &CLASS_ID);
}
SimpleTableCell::~SimpleTableCell()

2
dw/simpletablecell.hh
View File

@ -24,7 +24,7 @@ protected:
bool adjustExtraSpaceWhenCorrectingRequisitionByOOF ();
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
SimpleTableCell (bool limitTextWidth);
~SimpleTableCell ();

4
dw/table.cc
View File

@ -29,12 +29,12 @@ using namespace lout;
namespace dw {
bool Table::adjustTableMinWidth = true;
int Table::CLASS_ID = -1;
std::intptr_t Table::CLASS_ID = -1;
Table::Table(bool limitTextWidth)
{
DBG_OBJ_CREATE ("dw::Table");
registerName ("dw::Table", &CLASS_ID);
registerName ("dw::Table", typeid(*this), &CLASS_ID);
setButtonSensitive(false);
this->limitTextWidth = limitTextWidth;

2
dw/table.hh
View File

@ -492,7 +492,7 @@ protected:
void removeChild (Widget *child);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
inline static void setAdjustTableMinWidth (bool adjustTableMinWidth)
{ Table::adjustTableMinWidth = adjustTableMinWidth; }

4
dw/textblock.cc
View File

@ -43,7 +43,7 @@ using namespace lout::unicode;
namespace dw {
int Textblock::CLASS_ID = -1;
std::intptr_t Textblock::CLASS_ID = -1;
Textblock::WordImgRenderer::WordImgRenderer (Textblock *textblock,
int wordNo)
@ -206,7 +206,7 @@ void Textblock::setStretchabilityFactor (int stretchabilityFactor)
Textblock::Textblock (bool limitTextWidth, bool treatAsInline)
{
DBG_OBJ_CREATE ("dw::Textblock");
registerName ("dw::Textblock", &CLASS_ID);
registerName ("dw::Textblock", typeid(*this), &CLASS_ID);
setButtonSensitive(true);
hasListitemValue = false;

2
dw/textblock.hh
View File

@ -864,7 +864,7 @@ protected:
int getGeneratorRest (int oofmIndex);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
static void setPenaltyHyphen (int penaltyHyphen);
static void setPenaltyHyphen2 (int penaltyHyphen2);

4
dw/ui.cc
View File

@ -32,12 +32,12 @@ namespace ui {
using namespace lout;
using namespace lout::object;
int Embed::CLASS_ID = -1;
std::intptr_t Embed::CLASS_ID = -1;
Embed::Embed(Resource *resource)
{
DBG_OBJ_CREATE ("dw::core::ui::Embed");
registerName ("dw::core::ui::Embed", &CLASS_ID);
registerName ("dw::core::ui::Embed", typeid(*this), &CLASS_ID);
this->resource = resource;
resource->setEmbed (this);
DBG_OBJ_ASSOC_CHILD (resource);

2
dw/ui.hh
View File

@ -251,7 +251,7 @@ protected:
bool buttonPressImpl (core::EventButton *event);
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
Embed(Resource *resource);
~Embed();

4
dw/widget.cc
View File

@ -73,12 +73,12 @@ void Widget::WidgetImgRenderer::draw (int x, int y, int width, int height)
// ----------------------------------------------------------------------
bool Widget::adjustMinWidth = true;
int Widget::CLASS_ID = -1;
std::intptr_t Widget::CLASS_ID = -1;
Widget::Widget ()
{
DBG_OBJ_CREATE ("dw::core::Widget");
registerName ("dw::core::Widget", &CLASS_ID);
registerName ("dw::core::Widget", typeid(*this), &CLASS_ID);
DBG_OBJ_ASSOC_CHILD (&requisitionParams);
DBG_OBJ_ASSOC_CHILD (&extremesParams);

2
dw/widget.hh
View File

@ -458,7 +458,7 @@ private:
public:
static int CLASS_ID;
static std::intptr_t CLASS_ID;
inline static void setAdjustMinWidth (bool adjustMinWidth)
{ Widget::adjustMinWidth = adjustMinWidth; }