Made the rest of the widgets use pimpl

1 files changed, 41 insertions, 38 deletions

diff --git a/sigmodr/widgets/StatusUI.cpp b/sigmodr/widgets/StatusUI.cpp
index f7ea25de..2d3a70b5 100644
--- a/sigmodr/widgets/StatusUI.cpp
+++ b/sigmodr/widgets/StatusUI.cpp
@@ -17,6 +17,7 @@
 
 // Header include
 #include "StatusUI.h"
+#include "StatusUI_p.h"
 
 // Sigmodr core widget includes
 #include <sigmodr/corewidgets/ScriptWidget.h>
@@ -27,72 +28,74 @@
 // KDE includes
 #include <KLineEdit>
 
-// Qt includes
-#include <QtCore/QFile>
-#include <QtGui/QVBoxLayout>
-#include <QtUiTools/QUiLoader>
-
 using namespace Sigcore;
 using namespace Sigmod;
 using namespace Sigmodr::CoreWidgets;
 using namespace Sigmodr::Widgets;
 
 StatusUI::StatusUI(Status* status, QWidget* parent) :
-        ObjectUI(parent)
+        ObjectUI(status, parent),
+        d(new Private(new Status(*status)))
 {
-    setObjects(status, new Status(*status));
+    setWidget(d->makeWidgets(this));
 }
 
-void StatusUI::initGui()
+void StatusUI::apply()
 {
-    QFile file(":/gui/status.ui");
-    file.open(QFile::ReadOnly);
-    QWidget *formWidget = QUiLoader().load(&file, this);
-    file.close();
-    ui_name = formWidget->findChild<KLineEdit*>("varName");
-    ui_battleScript = formWidget->findChild<ScriptWidget*>("varBattleScript");
-    ui_worldScript = formWidget->findChild<ScriptWidget*>("varWorldScript");
-    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
-    connect(ui_battleScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(battleScriptChanged(Sigcore::Script)));
-    connect(ui_worldScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(worldScriptChanged(Sigcore::Script)));
-    QVBoxLayout* layout = new QVBoxLayout;
-    layout->addWidget(formWidget);
-    setLayout(layout);
+    *qobject_cast<Status*>(m_object) = *d->m_status;
+    ObjectUI::apply();
 }
 
-void StatusUI::setGui()
+void StatusUI::discard()
 {
-    ui_name->setText(qobject_cast<Status*>(modified())->name());
-    ui_battleScript->setValue(qobject_cast<Status*>(modified())->battleScript());
-    ui_worldScript->setValue(qobject_cast<Status*>(modified())->worldScript());
+    *d->m_status = *qobject_cast<Status*>(m_object);
+    d->resetGui();
+    ObjectUI::discard();
 }
 
-void StatusUI::apply()
+StatusUI::Private::Private(Status* status) :
+        ObjectUIPrivate(status),
+        m_status(status)
 {
-    *qobject_cast<Status*>(original()) = *qobject_cast<Status*>(modified());
-    emit(changed(false));
 }
 
-void StatusUI::discard()
+StatusUI::Private::~Private()
+{
+    delete m_status;
+}
+
+QWidget* StatusUI::Private::makeWidgets(ObjectUI* widget)
+{
+    QWidget *form = openUiFile(":/gui/status.ui", widget);
+    ui_name = form->findChild<KLineEdit*>("varName");
+    ui_battleScript = form->findChild<ScriptWidget*>("varBattleScript");
+    ui_worldScript = form->findChild<ScriptWidget*>("varWorldScript");
+    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
+    connect(ui_battleScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(battleScriptChanged(Sigcore::Script)));
+    connect(ui_worldScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(worldScriptChanged(Sigcore::Script)));
+    return form;
+}
+
+void StatusUI::Private::resetGui()
 {
-    *qobject_cast<Status*>(modified()) = *qobject_cast<Status*>(original());
-    setGui();
-    emit(changed(false));
+    ui_name->setText(m_status->name());
+    ui_battleScript->setValue(m_status->battleScript());
+    ui_worldScript->setValue(m_status->worldScript());
 }
 
-void StatusUI::nameChanged(const QString& name)
+void StatusUI::Private::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Status*>(modified())->setName(name);
+    m_status->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void StatusUI::battleScriptChanged(const Script& battleScript)
+void StatusUI::Private::battleScriptChanged(const Script& battleScript)
 {
-    qobject_cast<Status*>(modified())->setBattleScript(battleScript);
+    m_status->setBattleScript(battleScript);
 }
 
-void StatusUI::worldScriptChanged(const Script& worldScript)
+void StatusUI::Private::worldScriptChanged(const Script& worldScript)
 {
-    qobject_cast<Status*>(modified())->setWorldScript(worldScript);
+    m_status->setWorldScript(worldScript);
 }