Made the rest of the widgets use pimpl

1 files changed, 42 insertions, 37 deletions

diff --git a/sigmodr/widgets/TimeUI.cpp b/sigmodr/widgets/TimeUI.cpp
index 2a108ef7..de27504f 100644
--- a/sigmodr/widgets/TimeUI.cpp
+++ b/sigmodr/widgets/TimeUI.cpp
@@ -17,6 +17,7 @@
 
 // Header include
 #include "TimeUI.h"
+#include "TimeUI_p.h"
 
 // Sigmodr core widget includes
 #include <sigmodr/corewidgets/ScriptWidget.h>
@@ -28,10 +29,7 @@
 #include <KLineEdit>
 
 // Qt includes
-#include <QtCore/QFile>
 #include <QtGui/QTimeEdit>
-#include <QtGui/QVBoxLayout>
-#include <QtUiTools/QUiLoader>
 
 using namespace Sigcore;
 using namespace Sigmod;
@@ -39,62 +37,69 @@ using namespace Sigmodr::CoreWidgets;
 using namespace Sigmodr::Widgets;
 
 TimeUI::TimeUI(Time* time, QWidget* parent) :
-        ObjectUI(parent)
+        ObjectUI(time, parent),
+        d(new Private(new Time(*time)))
 {
-    setObjects(time, new Time(*time));
+    setWidget(d->makeWidgets(this));
 }
 
-void TimeUI::initGui()
+void TimeUI::apply()
 {
-    QFile file(":/gui/time.ui");
-    file.open(QFile::ReadOnly);
-    QWidget *formWidget = QUiLoader().load(&file, this);
-    file.close();
-    ui_name = formWidget->findChild<KLineEdit*>("varName");
-    ui_time = formWidget->findChild<QTimeEdit*>("varTime");
-    ui_script = formWidget->findChild<ScriptWidget*>("varScript");
-    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
-    connect(ui_time, SIGNAL(timeChanged(QTime)), this, SLOT(timeChanged(QTime)));
-    connect(ui_script, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(scriptChanged(Sigcore::Script)));
-    QVBoxLayout* layout = new QVBoxLayout;
-    layout->addWidget(formWidget);
-    setLayout(layout);
+    *qobject_cast<Time*>(m_object) = *d->m_time;
+    ObjectUI::apply();
 }
 
-void TimeUI::setGui()
+void TimeUI::discard()
 {
-    ui_name->setText(qobject_cast<Time*>(modified())->name());
-    ui_time->setTime(QTime(qobject_cast<Time*>(modified())->hour(), qobject_cast<Time*>(modified())->minute()));
-    ui_script->setValue(qobject_cast<Time*>(modified())->script());
+    *d->m_time = *qobject_cast<Time*>(m_object);
+    d->resetGui();
+    ObjectUI::discard();
 }
 
-void TimeUI::apply()
+TimeUI::Private::Private(Time* time) :
+        ObjectUIPrivate(time),
+        m_time(time)
 {
-    *qobject_cast<Time*>(original()) = *qobject_cast<Time*>(modified());
-    emit(changed(false));
 }
 
-void TimeUI::discard()
+TimeUI::Private::~Private()
+{
+    delete m_time;
+}
+
+QWidget* TimeUI::Private::makeWidgets(ObjectUI* widget)
+{
+    QWidget *form = openUiFile(":/gui/time.ui", widget);
+    ui_name = form->findChild<KLineEdit*>("varName");
+    ui_time = form->findChild<QTimeEdit*>("varTime");
+    ui_script = form->findChild<ScriptWidget*>("varScript");
+    connect(ui_name, SIGNAL(textChanged(QString)), this, SLOT(nameChanged(QString)));
+    connect(ui_time, SIGNAL(timeChanged(QTime)), this, SLOT(timeChanged(QTime)));
+    connect(ui_script, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(scriptChanged(Sigcore::Script)));
+    return form;
+}
+
+void TimeUI::Private::resetGui()
 {
-    *qobject_cast<Time*>(modified()) = *qobject_cast<Time*>(original());
-    setGui();
-    emit(changed(false));
+    ui_name->setText(m_time->name());
+    ui_time->setTime(QTime(m_time->hour(), m_time->minute()));
+    ui_script->setValue(m_time->script());
 }
 
-void TimeUI::nameChanged(const QString& name)
+void TimeUI::Private::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Time*>(modified())->setName(name);
+    m_time->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void TimeUI::timeChanged(const QTime& time)
+void TimeUI::Private::timeChanged(const QTime& time)
 {
-    qobject_cast<Time*>(modified())->setHour(time.hour());
-    qobject_cast<Time*>(modified())->setMinute(time.minute());
+    m_time->setHour(time.hour());
+    m_time->setMinute(time.minute());
 }
 
-void TimeUI::scriptChanged(const Script& script)
+void TimeUI::Private::scriptChanged(const Script& script)
 {
-    qobject_cast<Time*>(modified())->setScript(script);
+    m_time->setScript(script);
 }