summaryrefslogtreecommitdiffstats
path: root/sigmodr/ObjectUI.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-10-11 14:40:58 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-10-11 14:40:58 +0000
commit927c42e73cce66acccc7056ea330a2362b455a00 (patch)
treefd37832bb336c19c2dc5d6776c36e6fff0b969d0 /sigmodr/ObjectUI.cpp
parent3a096bed018254f9d662f9ae85792b8ae5df4837 (diff)
[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
Diffstat (limited to 'sigmodr/ObjectUI.cpp')
-rw-r--r--sigmodr/ObjectUI.cpp44
1 files changed, 22 insertions, 22 deletions
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));
-}