libdeng2|Refactor: Use de::Id instead of duint32

skyjake · Feb 23, 2013 · 31f2a8c · 31f2a8c
1 parent e749ed6
commit 31f2a8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/doomsday/libdeng2/include/de/widgets/widget.h b/doomsday/libdeng2/include/de/widgets/widget.h
@@ -23,6 +23,7 @@
 
 #include "../String"
 #include "../Event"
+#include "../Id"
 
 namespace de {
 
@@ -62,7 +63,7 @@ class DENG2_PUBLIC Widget
     /**
      * Returns the automatically generated, unique identifier of the widget.
      */
-    duint32 id() const;
+    Id id() const;
 
     String name() const;
     void setName(String const &name);

diff --git a/doomsday/libdeng2/src/widgets/widget.cpp b/doomsday/libdeng2/src/widgets/widget.cpp
@@ -24,12 +24,9 @@
 
 namespace de {
 
-static duint32 widgetIdGen = 0;
-
-struct Widget::Instance
+DENG2_PIMPL(Widget::Instance)
 {
-    Widget &self;
-    duint32 id;
+    Id id;
     String name;
     Widget *parent;
     Behaviors behavior;
@@ -41,11 +38,8 @@ struct Widget::Instance
     Children children;
     NamedChildren index;
 
-    Instance(Widget &w, String const &n) : self(w), name(n), parent(0)
-    {
-        // A unique ID is generated for each Widget instance.
-        id = ++widgetIdGen;
-    }
+    Instance(Public *i, String const &n) : Base(i), name(n), parent(0)
+    {}
 
     ~Instance()
     {
@@ -63,7 +57,7 @@ struct Widget::Instance
     }
 };
 
-Widget::Widget(String const &name) : d(new Instance(*this, name))
+Widget::Widget(String const &name) : d(new Instance(this, name))
 {}
 
 Widget::~Widget()
@@ -82,7 +76,7 @@ Widget::~Widget()
     delete d;
 }
 
-duint32 Widget::id() const
+Id Widget::id() const
 {
     return d->id;
 }