1 files changed, 38 insertions, 38 deletions

diff --git a/sigmod/test/TestCoinListItem.cpp b/sigmod/test/TestCoinListItem.cpp
index 475da303..f66830c1 100644
--- a/sigmod/test/TestCoinListItem.cpp
+++ b/sigmod/test/TestCoinListItem.cpp
@@ -33,9 +33,9 @@ void TestCoinListItem::initTestCase()
     
     Sigmod::CoinList* coinList = m_sigmod->newCoinList();
     
-    m_coinListItem1 = coinList->newItem();
-    m_coinListItem2 = coinList->newItem();
-    m_coinListItem3 = coinList->newItem();
+    m_item1 = coinList->newItem();
+    m_item2 = coinList->newItem();
+    m_item3 = coinList->newItem();
 }
 
 void TestCoinListItem::cleanupTestCase()
@@ -47,49 +47,49 @@ void TestCoinListItem::init()
 {
     TestSigmodObject::init();
     
-    makeConnections(m_coinListItem1);
-    makeConnections(m_coinListItem2);
-    makeConnections(m_coinListItem3);
+    makeConnections(m_item1);
+    makeConnections(m_item2);
+    makeConnections(m_item3);
 }
 
 void TestCoinListItem::cleanup()
 {
-    closeConnections(m_coinListItem1);
-    closeConnections(m_coinListItem2);
-    closeConnections(m_coinListItem3);
+    closeConnections(m_item1);
+    closeConnections(m_item2);
+    closeConnections(m_item3);
     
     TestSigmodObject::cleanup();
 }
 
 void TestCoinListItem::validation()
 {
-    m_coinListItem1->validate();
+    m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
     m_sigmod->newItem();
     
-    m_coinListItem1->setObject(0);
-    m_coinListItem1->validate();
+    m_item1->setObject(0);
+    m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 3);
     
-    m_coinListItem1->setType(Sigmod::CoinListItem::Species);
-    m_coinListItem1->validate();
+    m_item1->setType(Sigmod::CoinListItem::Species);
+    m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 5);
     
     m_sigmod->newSpecies();
-    m_coinListItem1->validate();
+    m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 6);
     
-    m_coinListItem1->setCost(20);
-    m_coinListItem1->validate();
+    m_item1->setCost(20);
+    m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 6);
@@ -97,7 +97,7 @@ void TestCoinListItem::validation()
 
 void TestCoinListItem::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_coinListItem1);
+    QDomDocument xml = Sigmod::Object::xml(m_item1);
     QFile file("coinListItem.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -112,27 +112,27 @@ void TestCoinListItem::loading()
     
     m_sigmod->newItem();
     
-    m_coinListItem1->setType(Sigmod::CoinListItem::Item);
-    m_coinListItem1->setObject(1);
-    m_coinListItem1->setCost(25);
+    m_item1->setType(Sigmod::CoinListItem::Item);
+    m_item1->setObject(1);
+    m_item1->setCost(25);
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
-    m_coinListItem1->load(xml.firstChildElement("CoinListItem"));
+    m_item1->load(xml.firstChildElement("CoinListItem"));
     
     // FIXME
     QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
-    QCOMPARE(m_coinListItem1->type(), Sigmod::CoinListItem::Species);
-    QCOMPARE(m_coinListItem1->object(), 0);
-    QCOMPARE(m_coinListItem1->cost(), 20);
+    QCOMPARE(m_item1->type(), Sigmod::CoinListItem::Species);
+    QCOMPARE(m_item1->object(), 0);
+    QCOMPARE(m_item1->cost(), 20);
 }
 
 void TestCoinListItem::setType()
 {
-    m_coinListItem2->setType(Sigmod::CoinListItem::Species);
-    m_coinListItem2->setType(Sigmod::CoinListItem::Species);
+    m_item2->setType(Sigmod::CoinListItem::Species);
+    m_item2->setType(Sigmod::CoinListItem::Species);
     
-    QCOMPARE(m_coinListItem2->type(), Sigmod::CoinListItem::Species);
+    QCOMPARE(m_item2->type(), Sigmod::CoinListItem::Species);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -142,10 +142,10 @@ void TestCoinListItem::setType()
 
 void TestCoinListItem::setObject()
 {
-    m_coinListItem2->setObject(0);
-    m_coinListItem2->setObject(0);
+    m_item2->setObject(0);
+    m_item2->setObject(0);
     
-    QCOMPARE(m_coinListItem2->object(), 0);
+    QCOMPARE(m_item2->object(), 0);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -155,10 +155,10 @@ void TestCoinListItem::setObject()
 
 void TestCoinListItem::setCost()
 {
-    m_coinListItem2->setCost(15);
-    m_coinListItem2->setCost(15);
+    m_item2->setCost(15);
+    m_item2->setCost(15);
     
-    QCOMPARE(m_coinListItem2->cost(), 15);
+    QCOMPARE(m_item2->cost(), 15);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -168,11 +168,11 @@ void TestCoinListItem::setCost()
 
 void TestCoinListItem::assignment()
 {
-    *m_coinListItem3 = *m_coinListItem2;
+    *m_item3 = *m_item2;
     
-    QCOMPARE(m_coinListItem3->type(), Sigmod::CoinListItem::Species);
-    QCOMPARE(m_coinListItem3->object(), 0);
-    QCOMPARE(m_coinListItem3->cost(), 15);
+    QCOMPARE(m_item3->type(), Sigmod::CoinListItem::Species);
+    QCOMPARE(m_item3->object(), 0);
+    QCOMPARE(m_item3->cost(), 15);
 }
 
 QTEST_APPLESS_MAIN(TestCoinListItem)