From 927c42e73cce66acccc7056ea330a2362b455a00 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 11 Oct 2008 14:40:58 +0000 Subject: [FIX] Reordered sections in class declarations [FIX] Using QSet rather than QList for players [ADD] Started signet library (compilation fails) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@273 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- sigmodr/ObjectUI.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'sigmodr/ObjectUI.cpp') diff --git a/sigmodr/ObjectUI.cpp b/sigmodr/ObjectUI.cpp index 6bd22808..e9559921 100644 --- a/sigmodr/ObjectUI.cpp +++ b/sigmodr/ObjectUI.cpp @@ -84,6 +84,28 @@ Sigmod::Object* Sigmodr::ObjectUI::modified() return m_object_mod; } +void Sigmodr::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Object* modified) +{ + m_object = original; + m_object_mod = modified; + if (m_validator) + delete m_validator; + m_validator = new ValidationDialog(m_object, this); + connect(m_object_mod, SIGNAL(changed()), this, SIGNAL(changed())); + connect(m_object_mod, SIGNAL(changed()), this, SLOT(setGui())); + connect(m_object_mod, SIGNAL(error(QString)), this, SLOT(setGui())); + connect(m_object_mod, SIGNAL(error(QString)), this, SLOT(errorMessage(QString))); + connect(m_object_mod, SIGNAL(warning(QString)), this, SLOT(warningMessage(QString))); + init(); +} + +void Sigmodr::ObjectUI::init() +{ + initGui(); + reload(); + emit(changed(false)); +} + void Sigmodr::ObjectUI::setChanged(const bool changed) { m_changed = changed; @@ -126,25 +148,3 @@ void Sigmodr::ObjectUI::validate() apply(); m_validator->show(); } - -void Sigmodr::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Object* modified) -{ - m_object = original; - m_object_mod = modified; - if (m_validator) - delete m_validator; - m_validator = new ValidationDialog(m_object, this); - connect(m_object_mod, SIGNAL(changed()), this, SIGNAL(changed())); - connect(m_object_mod, SIGNAL(changed()), this, SLOT(setGui())); - connect(m_object_mod, SIGNAL(error(QString)), this, SLOT(setGui())); - connect(m_object_mod, SIGNAL(error(QString)), this, SLOT(errorMessage(QString))); - connect(m_object_mod, SIGNAL(warning(QString)), this, SLOT(warningMessage(QString))); - init(); -} - -void Sigmodr::ObjectUI::init() -{ - initGui(); - reload(); - emit(changed(false)); -} -- cgit