summaryrefslogtreecommitdiffstats
path: root/sigmod/Item.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sigmod/Item.cpp')
-rw-r--r--sigmod/Item.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/sigmod/Item.cpp b/sigmod/Item.cpp
index 0ac9f360..3942a53f 100644
--- a/sigmod/Item.cpp
+++ b/sigmod/Item.cpp
@@ -31,13 +31,16 @@
// Qt includes
#include <QtCore/QSet>
-Sigmod::Item::Item(const Item& item) :
+using namespace Sigcore;
+using namespace Sigmod;
+
+Item::Item(const Item& item) :
Object(item.parent(), item.id())
{
*this = item;
}
-Sigmod::Item::Item(const Sigmod* parent, const int id) :
+Item::Item(const Sigmod* parent, const int id) :
Object(parent, id),
m_name(""),
m_sellable(false),
@@ -50,20 +53,20 @@ Sigmod::Item::Item(const Sigmod* parent, const int id) :
{
}
-Sigmod::Item::Item(const Item& item, const Sigmod* parent, const int id) :
+Item::Item(const Item& item, const Sigmod* parent, const int id) :
Object(parent, id)
{
*this = item;
}
-Sigmod::Item::Item(const QDomElement& xml, const Sigmod* parent, const int id) :
+Item::Item(const QDomElement& xml, const Sigmod* parent, const int id) :
Object(parent, id)
{
LOAD_ID();
load(xml);
}
-void Sigmod::Item::validate()
+void Item::validate()
{
TEST_BEGIN();
if (m_name.isEmpty())
@@ -76,7 +79,7 @@ void Sigmod::Item::validate()
TEST_END();
}
-void Sigmod::Item::load(const QDomElement& xml)
+void Item::load(const QDomElement& xml)
{
LOAD_BEGIN();
LOAD(name);
@@ -89,7 +92,7 @@ void Sigmod::Item::load(const QDomElement& xml)
LOAD(script);
}
-QDomElement Sigmod::Item::save() const
+QDomElement Item::save() const
{
SAVE_CREATE();
SAVE(name);
@@ -110,7 +113,7 @@ SETTER(Item, int, Price, price)
SETTER(Item, int, SellPrice, sellPrice)
SETTER(Item, int, Weight, weight)
SETTER(Item, QString&, Description, description)
-SETTER(Item, Sigcore::Script&, Script, script)
+SETTER(Item, Script&, Script, script)
GETTER(Item, QString, name)
GETTER(Item, bool, sellable)
@@ -119,7 +122,7 @@ GETTER(Item, int, price)
GETTER(Item, int, sellPrice)
GETTER(Item, int, weight)
GETTER(Item, QString, description)
-GETTER(Item, Sigcore::Script, script)
+GETTER(Item, Script, script)
CHECK(Item, QString&, name)
CHECK(Item, bool, sellable)
@@ -132,9 +135,9 @@ CHECK_BEGIN(Item, int, weight)
TBOUNDS(weight, 0, type->maxWeight())
CHECK_END()
CHECK(Item, QString&, description)
-CHECK(Item, Sigcore::Script&, script)
+CHECK(Item, Script&, script)
-Sigmod::Item& Sigmod::Item::operator=(const Item& rhs)
+Item& Item::operator=(const Item& rhs)
{
if (this == &rhs)
return *this;