X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshoppinglist%2Fmain.cpp;h=7a4f3bab822f9496b3c8736022b1f08a8f29c718;hb=bc955b09faf8365a72d07bb5ee1253c9b958c897;hp=5f88780a7c02e937ca4fcfe4bc7cc36fcfa84f54;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/shoppinglist/main.cpp b/source/shoppinglist/main.cpp
index 5f88780..7a4f3ba 100644
--- a/source/shoppinglist/main.cpp
+++ b/source/shoppinglist/main.cpp
@@ -33,10 +33,8 @@ private:
 		void track(unsigned);
 	};
 
-	typedef map<unsigned, unsigned> TrackMap;
-
-	TrackMap inventory;
-	TrackMap layout;
+	map<unsigned, unsigned> inventory;
+	map<unsigned, unsigned> layout;
 
 	void load_inventory(const string &);
 	void load_layout(const string &);
@@ -79,9 +77,9 @@ void ShoppingList::load_layout(const string &fn)
 void ShoppingList::print(ostream &out)
 {
 	out<<"// Need to get:\n";
-	for(TrackMap::iterator i=layout.begin(); i!=layout.end(); ++i)
+	for(map<unsigned, unsigned>::iterator i=layout.begin(); i!=layout.end(); ++i)
 	{
-		TrackMap::iterator j=inventory.find(i->first);
+		map<unsigned, unsigned>::iterator j=inventory.find(i->first);
 		if(j!=inventory.end())
 		{
 			if(j->second<i->second)
@@ -92,17 +90,17 @@ void ShoppingList::print(ostream &out)
 	}
 
 	out<<"// Pre-existing:\n";
-	for(TrackMap::iterator i=layout.begin(); i!=layout.end(); ++i)
+	for(map<unsigned, unsigned>::iterator i=layout.begin(); i!=layout.end(); ++i)
 	{
-		TrackMap::iterator j=inventory.find(i->first);
+		map<unsigned, unsigned>::iterator j=inventory.find(i->first);
 		if(j!=inventory.end())
 			out<<"track "<<i->first<<' '<<min(i->second,j->second)<<";\n";
 	}
 
 	out<<"// Unused:\n";
-	for(TrackMap::iterator i=inventory.begin(); i!=inventory.end(); ++i)
+	for(map<unsigned, unsigned>::iterator i=inventory.begin(); i!=inventory.end(); ++i)
 	{
-		TrackMap::iterator j=layout.find(i->first);
+		map<unsigned, unsigned>::iterator j=layout.find(i->first);
 		if(j!=layout.end())
 		{
 			if(j->second<i->second)