Fixed|libshell|libdeng2: DENG2_PIMPL required by DENG2_PRIVATE

The private instance must be derived from de::IPrivate for destruction to work correctly.
skyjake · Mar 8, 2013 · e860f73 · e860f73
1 parent f359350
commit e860f73
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/doomsday/libdeng2/src/net/listensocket.cpp b/doomsday/libdeng2/src/net/listensocket.cpp
@@ -27,7 +27,7 @@
 
 namespace de {
 
-struct ListenSocket::Instance
+DENG2_PIMPL_NOREF(ListenSocket)
 {
     QTcpServer *socket;
     duint16 port;

diff --git a/doomsday/libdeng2/src/net/socket.cpp b/doomsday/libdeng2/src/net/socket.cpp
@@ -182,7 +182,7 @@ struct MessageHeader : public ISerializable
 
 using namespace internal;
 
-struct Socket::Instance
+DENG2_PIMPL_NOREF(Socket)
 {
     Address target;
     bool quiet;

diff --git a/doomsday/libshell/src/dialogwidget.cpp b/doomsday/libshell/src/dialogwidget.cpp
@@ -24,7 +24,7 @@
 namespace de {
 namespace shell {
 
-struct DialogWidget::Instance
+DENG2_PIMPL_NOREF(DialogWidget)
 {
     QEventLoop subloop;
 };

diff --git a/doomsday/libshell/src/inputdialog.cpp b/doomsday/libshell/src/inputdialog.cpp
@@ -25,7 +25,7 @@
 namespace de {
 namespace shell {
 
-struct InputDialog::Instance
+DENG2_PIMPL_NOREF(InputDialog)
 {
     LabelWidget *label;
     LineEditWidget *edit;

diff --git a/doomsday/libshell/src/labelwidget.cpp b/doomsday/libshell/src/labelwidget.cpp
@@ -23,7 +23,7 @@
 namespace de {
 namespace shell {
 
-struct LabelWidget::Instance
+DENG2_PIMPL_NOREF(LabelWidget)
 {
     TextCanvas::Char background;
     String label;

diff --git a/doomsday/libshell/src/localserver.cpp b/doomsday/libshell/src/localserver.cpp
@@ -26,7 +26,7 @@
 namespace de {
 namespace shell {
 
-struct LocalServer::Instance
+DENG2_PIMPL_NOREF(LocalServer)
 {
     Link *link;
     duint16 port;

diff --git a/doomsday/libshell/src/logwidget.cpp b/doomsday/libshell/src/logwidget.cpp
@@ -82,7 +82,7 @@ class Sink : public LogSink, public Lockable
     QList<LogEntry *> _entries;
 };
 
-struct LogWidget::Instance
+DENG2_PIMPL(LogWidget)
 {
     Sink sink;
     MonospaceLogSinkFormatter formatter;
@@ -91,8 +91,9 @@ struct LogWidget::Instance
     int maxEntries;
     int visibleOffset;
 
-    Instance(LogWidget &inst)
-        : sink(inst),
+    Instance(Public *inst)
+        : Base(inst),
+          sink(*inst),
           cacheWidth(0),
           maxEntries(1000),
           visibleOffset(0)
@@ -145,7 +146,7 @@ struct LogWidget::Instance
     }
 };
 
-LogWidget::LogWidget(String const &name) : TextWidget(name), d(new Instance(*this))
+LogWidget::LogWidget(String const &name) : TextWidget(name), d(new Instance(this))
 {}
 
 LogSink &LogWidget::logSink()

diff --git a/doomsday/libshell/src/protocol.cpp b/doomsday/libshell/src/protocol.cpp
@@ -110,7 +110,7 @@ Packet *LogEntryPacket::fromBlock(Block const &block)
 
 static char const *MAP_OUTLINE_PACKET_TYPE = "MpOL";
 
-struct MapOutlinePacket::Instance
+DENG2_PIMPL_NOREF(MapOutlinePacket)
 {
     QList<Line> lines;
 };

diff --git a/doomsday/libshell/src/textcanvas.cpp b/doomsday/libshell/src/textcanvas.cpp
@@ -23,7 +23,7 @@
 namespace de {
 namespace shell {
 
-struct TextCanvas::Instance
+DENG2_PIMPL_NOREF(TextCanvas)
 {
     Size size;
     QList<Char *> lines;

diff --git a/doomsday/libshell/src/textwidget.cpp b/doomsday/libshell/src/textwidget.cpp
@@ -24,7 +24,7 @@
 namespace de {
 namespace shell {
 
-struct TextWidget::Instance
+DENG2_PIMPL_NOREF(TextWidget)
 {
     TextCanvas *canvas;
     RuleRectangle *rule;

diff --git a/doomsday/tools/shell/shell-gui/src/guishellapp.cpp b/doomsday/tools/shell/shell-gui/src/guishellapp.cpp
@@ -32,7 +32,7 @@ Q_DECLARE_METATYPE(de::Address)
 using namespace de;
 using namespace de::shell;
 
-struct GuiShellApp::Instance
+DENG2_PIMPL_NOREF(GuiShellApp)
 {
     ServerFinder finder;
 

diff --git a/doomsday/tools/shell/shell-gui/src/qttextcanvas.cpp b/doomsday/tools/shell/shell-gui/src/qttextcanvas.cpp
@@ -24,7 +24,7 @@
 using namespace de;
 using namespace de::shell;
 
-struct QtTextCanvas::Instance
+DENG2_PIMPL_NOREF(QtTextCanvas)
 {
     Size dims;
     QImage backBuffer;
@@ -103,8 +103,7 @@ struct QtTextCanvas::Instance
     }
 };
 
-QtTextCanvas::QtTextCanvas(TextCanvas::Size const &size)
-    : d(new Instance)
+QtTextCanvas::QtTextCanvas(TextCanvas::Size const &size) : d(new Instance)
 {
     d->dims = size;
 

diff --git a/doomsday/tools/shell/shell-text/src/cursestextcanvas.cpp b/doomsday/tools/shell/shell-text/src/cursestextcanvas.cpp
@@ -18,7 +18,7 @@
 
 #include "cursestextcanvas.h"
 
-struct CursesTextCanvas::Instance
+DENG2_PIMPL_NOREF(CursesTextCanvas)
 {
     WINDOW *window;
     Coord origin;

diff --git a/doomsday/tools/shell/shell-text/src/localserverdialog.cpp b/doomsday/tools/shell/shell-text/src/localserverdialog.cpp
@@ -28,7 +28,7 @@
 using namespace de;
 using namespace de::shell;
 
-struct LocalServerDialog::Instance
+DENG2_PIMPL_NOREF(LocalServerDialog)
 {
     ChoiceWidget *choice;
     LineEditWidget *port;