X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshoppinglist%2Fmain.cpp;h=4ebd956d824e7a73976fb3000e7c63094d44c7cb;hb=9b92c1f33c142ea8e47e2239742f2f603a7e3861;hp=2b8f5bf00abd7249768b37f5526f2b1cbd87ec79;hpb=cadb9f79feb379acd6712fba97af4f6696a413c5;p=r2c2.git

diff --git a/source/shoppinglist/main.cpp b/source/shoppinglist/main.cpp
index 2b8f5bf..4ebd956 100644
--- a/source/shoppinglist/main.cpp
+++ b/source/shoppinglist/main.cpp
@@ -1,23 +1,16 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <map>
 #include <msp/core/application.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/loader.h>
 #include <msp/datafile/parser.h>
 #include <msp/io/print.h>
-#include "libmarklin/articlenumber.h"
+#include "libr2c2/articlenumber.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
-class ShoppingList: public Application
+class ShoppingList: public RegisteredApplication<ShoppingList>
 {
 private:
 	class InventoryLoader: public DataFile::Loader
@@ -43,8 +36,6 @@ private:
 	map<ArticleNumber, unsigned> inventory;
 	map<ArticleNumber, unsigned> layout;
 
-	static Application::RegApp<ShoppingList> reg;
-
 public:
 	ShoppingList(int, char **);
 	int main();
@@ -54,8 +45,6 @@ private:
 };
 
 
-Application::RegApp<ShoppingList> ShoppingList::reg;
-
 ShoppingList::ShoppingList(int argc, char **argv)
 {
 	string inv_fn = "inventory";
@@ -76,10 +65,10 @@ int ShoppingList::main()
 		if(j!=inventory.end())
 		{
 			if(j->second<i->second)
-				IO::print("track %d %d;\n", i->first, i->second-j->second);
+				IO::print("track \\%d %d;\n", i->first, i->second-j->second);
 		}
 		else
-			IO::print("track %d %d;\n", i->first, i->second);
+			IO::print("track \\%d %d;\n", i->first, i->second);
 	}
 
 	IO::print("// Pre-existing:\n");
@@ -87,7 +76,7 @@ int ShoppingList::main()
 	{
 		map<ArticleNumber, unsigned>::iterator j=inventory.find(i->first);
 		if(j!=inventory.end())
-			IO::print("track %d %d;\n", i->first, min(i->second, j->second));
+			IO::print("track \\%d %d;\n", i->first, min(i->second, j->second));
 	}
 
 	IO::print("// Unused:\n");
@@ -97,10 +86,10 @@ int ShoppingList::main()
 		if(j!=layout.end())
 		{
 			if(j->second<i->second)
-				IO::print("track %d %d;\n", i->first, i->second-j->second);
+				IO::print("track \\%d %d;\n", i->first, i->second-j->second);
 		}
 		else
-			IO::print("track %d %d;\n", i->first, i->second);
+			IO::print("track \\%d %d;\n", i->first, i->second);
 	}
 
 	return 0;
@@ -140,7 +129,11 @@ ShoppingList::LayoutLoader::LayoutLoader(ShoppingList &s):
 {
 	add("track", &LayoutLoader::track);
 	add("base");
+	add("beamgate");
 	add("route");
+	add("signal");
+	add("terrain");
+	add("zone");
 }
 
 void ShoppingList::LayoutLoader::track(ArticleNumber art_nr)