X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshoppinglist%2Fmain.cpp;h=4f410f1f3649966e630f31613113a6dc6985644d;hb=f2092c352667a3178bfea9c2bc90882e4b7fb3aa;hp=f82a97e0a84fe8e06ce66e3b5ce42cc3f442bf6b;hpb=3fa2b4016a4573be61f48c1dd4162c1dbc3372ba;p=r2c2.git

diff --git a/source/shoppinglist/main.cpp b/source/shoppinglist/main.cpp
index f82a97e..4f410f1 100644
--- a/source/shoppinglist/main.cpp
+++ b/source/shoppinglist/main.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <map>
 #include <msp/core/application.h>
 #include <msp/core/getopt.h>
@@ -17,7 +10,7 @@ using namespace std;
 using namespace Msp;
 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";
@@ -140,7 +129,10 @@ ShoppingList::LayoutLoader::LayoutLoader(ShoppingList &s):
 {
 	add("track", &LayoutLoader::track);
 	add("base");
+	add("beamgate");
 	add("route");
+	add("signal");
+	add("terrain");
 	add("zone");
 }