Shell: Apply the DENG2_PIMPL macro

skyjake · Feb 7, 2013 · 3e641ce · 3e641ce
1 parent 3534776
commit 3e641ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/doomsday/tools/shell/shell-text/src/cursesapp.cpp b/doomsday/tools/shell/shell-text/src/cursesapp.cpp
@@ -73,9 +73,8 @@ static de::Vector2i actualTerminalSize(de::Vector2i const &oldSize)
     return size;
 }
 
-struct CursesApp::Instance
+DENG2_PIMPL(CursesApp)
 {
-    CursesApp &self;
     de::LogBuffer logBuffer;
     de::Clock clock;
 
@@ -86,7 +85,7 @@ struct CursesApp::Instance
 
     TextRootWidget *rootWidget;
 
-    Instance(CursesApp &a) : self(a), unicodeContinuation(0), rootWidget(0)
+    Instance(Public &i) : Private(i), unicodeContinuation(0), rootWidget(0)
     {
         logBuffer.enableStandardOutput(false);
 

diff --git a/doomsday/tools/shell/shell-text/src/shellapp.cpp b/doomsday/tools/shell/shell-text/src/shellapp.cpp
@@ -36,9 +36,8 @@
 using namespace de;
 using namespace shell;
 
-struct ShellApp::Instance
+DENG2_PIMPL(ShellApp)
 {
-    ShellApp &self;
     PersistentData persist;
     MenuWidget *menu;
     LogWidget *log;
@@ -48,7 +47,7 @@ struct ShellApp::Instance
     Link *link;
     ServerFinder finder;
 
-    Instance(ShellApp &a) : self(a), link(0)
+    Instance(Public &i) : Private(i), link(0)
     {
         RootWidget &root = self.rootWidget();
 

diff --git a/doomsday/tools/shell/shell-text/src/statuswidget.cpp b/doomsday/tools/shell/shell-text/src/statuswidget.cpp
@@ -23,13 +23,12 @@
 using namespace de;
 using namespace de::shell;
 
-struct StatusWidget::Instance
+DENG2_PIMPL(StatusWidget)
 {
-    StatusWidget &self;
     Link *link;
     QTimer *updateTimer;
 
-    Instance(StatusWidget &i) : self(i), link(0)
+    Instance(Public &i) : Private(i), link(0)
     {
         updateTimer = new QTimer(&self);
     }