From 1ff06c5bc46a677fa389ef86c6b26664368f1653 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 16 Nov 2010 17:53:13 +0000 Subject: [PATCH] =?utf8?q?Rename=20the=20project=20to=20R=C2=B2C=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Build | 26 ++++++------ firmware/ctrl.c | 2 +- firmware/delay.h | 2 +- firmware/eeprom.c | 2 +- firmware/eeprom.h | 2 +- firmware/lcd.c | 2 +- firmware/lcd.h | 2 +- firmware/s88w-r.c | 2 +- firmware/s88w-t.c | 2 +- firmware/serial.c | 2 +- firmware/serial.h | 2 +- firmware/timer.c | 2 +- firmware/timer.h | 2 +- marklin.res => r2c2.res | 0 source/3d/catalogue.cpp | 6 +-- source/3d/catalogue.h | 10 ++--- source/3d/endpoint.cpp | 6 +-- source/3d/endpoint.h | 12 +++--- source/3d/layout.cpp | 6 +-- source/3d/layout.h | 12 +++--- source/3d/object.h | 12 +++--- source/3d/overlay.cpp | 6 +-- source/3d/overlay.h | 10 ++--- source/3d/path.cpp | 8 ++-- source/3d/path.h | 10 ++--- source/3d/track.cpp | 8 ++-- source/3d/track.h | 14 +++---- source/3d/tracktype.cpp | 10 ++--- source/3d/tracktype.h | 14 +++---- source/3d/vehicle.cpp | 6 +-- source/3d/vehicle.h | 12 +++--- source/3d/vehicletype.cpp | 6 +-- source/3d/vehicletype.h | 12 +++--- source/designer/cameracontroller.cpp | 4 +- source/designer/cameracontroller.h | 2 +- source/designer/designer.cpp | 10 ++--- source/designer/designer.h | 42 +++++++++---------- source/designer/input.cpp | 2 +- source/designer/input.h | 2 +- source/designer/manipulator.cpp | 8 ++-- source/designer/manipulator.h | 24 +++++------ source/designer/measure.cpp | 4 +- source/designer/measure.h | 8 ++-- source/designer/selection.cpp | 6 +-- source/designer/selection.h | 14 +++---- source/designer/svgexporter.cpp | 10 ++--- source/designer/svgexporter.h | 10 ++--- source/designer/toolbar.cpp | 6 +-- source/designer/toolbar.h | 6 +-- source/designer/trackwrap.cpp | 4 +- source/designer/trackwrap.h | 10 ++--- source/engineer/dialog.cpp | 2 +- source/engineer/dialog.h | 2 +- source/engineer/engineer.cpp | 10 ++--- source/engineer/engineer.h | 40 +++++++++--------- source/engineer/mainpanel.cpp | 8 ++-- source/engineer/mainpanel.h | 2 +- source/engineer/options.cpp | 2 +- source/engineer/options.h | 2 +- source/engineer/routeselect.cpp | 6 +-- source/engineer/routeselect.h | 8 ++-- source/engineer/timetabledialog.cpp | 4 +- source/engineer/timetabledialog.h | 8 ++-- source/engineer/trainpanel.cpp | 10 ++--- source/engineer/trainpanel.h | 16 +++---- source/engineer/trainproperties.cpp | 10 ++--- source/engineer/trainproperties.h | 12 +++--- source/engineer/trainview.cpp | 8 ++-- source/engineer/trainview.h | 8 ++-- source/{libmarklin => libr2c2}/aicontrol.cpp | 6 +-- source/{libmarklin => libr2c2}/aicontrol.h | 10 ++--- .../{libmarklin => libr2c2}/articlenumber.cpp | 6 +-- .../{libmarklin => libr2c2}/articlenumber.h | 10 ++--- source/{libmarklin => libr2c2}/block.cpp | 6 +-- source/{libmarklin => libr2c2}/block.h | 10 ++--- source/{libmarklin => libr2c2}/blockiter.cpp | 6 +-- source/{libmarklin => libr2c2}/blockiter.h | 10 ++--- source/{libmarklin => libr2c2}/catalogue.cpp | 6 +-- source/{libmarklin => libr2c2}/catalogue.h | 10 ++--- source/{libmarklin => libr2c2}/controller.cpp | 6 +-- source/{libmarklin => libr2c2}/controller.h | 10 ++--- source/{libmarklin => libr2c2}/driver.cpp | 6 +-- source/{libmarklin => libr2c2}/driver.h | 10 ++--- source/{libmarklin => libr2c2}/dummy.cpp | 6 +-- source/{libmarklin => libr2c2}/dummy.h | 10 ++--- source/{libmarklin => libr2c2}/geometry.h | 10 ++--- source/{libmarklin => libr2c2}/intellibox.cpp | 6 +-- source/{libmarklin => libr2c2}/intellibox.h | 10 ++--- source/{libmarklin => libr2c2}/layout.cpp | 6 +-- source/{libmarklin => libr2c2}/layout.h | 10 ++--- source/{libmarklin => libr2c2}/profile.cpp | 6 +-- source/{libmarklin => libr2c2}/profile.h | 10 ++--- source/{libmarklin => libr2c2}/route.cpp | 8 ++-- source/{libmarklin => libr2c2}/route.h | 10 ++--- .../simplecontroller.cpp | 6 +-- .../simplecontroller.h | 10 ++--- source/{libmarklin => libr2c2}/timetable.cpp | 6 +-- source/{libmarklin => libr2c2}/timetable.h | 10 ++--- source/{libmarklin => libr2c2}/track.cpp | 6 +-- source/{libmarklin => libr2c2}/track.h | 10 ++--- source/{libmarklin => libr2c2}/trackiter.cpp | 6 +-- source/{libmarklin => libr2c2}/trackiter.h | 10 ++--- source/{libmarklin => libr2c2}/trackpart.cpp | 6 +-- source/{libmarklin => libr2c2}/trackpart.h | 10 ++--- source/{libmarklin => libr2c2}/tracktype.cpp | 6 +-- source/{libmarklin => libr2c2}/tracktype.h | 10 ++--- source/{libmarklin => libr2c2}/train.cpp | 6 +-- source/{libmarklin => libr2c2}/train.h | 10 ++--- source/{libmarklin => libr2c2}/vehicle.cpp | 6 +-- source/{libmarklin => libr2c2}/vehicle.h | 10 ++--- .../{libmarklin => libr2c2}/vehicletype.cpp | 6 +-- source/{libmarklin => libr2c2}/vehicletype.h | 10 ++--- source/network/client.cpp | 6 +-- source/network/client.h | 12 +++--- source/network/packets.h | 10 ++--- source/network/protocol.cpp | 6 +-- source/network/protocol.h | 10 ++--- source/network/server.cpp | 12 +++--- source/network/server.h | 12 +++--- source/network/train.cpp | 6 +-- source/network/train.h | 12 +++--- source/remote/remote.cpp | 4 +- source/remote/remote.h | 10 ++--- source/remote/trainpanel.cpp | 4 +- source/remote/trainpanel.h | 8 ++-- source/serial/serial.cpp | 4 +- source/serial/serial.h | 12 +++--- source/shoppinglist/main.cpp | 6 +-- 128 files changed, 521 insertions(+), 521 deletions(-) rename marklin.res => r2c2.res (100%) rename source/{libmarklin => libr2c2}/aicontrol.cpp (96%) rename source/{libmarklin => libr2c2}/aicontrol.h (83%) rename source/{libmarklin => libr2c2}/articlenumber.cpp (95%) rename source/{libmarklin => libr2c2}/articlenumber.h (79%) rename source/{libmarklin => libr2c2}/block.cpp (98%) rename source/{libmarklin => libr2c2}/block.h (90%) rename source/{libmarklin => libr2c2}/blockiter.cpp (96%) rename source/{libmarklin => libr2c2}/blockiter.h (85%) rename source/{libmarklin => libr2c2}/catalogue.cpp (97%) rename source/{libmarklin => libr2c2}/catalogue.h (92%) rename source/{libmarklin => libr2c2}/controller.cpp (93%) rename source/{libmarklin => libr2c2}/controller.h (90%) rename source/{libmarklin => libr2c2}/driver.cpp (86%) rename source/{libmarklin => libr2c2}/driver.h (90%) rename source/{libmarklin => libr2c2}/dummy.cpp (94%) rename source/{libmarklin => libr2c2}/dummy.h (89%) rename source/{libmarklin => libr2c2}/geometry.h (78%) rename source/{libmarklin => libr2c2}/intellibox.cpp (99%) rename source/{libmarklin => libr2c2}/intellibox.h (96%) rename source/{libmarklin => libr2c2}/layout.cpp (98%) rename source/{libmarklin => libr2c2}/layout.h (94%) rename source/{libmarklin => libr2c2}/profile.cpp (92%) rename source/{libmarklin => libr2c2}/profile.h (85%) rename source/{libmarklin => libr2c2}/route.cpp (98%) rename source/{libmarklin => libr2c2}/route.h (92%) rename source/{libmarklin => libr2c2}/simplecontroller.cpp (94%) rename source/{libmarklin => libr2c2}/simplecontroller.h (79%) rename source/{libmarklin => libr2c2}/timetable.cpp (98%) rename source/{libmarklin => libr2c2}/timetable.h (92%) rename source/{libmarklin => libr2c2}/track.cpp (98%) rename source/{libmarklin => libr2c2}/track.h (93%) rename source/{libmarklin => libr2c2}/trackiter.cpp (97%) rename source/{libmarklin => libr2c2}/trackiter.h (91%) rename source/{libmarklin => libr2c2}/trackpart.cpp (96%) rename source/{libmarklin => libr2c2}/trackpart.h (84%) rename source/{libmarklin => libr2c2}/tracktype.cpp (97%) rename source/{libmarklin => libr2c2}/tracktype.h (91%) rename source/{libmarklin => libr2c2}/train.cpp (99%) rename source/{libmarklin => libr2c2}/train.h (97%) rename source/{libmarklin => libr2c2}/vehicle.cpp (98%) rename source/{libmarklin => libr2c2}/vehicle.h (92%) rename source/{libmarklin => libr2c2}/vehicletype.cpp (97%) rename source/{libmarklin => libr2c2}/vehicletype.h (92%) diff --git a/Build b/Build index 6c6687d..fbced14 100644 --- a/Build +++ b/Build @@ -1,4 +1,4 @@ -package "märklin" +package "r2c2" { require "mspcore"; require "sigc++-2.0"; @@ -9,38 +9,38 @@ package "märklin" build_info { incpath "source"; - library "marklin"; + library "r2c2"; }; require "mspdatafile"; }; - library "marklin" + library "r2c2" { - source "source/libmarklin"; + source "source/libr2c2"; require "mspdatafile"; install true; }; - library "marklin3d" + library "r2c2_3d" { source "source/3d"; require "mspgl"; build_info { incpath "source"; - library "marklin"; + library "r2c2"; }; install true; }; - library "marklinnet" + library "r2c2_net" { source "source/network"; require "mspnet"; build_info { incpath "source"; - library "marklin"; + library "r2c2"; }; install true; }; @@ -55,7 +55,7 @@ package "märklin" build_info { incpath "source"; - library "marklin3d"; + library "r2c2_3d"; }; }; @@ -68,8 +68,8 @@ package "märklin" build_info { incpath "source"; - library "marklin3d"; - library "marklinnet"; + library "r2c2_3d"; + library "r2c2_net"; }; }; @@ -80,7 +80,7 @@ package "märklin" build_info { incpath "source"; - library "marklinnet"; + library "r2c2_net"; }; }; @@ -90,7 +90,7 @@ package "märklin" build_info { incpath "source"; - library "marklinnet"; + library "r2c2_net"; }; }; }; diff --git a/firmware/ctrl.c b/firmware/ctrl.c index 523c702..4e7cb65 100644 --- a/firmware/ctrl.c +++ b/firmware/ctrl.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/delay.h b/firmware/delay.h index 1798cec..e4d9985 100644 --- a/firmware/delay.h +++ b/firmware/delay.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/eeprom.c b/firmware/eeprom.c index b9010f0..248556e 100644 --- a/firmware/eeprom.c +++ b/firmware/eeprom.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/eeprom.h b/firmware/eeprom.h index 97527d6..cd31bab 100644 --- a/firmware/eeprom.h +++ b/firmware/eeprom.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/lcd.c b/firmware/lcd.c index 6ba00d5..397ec10 100644 --- a/firmware/lcd.c +++ b/firmware/lcd.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL diff --git a/firmware/lcd.h b/firmware/lcd.h index 2d414dc..822793d 100644 --- a/firmware/lcd.h +++ b/firmware/lcd.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/s88w-r.c b/firmware/s88w-r.c index d2a2109..b537584 100644 --- a/firmware/s88w-r.c +++ b/firmware/s88w-r.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL diff --git a/firmware/s88w-t.c b/firmware/s88w-t.c index b39fd79..b7d0a94 100644 --- a/firmware/s88w-t.c +++ b/firmware/s88w-t.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL diff --git a/firmware/serial.c b/firmware/serial.c index be3b13a..b0f1b1f 100644 --- a/firmware/serial.c +++ b/firmware/serial.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/serial.h b/firmware/serial.h index 696c20e..e5bfebe 100644 --- a/firmware/serial.h +++ b/firmware/serial.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/timer.c b/firmware/timer.c index 13db1e8..b218ed6 100644 --- a/firmware/timer.c +++ b/firmware/timer.c @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/firmware/timer.h b/firmware/timer.h index 2fbda8e..d7252be 100644 --- a/firmware/timer.h +++ b/firmware/timer.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/marklin.res b/r2c2.res similarity index 100% rename from marklin.res rename to r2c2.res diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp index 2f4fc04..8641013 100644 --- a/source/3d/catalogue.cpp +++ b/source/3d/catalogue.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -13,7 +13,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Catalogue3D::Catalogue3D(Catalogue &c): catalogue(c), @@ -93,4 +93,4 @@ void Catalogue3D::build_endpoint_mesh() bld.end(); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/catalogue.h b/source/3d/catalogue.h index 1f33ebb..bda1314 100644 --- a/source/3d/catalogue.h +++ b/source/3d/catalogue.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_CATALOGUE_H_ -#define MARKLIN3D_CATALOGUE_H_ +#ifndef R2C2_3D_CATALOGUE_H_ +#define R2C2_3D_CATALOGUE_H_ #include #include -#include "libmarklin/catalogue.h" +#include "libr2c2/catalogue.h" -namespace Marklin { +namespace R2C2 { class TrackType3D; class VehicleType3D; diff --git a/source/3d/endpoint.cpp b/source/3d/endpoint.cpp index 77a8af8..7e33ced 100644 --- a/source/3d/endpoint.cpp +++ b/source/3d/endpoint.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,7 +14,7 @@ Distributed under the GPL using namespace Msp; -namespace Marklin { +namespace R2C2 { Endpoint3D::Endpoint3D(const Track3D &t, unsigned i): track(t), @@ -50,4 +50,4 @@ void Endpoint3D::render(const GL::Tag &tag) const } } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/endpoint.h b/source/3d/endpoint.h index 0abc526..e407127 100644 --- a/source/3d/endpoint.h +++ b/source/3d/endpoint.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_ENDPOINT_H_ -#define MARKLIN3D_ENDPOINT_H_ +#ifndef R2C2_3D_ENDPOINT_H_ +#define R2C2_3D_ENDPOINT_H_ #include #include -#include "libmarklin/track.h" +#include "libr2c2/track.h" -namespace Marklin { +namespace R2C2 { class Track3D; @@ -30,6 +30,6 @@ public: virtual void render(const Msp::GL::Tag &) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp index 05aaa42..5f01576 100644 --- a/source/3d/layout.cpp +++ b/source/3d/layout.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -20,7 +20,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Layout3D::Layout3D(Layout &l): layout(l), @@ -148,4 +148,4 @@ void Layout3D::vehicle_removed(Vehicle &v) delete i->second; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/layout.h b/source/3d/layout.h index 54269bc..e7f3c33 100644 --- a/source/3d/layout.h +++ b/source/3d/layout.h @@ -1,19 +1,19 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_LAYOUT_H_ -#define MARKLIN3D_LAYOUT_H_ +#ifndef R2C2_3D_LAYOUT_H_ +#define R2C2_3D_LAYOUT_H_ #include #include -#include "libmarklin/layout.h" +#include "libr2c2/layout.h" #include "catalogue.h" -namespace Marklin { +namespace R2C2 { class Track3D; class Vehicle3D; @@ -60,7 +60,7 @@ private: void vehicle_removed(Vehicle &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/object.h b/source/3d/object.h index d2cb911..a9ac715 100644 --- a/source/3d/object.h +++ b/source/3d/object.h @@ -1,16 +1,16 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_OBJECT_H_ -#define MARKLIN3D_OBJECT_H_ +#ifndef R2C2_3D_OBJECT_H_ +#define R2C2_3D_OBJECT_H_ -#include "libmarklin/geometry.h" +#include "libr2c2/geometry.h" -namespace Marklin { +namespace R2C2 { class Object3D { @@ -23,6 +23,6 @@ public: virtual bool is_visible() const = 0; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/overlay.cpp b/source/3d/overlay.cpp index 39428a1..ee9fea7 100644 --- a/source/3d/overlay.cpp +++ b/source/3d/overlay.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -18,7 +18,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Overlay3D::Overlay3D(const Graphics::Window &w, const GL::Camera &c, const GL::Font &f): window(w), @@ -195,4 +195,4 @@ Overlay3D::Icon::Icon(): background((GL::COLOR4_UBYTE, GL::VERTEX2)) { } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/overlay.h b/source/3d/overlay.h index eac51be..8e818bf 100644 --- a/source/3d/overlay.h +++ b/source/3d/overlay.h @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_OVERLAY_H_ -#define MARKLIN3D_OVERLAY_H_ +#ifndef R2C2_3D_OVERLAY_H_ +#define R2C2_3D_OVERLAY_H_ #include #include @@ -14,7 +14,7 @@ Distributed under the GPL #include #include -namespace Marklin { +namespace R2C2 { class Object3D; @@ -55,6 +55,6 @@ private: void update_icon(Icon &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/path.cpp b/source/3d/path.cpp index b3b2fa1..e4e0b92 100644 --- a/source/3d/path.cpp +++ b/source/3d/path.cpp @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include -#include "libmarklin/tracktype.h" +#include "libr2c2/tracktype.h" #include "layout.h" #include "path.h" #include "track.h" @@ -14,7 +14,7 @@ Distributed under the GPL using namespace Msp; -namespace Marklin { +namespace R2C2 { Path3D::Path3D(const Track3D &t): track(t), @@ -81,4 +81,4 @@ void Path3D::render(const GL::Tag &tag) const } } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/path.h b/source/3d/path.h index dd071f7..cd6ad90 100644 --- a/source/3d/path.h +++ b/source/3d/path.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_PATH_H_ -#define MARKLIN3D_PATH_H_ +#ifndef R2C2_3D_PATH_H_ +#define R2C2_3D_PATH_H_ #include #include #include -namespace Marklin { +namespace R2C2 { class Track3D; @@ -38,6 +38,6 @@ public: virtual void render(const Msp::GL::Tag &) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/track.cpp b/source/3d/track.cpp index 5340318..401dd2d 100644 --- a/source/3d/track.cpp +++ b/source/3d/track.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -8,7 +8,7 @@ Distributed under the GPL #include #include #include -#include "libmarklin/tracktype.h" +#include "libr2c2/tracktype.h" #include "endpoint.h" #include "layout.h" #include "path.h" @@ -18,7 +18,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Track3D::Track3D(Layout3D &l, Track &t): layout(l), @@ -104,4 +104,4 @@ void Track3D::render(const GL::Tag &tag) const glPopName(); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/track.h b/source/3d/track.h index e55dc21..7b8c235 100644 --- a/source/3d/track.h +++ b/source/3d/track.h @@ -1,22 +1,22 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_TRACK_H_ -#define MARKLIN3D_TRACK_H_ +#ifndef R2C2_3D_TRACK_H_ +#define R2C2_3D_TRACK_H_ #include #include #include #include -#include "libmarklin/track.h" -#include "libmarklin/trackpart.h" +#include "libr2c2/track.h" +#include "libr2c2/trackpart.h" #include "object.h" -namespace Marklin { +namespace R2C2 { class Endpoint3D; class Layout3D; @@ -49,6 +49,6 @@ public: virtual void render(const Msp::GL::Tag &) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/tracktype.cpp b/source/3d/tracktype.cpp index 6dab43c..1e20c5d 100644 --- a/source/3d/tracktype.cpp +++ b/source/3d/tracktype.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -16,7 +16,7 @@ using namespace Msp; namespace { -bool compare_z(const Marklin::Point &p1, const Marklin::Point &p2) +bool compare_z(const R2C2::Point &p1, const R2C2::Point &p2) { return p1.zxx==lowest.x && i->y>lowest.y)) lowest = *i; @@ -69,7 +69,7 @@ Iter graham_scan(Iter begin, Iter end) } -namespace Marklin { +namespace R2C2 { TrackType3D::TrackType3D(const Catalogue3D &cat3d, const TrackType &tt): catalogue(cat3d), @@ -230,4 +230,4 @@ void TrackType3D::build_part(const TrackPart &part, const Profile &profile, cons base_index += (nsegs+1)*(n_points-1)*2; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/tracktype.h b/source/3d/tracktype.h index 56a4b46..7bf1b2d 100644 --- a/source/3d/tracktype.h +++ b/source/3d/tracktype.h @@ -1,20 +1,20 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN3D_TRACKTYPE_H_ -#define MARKLIN3D_TRACKTYPE_H_ +#ifndef R2C2_3D_TRACKTYPE_H_ +#define R2C2_3D_TRACKTYPE_H_ #include #include #include -#include "libmarklin/profile.h" -#include "libmarklin/tracktype.h" +#include "libr2c2/profile.h" +#include "libr2c2/tracktype.h" -namespace Marklin { +namespace R2C2 { class Catalogue3D; @@ -42,6 +42,6 @@ private: void build_part(const TrackPart &, const Profile &, const Point &, Msp::GL::MeshBuilder &, unsigned &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp index 7e4814b..f14f3c2 100644 --- a/source/3d/vehicle.cpp +++ b/source/3d/vehicle.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,7 +14,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v): layout(l), @@ -91,4 +91,4 @@ void Vehicle3D::render(const GL::Tag &tag) const } } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/vehicle.h b/source/3d/vehicle.h index 075eaef..06e78ef 100644 --- a/source/3d/vehicle.h +++ b/source/3d/vehicle.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN3D_VEHICLE_H_ -#define LIBMARKLIN3D_VEHICLE_H_ +#ifndef LIBR2C23D_VEHICLE_H_ +#define LIBR2C23D_VEHICLE_H_ #include -#include "libmarklin/vehicle.h" +#include "libr2c2/vehicle.h" #include "object.h" -namespace Marklin { +namespace R2C2 { class Layout3D; class VehicleType3D; @@ -36,6 +36,6 @@ public: virtual void render(const Msp::GL::Tag &) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp index b283edd..fc4f2d4 100644 --- a/source/3d/vehicletype.cpp +++ b/source/3d/vehicletype.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -29,7 +29,7 @@ T get(const map ¶ms, const string &key, T def = T()) } -namespace Marklin { +namespace R2C2 { VehicleType3D::VehicleType3D(const Catalogue3D &c, const VehicleType &t): catalogue(c), @@ -342,4 +342,4 @@ GL::Mesh *VehicleType3D::create_flat_wagon(const map ¶ms) return mesh; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h index f38f02d..72c2c23 100644 --- a/source/3d/vehicletype.h +++ b/source/3d/vehicletype.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN3D_VEHICLETYPE_H_ -#define LIBMARKLIN3D_VEHICLETYPE_H_ +#ifndef LIBR2C23D_VEHICLETYPE_H_ +#define LIBR2C23D_VEHICLETYPE_H_ #include #include -#include "libmarklin/vehicletype.h" +#include "libr2c2/vehicletype.h" -namespace Marklin { +namespace R2C2 { class Catalogue3D; @@ -42,6 +42,6 @@ private: Msp::GL::Mesh *create_flat_wagon(const std::map &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/designer/cameracontroller.cpp b/source/designer/cameracontroller.cpp index edebff7..6b98f3d 100644 --- a/source/designer/cameracontroller.cpp +++ b/source/designer/cameracontroller.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; CameraController::CameraController(Designer &d, Graphics::EventSource &es, GL::Camera &c): designer(d), diff --git a/source/designer/cameracontroller.h b/source/designer/cameracontroller.h index beed68a..b18e251 100644 --- a/source/designer/cameracontroller.h +++ b/source/designer/cameracontroller.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 23185cf..8ab0465 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -26,8 +26,8 @@ Distributed under the GPL #include #include #include -#include "libmarklin/route.h" -#include "libmarklin/tracktype.h" +#include "libr2c2/route.h" +#include "libr2c2/tracktype.h" #include "3d/path.h" #include "designer.h" #include "input.h" @@ -38,14 +38,14 @@ Distributed under the GPL #include "toolbar.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Application::RegApp Designer::reg; Designer::Designer(int argc, char **argv): window(1280, 960), - ui_res("marklin.res"), + ui_res("r2c2.res"), root(ui_res, window), base_object(0), cur_route(0), diff --git a/source/designer/designer.h b/source/designer/designer.h index c173668..9fc2961 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -21,8 +21,8 @@ Distributed under the GPL #include #include #include -#include "libmarklin/catalogue.h" -#include "libmarklin/layout.h" +#include "libr2c2/catalogue.h" +#include "libr2c2/layout.h" #include "3d/layout.h" #include "3d/overlay.h" #include "3d/track.h" @@ -53,15 +53,15 @@ private: Toolbar *toolbar; Msp::GLtk::Label *lbl_status; - Marklin::Catalogue catalogue; - Marklin::Layout3D *cat_layout_3d; + R2C2::Catalogue catalogue; + R2C2::Layout3D *cat_layout_3d; std::string filename; - Marklin::Layout *layout; - Marklin::Layout3D *layout_3d; - Marklin::Overlay3D *overlay; + R2C2::Layout *layout; + R2C2::Layout3D *layout_3d; + R2C2::Overlay3D *overlay; Msp::GL::Object *base_object; - Marklin::Route *cur_route; - std::list new_tracks; + R2C2::Route *cur_route; + std::list new_tracks; Msp::GL::Pipeline *pipeline; Msp::GL::Camera camera; Msp::GL::Lighting lighting; @@ -86,9 +86,9 @@ public: void save(); void quit(); - const Marklin::Catalogue &get_catalogue() const { return catalogue; } - Marklin::Layout &get_layout() { return *layout; } - Marklin::Layout3D &get_layout_3d() { return *layout_3d; } + const R2C2::Catalogue &get_catalogue() const { return catalogue; } + R2C2::Layout &get_layout() { return *layout; } + R2C2::Layout3D &get_layout_3d() { return *layout_3d; } const CameraController &get_camera_controller() const { return camera_ctl; } const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; } Msp::GLtk::Root &get_root() { return root; } @@ -99,11 +99,11 @@ public: void rename_route(); void svg_export(); - void edit_route(Marklin::Route *); - Marklin::Route *get_current_route() const { return cur_route; } + void edit_route(R2C2::Route *); + R2C2::Route *get_current_route() const { return cur_route; } void add_selection_to_route(); - Marklin::Point map_pointer_to_ground(int, int); + R2C2::Point map_pointer_to_ground(int, int); private: void tick(); void key_press(unsigned, unsigned, wchar_t); @@ -111,10 +111,10 @@ private: void pointer_motion(int, int); void apply_camera(); void render(); - void track_added(Marklin::Track &); - void track_removed(Marklin::Track &); - Marklin::Track3D *pick_track(int, int); - void update_track_icon(Marklin::Track3D &); + void track_added(R2C2::Track &); + void track_removed(R2C2::Track &); + R2C2::Track3D *pick_track(int, int); + void update_track_icon(R2C2::Track3D &); void selection_changed(); void manipulation_status(const std::string &); void manipulation_done(bool); @@ -125,7 +125,7 @@ private: void route_name_accept(const std::string &); void svg_export_accept(const std::string &); std::string tooltip(int, int); - void show_route(const Marklin::Route *); + void show_route(const R2C2::Route *); }; #endif diff --git a/source/designer/input.cpp b/source/designer/input.cpp index 26bf9f2..9476bad 100644 --- a/source/designer/input.cpp +++ b/source/designer/input.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008, 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/designer/input.h b/source/designer/input.h index e3fc7c3..a9ecfe1 100644 --- a/source/designer/input.h +++ b/source/designer/input.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008, 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp index 3008021..23ea138 100644 --- a/source/designer/manipulator.cpp +++ b/source/designer/manipulator.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -8,13 +8,13 @@ Distributed under the GPL #include #include #include -#include "libmarklin/tracktype.h" +#include "libr2c2/tracktype.h" #include "designer.h" #include "manipulator.h" #include "selection.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Manipulator::Manipulator(Designer &d, Graphics::EventSource &es, Selection &s): @@ -562,7 +562,7 @@ void Manipulator::set_slope(TrackOrder &track, float z, float dz) } } -vector Manipulator::create_straight(const Marklin::Point &start, float dir, float length, float limit) +vector Manipulator::create_straight(const R2C2::Point &start, float dir, float length, float limit) { const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks(); std::map types_by_length; diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h index 55d2425..66b5d1a 100644 --- a/source/designer/manipulator.h +++ b/source/designer/manipulator.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -27,19 +27,19 @@ private: struct MTrack { - Marklin::Track *track; - Marklin::Point pos; + R2C2::Track *track; + R2C2::Point pos; float rot; - MTrack(Marklin::Track *); + MTrack(R2C2::Track *); }; struct TrackOrder { - Marklin::Track *track; + R2C2::Track *track; bool rev; - TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { } + TrackOrder(R2C2::Track *t, bool r): track(t), rev(r) { } }; public: @@ -51,17 +51,17 @@ private: Msp::Graphics::EventSource &event_source; Selection &selection; std::vector tracks; - Marklin::Point center; + R2C2::Point center; - Marklin::Point gpointer; + R2C2::Point gpointer; int pointer_y; Mode mode; - Marklin::Point move_origin; + R2C2::Point move_origin; float angle; float rot_origin; int elev_origin; - std::set neighbors; - std::vector extend_tracks; + std::set neighbors; + std::vector extend_tracks; public: Manipulator(Designer &, Msp::Graphics::EventSource &, Selection &); @@ -82,7 +82,7 @@ private: void update_tracks(); void update_neighbors(); void set_slope(TrackOrder &, float, float); - std::vector create_straight(const Marklin::Point &, float, float, float); + std::vector create_straight(const R2C2::Point &, float, float, float); }; #endif diff --git a/source/designer/measure.cpp b/source/designer/measure.cpp index 201674c..56efc1b 100644 --- a/source/designer/measure.cpp +++ b/source/designer/measure.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL #include "measure.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Measure::Measure(Designer &d): diff --git a/source/designer/measure.h b/source/designer/measure.h index f68178d..6800ecc 100644 --- a/source/designer/measure.h +++ b/source/designer/measure.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -28,8 +28,8 @@ public: private: Designer &designer; - Marklin::Point pointer; - Marklin::Point spoint; + R2C2::Point pointer; + R2C2::Point spoint; float sdir; float par_dist; float perp_dist; @@ -46,7 +46,7 @@ public: void pointer_motion(int, int, float, float); void render(); private: - void snap_to_tracks(Marklin::Point &, float &); + void snap_to_tracks(R2C2::Point &, float &); }; #endif diff --git a/source/designer/selection.cpp b/source/designer/selection.cpp index c6b1e39..604890b 100644 --- a/source/designer/selection.cpp +++ b/source/designer/selection.cpp @@ -1,16 +1,16 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include -#include "libmarklin/block.h" +#include "libr2c2/block.h" #include "selection.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Track *Selection::get_track() const diff --git a/source/designer/selection.h b/source/designer/selection.h index 9d49c76..479f5af 100644 --- a/source/designer/selection.h +++ b/source/designer/selection.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -18,11 +18,11 @@ public: sigc::signal signal_changed; private: - std::set tracks; + std::set tracks; public: - const std::set &get_tracks() const { return tracks; } - Marklin::Track *get_track() const; + const std::set &get_tracks() const { return tracks; } + R2C2::Track *get_track() const; unsigned size() const { return tracks.size(); } void clear(); @@ -35,9 +35,9 @@ public: signal_changed.emit(); } - void add_track(Marklin::Track *); - void remove_track(Marklin::Track *); - void toggle_track(Marklin::Track *); + void add_track(R2C2::Track *); + void remove_track(R2C2::Track *); + void toggle_track(R2C2::Track *); void select_more(); void select_linked(); diff --git a/source/designer/svgexporter.cpp b/source/designer/svgexporter.cpp index 56945f7..a9e13f8 100644 --- a/source/designer/svgexporter.cpp +++ b/source/designer/svgexporter.cpp @@ -1,20 +1,20 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include #include -#include "libmarklin/catalogue.h" -#include "libmarklin/track.h" -#include "libmarklin/tracktype.h" +#include "libr2c2/catalogue.h" +#include "libr2c2/track.h" +#include "libr2c2/tracktype.h" #include "svgexporter.h" using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; SvgExporter::SvgExporter(const Layout &l): layout(l), diff --git a/source/designer/svgexporter.h b/source/designer/svgexporter.h index 6e93ca4..38d77a9 100644 --- a/source/designer/svgexporter.h +++ b/source/designer/svgexporter.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -9,21 +9,21 @@ Distributed under the GPL #define SVGEXPORTER_H_ #include -#include "libmarklin/layout.h" +#include "libr2c2/layout.h" class SvgExporter { private: - const Marklin::Layout &layout; + const R2C2::Layout &layout; float gauge; float rail_width; public: - SvgExporter(const Marklin::Layout &); + SvgExporter(const R2C2::Layout &); void save(const std::string &); private: - void save_track(const Marklin::Track &, xmlpp::Element &); + void save_track(const R2C2::Track &, xmlpp::Element &); }; #endif diff --git a/source/designer/toolbar.cpp b/source/designer/toolbar.cpp index 56a5d6d..c6d859b 100644 --- a/source/designer/toolbar.cpp +++ b/source/designer/toolbar.cpp @@ -1,19 +1,19 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include #include -#include "libmarklin/route.h" +#include "libr2c2/route.h" #include "designer.h" #include "toolbar.h" using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; Toolbar::Toolbar(Designer &d): designer(d) diff --git a/source/designer/toolbar.h b/source/designer/toolbar.h index 2a935d3..9029a9c 100644 --- a/source/designer/toolbar.h +++ b/source/designer/toolbar.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,7 +11,7 @@ Distributed under the GPL #include #include #include -#include "libmarklin/route.h" +#include "libr2c2/route.h" class Designer; @@ -26,7 +26,7 @@ public: private: void route_selected(unsigned, const std::string &); void delete_route_clicked(); - void route_added(Marklin::Route &); + void route_added(R2C2::Route &); void update_routes(); }; diff --git a/source/designer/trackwrap.cpp b/source/designer/trackwrap.cpp index b507075..65c33d5 100644 --- a/source/designer/trackwrap.cpp +++ b/source/designer/trackwrap.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,7 +14,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; TrackWrap::TrackWrap(Designer &d, Selection &s): designer(d), diff --git a/source/designer/trackwrap.h b/source/designer/trackwrap.h index 09bacda..2f21125 100644 --- a/source/designer/trackwrap.h +++ b/source/designer/trackwrap.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -10,7 +10,7 @@ Distributed under the GPL #include #include -#include "libmarklin/track.h" +#include "libr2c2/track.h" class Designer; class Selection; @@ -20,13 +20,13 @@ class TrackWrap: public Msp::GL::Renderable private: struct Wrap { - Marklin::Track *track; + R2C2::Track *track; Msp::GL::Mesh *mesh; }; Designer &designer; Selection &selection; - std::map meshes; + std::map meshes; std::list wraps; public: @@ -36,7 +36,7 @@ public: private: void selection_changed(); - Msp::GL::Mesh &get_mesh(const Marklin::TrackType &); + Msp::GL::Mesh &get_mesh(const R2C2::TrackType &); }; #endif diff --git a/source/engineer/dialog.cpp b/source/engineer/dialog.cpp index e71c1ce..2d2bae3 100644 --- a/source/engineer/dialog.cpp +++ b/source/engineer/dialog.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/engineer/dialog.h b/source/engineer/dialog.h index 5fb694f..0299287 100644 --- a/source/engineer/dialog.h +++ b/source/engineer/dialog.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 7e13f7b..1f3b7dc 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -25,8 +25,8 @@ Distributed under the GPL #include #include #include -#include "libmarklin/driver.h" -#include "libmarklin/tracktype.h" +#include "libr2c2/driver.h" +#include "libr2c2/tracktype.h" #include "3d/path.h" #include "3d/track.h" #include "3d/vehicle.h" @@ -37,7 +37,7 @@ Distributed under the GPL #include "trainview.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Application::RegApp Engineer::reg; @@ -61,7 +61,7 @@ Engineer::Engineer(int argc, char **argv): window.set_title("Railroad Engineer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); - DataFile::load(ui_res, "marklin.res"); + DataFile::load(ui_res, "r2c2.res"); root = new GLtk::Root(ui_res, window); root->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press)); root->signal_pointer_motion.connect(sigc::mem_fun(this, &Engineer::pointer_motion)); diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h index 61a2f59..4ca753e 100644 --- a/source/engineer/engineer.h +++ b/source/engineer/engineer.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -16,8 +16,8 @@ Distributed under the GPL #include #include #include -#include "libmarklin/catalogue.h" -#include "libmarklin/train.h" +#include "libr2c2/catalogue.h" +#include "libr2c2/train.h" #include "3d/layout.h" #include "3d/overlay.h" #include "3d/path.h" @@ -31,7 +31,7 @@ class TrainView; class Engineer: public Msp::Application { public: - sigc::signal signal_pick_done; + sigc::signal signal_pick_done; private: Options options; @@ -40,13 +40,13 @@ private: Msp::GLtk::Resources ui_res; Msp::GLtk::Root *root; - Marklin::Catalogue catalogue; - Marklin::Layout layout; - Marklin::Layout3D layout_3d; - Marklin::Server *server; + R2C2::Catalogue catalogue; + R2C2::Layout layout; + R2C2::Layout3D layout_3d; + R2C2::Server *server; Msp::IO::EventDispatcher event_disp; - Marklin::Overlay3D *overlay; - std::map train_colors; + R2C2::Overlay3D *overlay; + std::map train_colors; Msp::GL::Camera camera; Msp::GL::Lighting lighting; @@ -59,9 +59,9 @@ private: std::list train_views; Msp::Time::TimeStamp status_timeout; bool picking; - Marklin::Track *picking_track; + R2C2::Track *picking_track; int picking_entry; - Marklin::Path3D *picking_path; + R2C2::Path3D *picking_path; int pointer_x; int pointer_y; bool pointer_moved; @@ -72,9 +72,9 @@ public: const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; } Msp::GLtk::Root &get_root() const { return *root; } - const Marklin::Catalogue &get_catalogue() const { return catalogue; } - Marklin::Layout &get_layout() { return layout; } - Marklin::Layout3D &get_layout_3d() { return layout_3d; } + const R2C2::Catalogue &get_catalogue() const { return catalogue; } + R2C2::Layout &get_layout() { return layout; } + R2C2::Layout3D &get_layout_3d() { return layout_3d; } const Msp::GL::Lighting &get_lighting() const { return lighting; } void set_status(const std::string &); void rearrange_panels(); @@ -88,12 +88,12 @@ private: void button_press(int, int, unsigned, unsigned); void pointer_motion(int, int); void view_all(); - void set_block_color(const Marklin::Block &, const Msp::GL::Color &); - void reset_block_color(const Marklin::Block &); + void set_block_color(const R2C2::Block &, const Msp::GL::Color &); + void reset_block_color(const R2C2::Block &); void sensor_event(unsigned, bool); - void block_reserved(const Marklin::Block &, const Marklin::Train *); - Marklin::Track3D *pick_track(int, int); - void train_added(Marklin::Train &); + void block_reserved(const R2C2::Block &, const R2C2::Train *); + R2C2::Track3D *pick_track(int, int); + void train_added(R2C2::Train &); virtual void sighandler(int); static Msp::Application::RegApp reg; diff --git a/source/engineer/mainpanel.cpp b/source/engineer/mainpanel.cpp index 8a292b4..667e95f 100644 --- a/source/engineer/mainpanel.cpp +++ b/source/engineer/mainpanel.cpp @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include -#include "libmarklin/driver.h" +#include "libr2c2/driver.h" #include "engineer.h" #include "mainpanel.h" #include "trainproperties.h" @@ -59,7 +59,7 @@ MainPanel::MainPanel(Engineer &e): lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 20)); lbl_status->set_style("digital"); - Marklin::Driver &driver = engineer.get_layout().get_driver(); + R2C2::Driver &driver = engineer.get_layout().get_driver(); if(driver.get_power()) ind_on->set_active(true); else @@ -86,7 +86,7 @@ void MainPanel::power_off() void MainPanel::toggle_halt() { - Marklin::Driver &driver = engineer.get_layout().get_driver(); + R2C2::Driver &driver = engineer.get_layout().get_driver(); driver.halt(!driver.is_halted()); } diff --git a/source/engineer/mainpanel.h b/source/engineer/mainpanel.h index 17e95db..a4b62b7 100644 --- a/source/engineer/mainpanel.h +++ b/source/engineer/mainpanel.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/engineer/options.cpp b/source/engineer/options.cpp index fc7516c..b5c36cd 100644 --- a/source/engineer/options.cpp +++ b/source/engineer/options.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/engineer/options.h b/source/engineer/options.h index 689b22a..e35cc92 100644 --- a/source/engineer/options.h +++ b/source/engineer/options.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ diff --git a/source/engineer/routeselect.cpp b/source/engineer/routeselect.cpp index 0e19149..00bf6cf 100644 --- a/source/engineer/routeselect.cpp +++ b/source/engineer/routeselect.cpp @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include #include "engineer.h" -#include "libmarklin/route.h" +#include "libr2c2/route.h" #include "routeselect.h" using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; RouteSelect::RouteSelect(Engineer &e, Train &t): engineer(e), diff --git a/source/engineer/routeselect.h b/source/engineer/routeselect.h index f6110c5..6552175 100644 --- a/source/engineer/routeselect.h +++ b/source/engineer/routeselect.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -9,7 +9,7 @@ Distributed under the GPL #define ROUTESELECT_H_ #include -#include "libmarklin/train.h" +#include "libr2c2/train.h" #include "dialog.h" class Engineer; @@ -18,11 +18,11 @@ class RouteSelect: public Dialog { private: Engineer &engineer; - Marklin::Train &train; + R2C2::Train &train; Msp::GLtk::Dropdown *drp_route; public: - RouteSelect(Engineer &, Marklin::Train &); + RouteSelect(Engineer &, R2C2::Train &); private: virtual void on_ok_clicked(); }; diff --git a/source/engineer/timetabledialog.cpp b/source/engineer/timetabledialog.cpp index 52f391c..2e50099 100644 --- a/source/engineer/timetabledialog.cpp +++ b/source/engineer/timetabledialog.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; TimetableDialog::TimetableDialog(Timetable &tt): timetable(tt) diff --git a/source/engineer/timetabledialog.h b/source/engineer/timetabledialog.h index a1f611d..9c06fc8 100644 --- a/source/engineer/timetabledialog.h +++ b/source/engineer/timetabledialog.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,17 +11,17 @@ Distributed under the GPL #include #include #include -#include "libmarklin/timetable.h" +#include "libr2c2/timetable.h" class TimetableDialog: public Msp::GLtk::Dialog { private: - Marklin::Timetable &timetable; + R2C2::Timetable &timetable; Msp::GLtk::Entry *ent_timetable; Msp::GLtk::Toggle *tgl_enabled; public: - TimetableDialog(Marklin::Timetable &); + TimetableDialog(R2C2::Timetable &); private: void enabled_toggled(bool); diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp index 23e26ee..5d237ec 100644 --- a/source/engineer/trainpanel.cpp +++ b/source/engineer/trainpanel.cpp @@ -1,15 +1,15 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include #include -#include "libmarklin/timetable.h" -#include "libmarklin/trackiter.h" -#include "libmarklin/vehicletype.h" +#include "libr2c2/timetable.h" +#include "libr2c2/trackiter.h" +#include "libr2c2/vehicletype.h" #include "engineer.h" #include "routeselect.h" #include "timetabledialog.h" @@ -19,7 +19,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; TrainPanel::TrainPanel(Engineer &e, Train &t): engineer(e), diff --git a/source/engineer/trainpanel.h b/source/engineer/trainpanel.h index 9a38ca4..d74ccbf 100644 --- a/source/engineer/trainpanel.h +++ b/source/engineer/trainpanel.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,8 +14,8 @@ Distributed under the GPL #include #include #include -#include "libmarklin/route.h" -#include "libmarklin/train.h" +#include "libr2c2/route.h" +#include "libr2c2/train.h" class Engineer; @@ -23,7 +23,7 @@ class TrainPanel: public Msp::GLtk::Panel, public sigc::trackable { private: Engineer &engineer; - Marklin::Train &train; + R2C2::Train &train; Msp::GLtk::Panel *pnl_basic; Msp::GLtk::Panel *pnl_extra; Msp::GLtk::Button *btn_expand; @@ -39,13 +39,13 @@ private: bool expanded; public: - TrainPanel(Engineer &, Marklin::Train &); + TrainPanel(Engineer &, R2C2::Train &); void expand(bool = true); private: void train_control_changed(const std::string &, float); void train_function_changed(unsigned, bool); - void train_route_changed(const Marklin::Route *); + void train_route_changed(const R2C2::Route *); void train_status_changed(const std::string &); void place_clicked(); void take_clicked(); @@ -58,8 +58,8 @@ private: void speed_slider_changed(double); void forward_toggled(bool); void func_toggled(bool, unsigned); - void place(Marklin::Track *, unsigned); - void go_to(Marklin::Track *, unsigned); + void place(R2C2::Track *, unsigned); + void go_to(R2C2::Track *, unsigned); }; #endif diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp index eaddc8b..9686dee 100644 --- a/source/engineer/trainproperties.cpp +++ b/source/engineer/trainproperties.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -8,15 +8,15 @@ Distributed under the GPL #include #include #include -#include "libmarklin/driver.h" -#include "libmarklin/vehicle.h" -#include "libmarklin/vehicletype.h" +#include "libr2c2/driver.h" +#include "libr2c2/vehicle.h" +#include "libr2c2/vehicletype.h" #include "engineer.h" #include "trainproperties.h" using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; TrainProperties::TrainProperties(Engineer &e, Train *t): engineer(e), diff --git a/source/engineer/trainproperties.h b/source/engineer/trainproperties.h index 465154d..2445833 100644 --- a/source/engineer/trainproperties.h +++ b/source/engineer/trainproperties.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -10,7 +10,7 @@ Distributed under the GPL #include #include -#include +#include #include "dialog.h" class Engineer; @@ -19,7 +19,7 @@ class TrainProperties: public Dialog { private: Engineer &engineer; - Marklin::Train *train; + R2C2::Train *train; Msp::GLtk::Entry *ent_addr; Msp::GLtk::Dropdown *drp_protocol; Msp::GLtk::Dropdown *drp_type; @@ -27,16 +27,16 @@ private: Msp::GLtk::Dropdown *drp_priority; Msp::GLtk::List *lst_vehicles; Msp::GLtk::Dropdown *drp_new_vehicle; - std::vector add_vehicles; + std::vector add_vehicles; std::set rem_vehicles; public: - TrainProperties(Engineer &, Marklin::Train *); + TrainProperties(Engineer &, R2C2::Train *); private: virtual void on_ok_clicked(); void new_vehicle_selected(unsigned, const std::string &); void remove_vehicle_clicked(); - const Marklin::VehicleType &get_vehicle_type(unsigned, bool); + const R2C2::VehicleType &get_vehicle_type(unsigned, bool); }; #endif diff --git a/source/engineer/trainview.cpp b/source/engineer/trainview.cpp index df336d5..f282b4e 100644 --- a/source/engineer/trainview.cpp +++ b/source/engineer/trainview.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -8,13 +8,13 @@ Distributed under the GPL #include #include #include -#include "libmarklin/vehicle.h" -#include "libmarklin/vehicletype.h" +#include "libr2c2/vehicle.h" +#include "libr2c2/vehicletype.h" #include "engineer.h" #include "trainview.h" using namespace Msp; -using namespace Marklin; +using namespace R2C2; TrainView::TrainView(Engineer &e, const Train &t): engineer(e), diff --git a/source/engineer/trainview.h b/source/engineer/trainview.h index a452a71..c7ba7b9 100644 --- a/source/engineer/trainview.h +++ b/source/engineer/trainview.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -13,7 +13,7 @@ Distributed under the GPL #include #include #include -#include "libmarklin/train.h" +#include "libr2c2/train.h" class Engineer; @@ -29,7 +29,7 @@ public: private: Engineer &engineer; - const Marklin::Train &train; + const R2C2::Train &train; Msp::GLtk::Toggle *tgl_forward; Mode mode; bool forward; @@ -41,7 +41,7 @@ private: bool stale; public: - TrainView(Engineer &, const Marklin::Train &); + TrainView(Engineer &, const R2C2::Train &); ~TrainView(); void set_mode(Mode); diff --git a/source/libmarklin/aicontrol.cpp b/source/libr2c2/aicontrol.cpp similarity index 96% rename from source/libmarklin/aicontrol.cpp rename to source/libr2c2/aicontrol.cpp index 553159c..c2f16e3 100644 --- a/source/libmarklin/aicontrol.cpp +++ b/source/libr2c2/aicontrol.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -13,7 +13,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { AIControl::AIControl(Train &t, Controller *n): train(t), @@ -126,4 +126,4 @@ void AIControl::arrived() set_control("speed", 0); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/aicontrol.h b/source/libr2c2/aicontrol.h similarity index 83% rename from source/libmarklin/aicontrol.h rename to source/libr2c2/aicontrol.h index 462a114..0d84218 100644 --- a/source/libmarklin/aicontrol.h +++ b/source/libr2c2/aicontrol.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_AICONTROL_H_ -#define LIBMARKLIN_AICONTROL_H_ +#ifndef LIBR2C2_AICONTROL_H_ +#define LIBR2C2_AICONTROL_H_ #include #include "controller.h" -namespace Marklin { +namespace R2C2 { class Train; @@ -42,6 +42,6 @@ private: void arrived(); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/articlenumber.cpp b/source/libr2c2/articlenumber.cpp similarity index 95% rename from source/libmarklin/articlenumber.cpp rename to source/libr2c2/articlenumber.cpp index cac3b32..45e526c 100644 --- a/source/libmarklin/articlenumber.cpp +++ b/source/libr2c2/articlenumber.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,7 +11,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { ArticleNumber::ArticleNumber(unsigned n) { @@ -87,4 +87,4 @@ void operator<<(LexicalConverter &conv, const ArticleNumber &art_nr) conv.result(art_nr.str()); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/articlenumber.h b/source/libr2c2/articlenumber.h similarity index 79% rename from source/libmarklin/articlenumber.h rename to source/libr2c2/articlenumber.h index 0aa6498..cf69c42 100644 --- a/source/libmarklin/articlenumber.h +++ b/source/libr2c2/articlenumber.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_ARTICLENUMBER_H_ -#define LIBMARKLIN_ARTICLENUMBER_H_ +#ifndef LIBR2C2_ARTICLENUMBER_H_ +#define LIBR2C2_ARTICLENUMBER_H_ #include #include #include -namespace Marklin { +namespace R2C2 { class ArticleNumber { @@ -40,6 +40,6 @@ public: void operator>>(const Msp::LexicalConverter &, ArticleNumber &); void operator<<(Msp::LexicalConverter &, const ArticleNumber &); -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/block.cpp b/source/libr2c2/block.cpp similarity index 98% rename from source/libmarklin/block.cpp rename to source/libr2c2/block.cpp index e8e367f..ca404de 100644 --- a/source/libmarklin/block.cpp +++ b/source/libr2c2/block.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -15,7 +15,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Block::Block(Layout &l, Track &start): layout(l), @@ -219,4 +219,4 @@ Block::Endpoint::Endpoint(Track *t, unsigned e): paths(0) { } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/block.h b/source/libr2c2/block.h similarity index 90% rename from source/libmarklin/block.h rename to source/libr2c2/block.h index 41f9040..e13e58b 100644 --- a/source/libmarklin/block.h +++ b/source/libr2c2/block.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_BLOCK_H_ -#define LIBMARKLIN_BLOCK_H_ +#ifndef LIBR2C2_BLOCK_H_ +#define LIBR2C2_BLOCK_H_ #include #include #include "track.h" -namespace Marklin { +namespace R2C2 { class Layout; class Route; @@ -65,6 +65,6 @@ private: void determine_id(); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/blockiter.cpp b/source/libr2c2/blockiter.cpp similarity index 96% rename from source/libmarklin/blockiter.cpp rename to source/libr2c2/blockiter.cpp index 245f963..db052ac 100644 --- a/source/libmarklin/blockiter.cpp +++ b/source/libr2c2/blockiter.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,7 +14,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { BlockIter::BlockIter(): _block(0), @@ -122,4 +122,4 @@ bool BlockIter::operator==(const BlockIter &other) const return _block==other._block && _entry==other._entry; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/blockiter.h b/source/libr2c2/blockiter.h similarity index 85% rename from source/libmarklin/blockiter.h rename to source/libr2c2/blockiter.h index c86a4e5..5c235a5 100644 --- a/source/libmarklin/blockiter.h +++ b/source/libr2c2/blockiter.h @@ -1,14 +1,14 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_BLOCKITER_H_ -#define LIBMARKLIN_BLOCKITER_H_ +#ifndef LIBR2C2_BLOCKITER_H_ +#define LIBR2C2_BLOCKITER_H_ -namespace Marklin { +namespace R2C2 { class Block; class Route; @@ -46,6 +46,6 @@ public: operator bool() const { return _block!=0; } }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/catalogue.cpp b/source/libr2c2/catalogue.cpp similarity index 97% rename from source/libmarklin/catalogue.cpp rename to source/libr2c2/catalogue.cpp index 82dde18..838b15b 100644 --- a/source/libmarklin/catalogue.cpp +++ b/source/libr2c2/catalogue.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,7 +14,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Catalogue::Catalogue(): scale(1), @@ -144,4 +144,4 @@ void Catalogue::Loader::vehicle(ArticleNumber art_nr) obj.add_vehicle(*veh.release()); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/catalogue.h b/source/libr2c2/catalogue.h similarity index 92% rename from source/libmarklin/catalogue.h rename to source/libr2c2/catalogue.h index a436994..c8b006a 100644 --- a/source/libmarklin/catalogue.h +++ b/source/libr2c2/catalogue.h @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_CATALOGUE_H_ -#define LIBMARKLIN_CATALOGUE_H_ +#ifndef LIBR2C2_CATALOGUE_H_ +#define LIBR2C2_CATALOGUE_H_ #include #include @@ -14,7 +14,7 @@ Distributed under the GPL #include "layout.h" #include "profile.h" -namespace Marklin { +namespace R2C2 { class TrackType; class VehicleType; @@ -76,6 +76,6 @@ public: Layout &get_layout() { return layout; } }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/controller.cpp b/source/libr2c2/controller.cpp similarity index 93% rename from source/libmarklin/controller.cpp rename to source/libr2c2/controller.cpp index 8d7be31..480abc2 100644 --- a/source/libmarklin/controller.cpp +++ b/source/libr2c2/controller.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { void Controller::Control::set(float v) { @@ -73,4 +73,4 @@ Controller::Control Controller::Control::continuous(const string &n, float m, fl return tc; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/controller.h b/source/libr2c2/controller.h similarity index 90% rename from source/libmarklin/controller.h rename to source/libr2c2/controller.h index ac5128b..6cabade 100644 --- a/source/libmarklin/controller.h +++ b/source/libr2c2/controller.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_CONTROLLER_H_ -#define LIBMARKLIN_CONTROLLER_H_ +#ifndef LIBR2C2_CONTROLLER_H_ +#define LIBR2C2_CONTROLLER_H_ #include #include #include -namespace Marklin { +namespace R2C2 { /** Interface class for train controllers. Takes input through a uniform named @@ -70,6 +70,6 @@ public: virtual void tick(const Msp::Time::TimeDelta &) = 0; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/driver.cpp b/source/libr2c2/driver.cpp similarity index 86% rename from source/libmarklin/driver.cpp rename to source/libr2c2/driver.cpp index 3bec54e..ea903af 100644 --- a/source/libmarklin/driver.cpp +++ b/source/libr2c2/driver.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; -namespace Marklin { +namespace R2C2 { Driver *Driver::create(const string &str) { @@ -31,4 +31,4 @@ Driver *Driver::create(const string &str) throw Msp::InvalidParameterValue("Unknown driver"); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/driver.h b/source/libr2c2/driver.h similarity index 90% rename from source/libmarklin/driver.h rename to source/libr2c2/driver.h index f8d8f9c..d9d1127 100644 --- a/source/libmarklin/driver.h +++ b/source/libr2c2/driver.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_DRIVER_H_ -#define LIBMARKLIN_DRIVER_H_ +#ifndef LIBR2C2_DRIVER_H_ +#define LIBR2C2_DRIVER_H_ #include #include -namespace Marklin { +namespace R2C2 { class Driver { @@ -54,6 +54,6 @@ public: static Driver *create(const std::string &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/dummy.cpp b/source/libr2c2/dummy.cpp similarity index 94% rename from source/libmarklin/dummy.cpp rename to source/libr2c2/dummy.cpp index da6c5c9..814dce4 100644 --- a/source/libmarklin/dummy.cpp +++ b/source/libr2c2/dummy.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -9,7 +9,7 @@ Distributed under the GPL using namespace std; -namespace Marklin { +namespace R2C2 { Dummy::Dummy(): power(true) @@ -91,4 +91,4 @@ bool Dummy::get_sensor(unsigned addr) const return false; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/dummy.h b/source/libr2c2/dummy.h similarity index 89% rename from source/libmarklin/dummy.h rename to source/libr2c2/dummy.h index 7485fa5..5357bbd 100644 --- a/source/libmarklin/dummy.h +++ b/source/libr2c2/dummy.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_DUMMY_H_ -#define LIBMARKLIN_DUMMY_H_ +#ifndef LIBR2C2_DUMMY_H_ +#define LIBR2C2_DUMMY_H_ #include #include "driver.h" -namespace Marklin { +namespace R2C2 { class Dummy: public Driver { @@ -54,6 +54,6 @@ public: virtual void flush() { } }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/geometry.h b/source/libr2c2/geometry.h similarity index 78% rename from source/libmarklin/geometry.h rename to source/libr2c2/geometry.h index 674a6b9..48bbd49 100644 --- a/source/libmarklin/geometry.h +++ b/source/libr2c2/geometry.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_GEOMETRY_H_ -#define LIBMARKLIN_GEOMETRY_H_ +#ifndef LIBR2C2_GEOMETRY_H_ +#define LIBR2C2_GEOMETRY_H_ #include #include -namespace Marklin { +namespace R2C2 { struct Point { @@ -34,6 +34,6 @@ struct TrackPoint TrackPoint(): dir(0), grade(0) { } }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/intellibox.cpp b/source/libr2c2/intellibox.cpp similarity index 99% rename from source/libmarklin/intellibox.cpp rename to source/libr2c2/intellibox.cpp index 1dc2e70..9ac448e 100644 --- a/source/libmarklin/intellibox.cpp +++ b/source/libr2c2/intellibox.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -16,7 +16,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Intellibox::Intellibox(const string &dev): power(false), @@ -703,4 +703,4 @@ Intellibox::Sensor::Sensor(): state(false) { } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/intellibox.h b/source/libr2c2/intellibox.h similarity index 96% rename from source/libmarklin/intellibox.h rename to source/libr2c2/intellibox.h index 6d061a6..8655bfc 100644 --- a/source/libmarklin/intellibox.h +++ b/source/libr2c2/intellibox.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_INTELLIBOX_H_ -#define LIBMARKLIN_INTELLIBOX_H_ +#ifndef LIBR2C2_INTELLIBOX_H_ +#define LIBR2C2_INTELLIBOX_H_ #include #include #include "driver.h" -namespace Marklin { +namespace R2C2 { /** Driver for Uhlenbrock Intellibox. Uses the P50X binary protocol over RS232. @@ -165,6 +165,6 @@ private: void error(Command, Error); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/layout.cpp b/source/libr2c2/layout.cpp similarity index 98% rename from source/libmarklin/layout.cpp rename to source/libr2c2/layout.cpp index 5f590db..1c0d4cf 100644 --- a/source/libmarklin/layout.cpp +++ b/source/libr2c2/layout.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -24,7 +24,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Layout::Layout(Catalogue &c, Driver *d): catalogue(c), @@ -348,4 +348,4 @@ void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::strin load_sub(*trn); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/layout.h b/source/libr2c2/layout.h similarity index 94% rename from source/libmarklin/layout.h rename to source/libr2c2/layout.h index 2fc761a..86db658 100644 --- a/source/libmarklin/layout.h +++ b/source/libr2c2/layout.h @@ -1,19 +1,19 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_LAYOUT_H_ -#define LIBMARKLIN_LAYOUT_H_ +#ifndef LIBR2C2_LAYOUT_H_ +#define LIBR2C2_LAYOUT_H_ #include #include #include #include -namespace Marklin { +namespace R2C2 { class ArticleNumber; class Block; @@ -112,7 +112,7 @@ private: void sensor_event(unsigned, bool); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/profile.cpp b/source/libr2c2/profile.cpp similarity index 92% rename from source/libmarklin/profile.cpp rename to source/libr2c2/profile.cpp index 7b9dce5..b44ee36 100644 --- a/source/libmarklin/profile.cpp +++ b/source/libr2c2/profile.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,7 +11,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { void Profile::append_point(const Point &p) { @@ -59,4 +59,4 @@ void Profile::Loader::point(float x, float y) obj.append_point(Point(x/1000, y/1000)); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/profile.h b/source/libr2c2/profile.h similarity index 85% rename from source/libmarklin/profile.h rename to source/libr2c2/profile.h index b1082e8..00132e9 100644 --- a/source/libmarklin/profile.h +++ b/source/libr2c2/profile.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_PROFILE_H_ -#define LIBMARKLIN_PROFILE_H_ +#ifndef LIBR2C2_PROFILE_H_ +#define LIBR2C2_PROFILE_H_ #include #include #include "geometry.h" -namespace Marklin { +namespace R2C2 { class Profile { @@ -41,6 +41,6 @@ public: Point get_edge_normal(unsigned) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/route.cpp b/source/libr2c2/route.cpp similarity index 98% rename from source/libmarklin/route.cpp rename to source/libr2c2/route.cpp index 79886d2..4f7e778 100644 --- a/source/libmarklin/route.cpp +++ b/source/libr2c2/route.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2007-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -18,7 +18,7 @@ using namespace Msp; namespace { -using namespace Marklin; +using namespace R2C2; typedef std::pair Key; @@ -130,7 +130,7 @@ Route *create_route(const TrackIter &from, const Pred &goal) } -namespace Marklin { +namespace R2C2 { Route::Route(Layout &l): layout(l), @@ -452,4 +452,4 @@ void Route::Loader::turnout(unsigned id, unsigned path) turnouts[id] = path; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/route.h b/source/libr2c2/route.h similarity index 92% rename from source/libmarklin/route.h rename to source/libr2c2/route.h index 0b03637..86a0f61 100644 --- a/source/libmarklin/route.h +++ b/source/libr2c2/route.h @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2007-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_ROUTE_H_ -#define LIBMARKLIN_ROUTE_H_ +#ifndef LIBR2C2_ROUTE_H_ +#define LIBR2C2_ROUTE_H_ #include #include @@ -14,7 +14,7 @@ Distributed under the GPL #include #include -namespace Marklin { +namespace R2C2 { class Layout; class Track; @@ -75,6 +75,6 @@ public: static Route *find(const TrackIter &, const std::set &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/simplecontroller.cpp b/source/libr2c2/simplecontroller.cpp similarity index 94% rename from source/libmarklin/simplecontroller.cpp rename to source/libr2c2/simplecontroller.cpp index 5744188..7f8b336 100644 --- a/source/libmarklin/simplecontroller.cpp +++ b/source/libr2c2/simplecontroller.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { SimpleController::SimpleController(): target_speed(Control::continuous("speed", 0, 1000)), @@ -71,4 +71,4 @@ void SimpleController::tick(const Time::TimeDelta &dt) } } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/simplecontroller.h b/source/libr2c2/simplecontroller.h similarity index 79% rename from source/libmarklin/simplecontroller.h rename to source/libr2c2/simplecontroller.h index 9b0df26..140f13d 100644 --- a/source/libmarklin/simplecontroller.h +++ b/source/libr2c2/simplecontroller.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_SIMPLECONTROLLER_H_ -#define LIBMARKLIN_SIMPLECONTROLLER_H_ +#ifndef LIBR2C2_SIMPLECONTROLLER_H_ +#define LIBR2C2_SIMPLECONTROLLER_H_ #include #include "controller.h" -namespace Marklin { +namespace R2C2 { class SimpleController: public Controller { @@ -34,6 +34,6 @@ public: virtual void tick(const Msp::Time::TimeDelta &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/timetable.cpp b/source/libr2c2/timetable.cpp similarity index 98% rename from source/libmarklin/timetable.cpp rename to source/libr2c2/timetable.cpp index a699fc8..bc8ebe6 100644 --- a/source/libmarklin/timetable.cpp +++ b/source/libr2c2/timetable.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -17,7 +17,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Timetable::Timetable(Train &t): train(t), @@ -334,4 +334,4 @@ void Timetable::Loader::wait_train(unsigned t, const string &b) obj.rows.push_back(row); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/timetable.h b/source/libr2c2/timetable.h similarity index 92% rename from source/libmarklin/timetable.h rename to source/libr2c2/timetable.h index b4f9cc1..9cfda68 100644 --- a/source/libmarklin/timetable.h +++ b/source/libr2c2/timetable.h @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_TIMETABLE_H_ -#define LIBMARKLIN_TIMETABLE_H_ +#ifndef LIBR2C2_TIMETABLE_H_ +#define LIBR2C2_TIMETABLE_H_ #include #include @@ -14,7 +14,7 @@ Distributed under the GPL #include #include -namespace Marklin { +namespace R2C2 { class Block; class Train; @@ -100,6 +100,6 @@ private: void train_arrived(); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/track.cpp b/source/libr2c2/track.cpp similarity index 98% rename from source/libmarklin/track.cpp rename to source/libr2c2/track.cpp index fbe3f0a..0592731 100644 --- a/source/libmarklin/track.cpp +++ b/source/libr2c2/track.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -16,7 +16,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Track::Track(Layout &l, const TrackType &t): layout(l), @@ -389,4 +389,4 @@ void Track::Loader::turnout_id(unsigned id) obj.set_turnout_id(id); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/track.h b/source/libr2c2/track.h similarity index 93% rename from source/libmarklin/track.h rename to source/libr2c2/track.h index f065cb6..95f9023 100644 --- a/source/libmarklin/track.h +++ b/source/libr2c2/track.h @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_TRACK_H_ -#define LIBMARKLIN_TRACK_H_ +#ifndef LIBR2C2_TRACK_H_ +#define LIBR2C2_TRACK_H_ #include #include @@ -14,7 +14,7 @@ Distributed under the GPL #include #include "geometry.h" -namespace Marklin { +namespace R2C2 { class Block; class Layout; @@ -93,6 +93,6 @@ private: void turnout_event(unsigned, bool); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/trackiter.cpp b/source/libr2c2/trackiter.cpp similarity index 97% rename from source/libmarklin/trackiter.cpp rename to source/libr2c2/trackiter.cpp index b980228..3c6295b 100644 --- a/source/libmarklin/trackiter.cpp +++ b/source/libr2c2/trackiter.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -14,7 +14,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { TrackIter::TrackIter(): _track(0), @@ -168,4 +168,4 @@ TrackLoopIter TrackLoopIter::next(unsigned path) const return TrackLoopIter(TrackIter::next(path), _visited, _last); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/trackiter.h b/source/libr2c2/trackiter.h similarity index 91% rename from source/libmarklin/trackiter.h rename to source/libr2c2/trackiter.h index e2f1d85..1dce02a 100644 --- a/source/libmarklin/trackiter.h +++ b/source/libr2c2/trackiter.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_TRACKITER_H_ -#define LIBMARKLIN_TRACKITER_H_ +#ifndef LIBR2C2_TRACKITER_H_ +#define LIBR2C2_TRACKITER_H_ #include #include #include "tracktype.h" -namespace Marklin { +namespace R2C2 { class Track; @@ -80,6 +80,6 @@ public: TrackLoopIter next(unsigned) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/trackpart.cpp b/source/libr2c2/trackpart.cpp similarity index 96% rename from source/libmarklin/trackpart.cpp rename to source/libr2c2/trackpart.cpp index 37c5f97..af2cf37 100644 --- a/source/libmarklin/trackpart.cpp +++ b/source/libr2c2/trackpart.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,7 +11,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { TrackPart::TrackPart(): dir(0), @@ -124,4 +124,4 @@ void TrackPart::Loader::start(float x, float y, float d) obj.dir = d; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/trackpart.h b/source/libr2c2/trackpart.h similarity index 84% rename from source/libmarklin/trackpart.h rename to source/libr2c2/trackpart.h index 13e0f38..0a07b4d 100644 --- a/source/libmarklin/trackpart.h +++ b/source/libr2c2/trackpart.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLIN_TRACKPART_H_ -#define MARKLIN_TRACKPART_H_ +#ifndef LIBR2C2_TRACKPART_H_ +#define LIBR2C2_TRACKPART_H_ #include #include "geometry.h" -namespace Marklin { +namespace R2C2 { class TrackPart { @@ -46,6 +46,6 @@ public: TrackPart *get_link(unsigned) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/tracktype.cpp b/source/libr2c2/tracktype.cpp similarity index 97% rename from source/libmarklin/tracktype.cpp rename to source/libr2c2/tracktype.cpp index 9f2979b..4ac0967 100644 --- a/source/libmarklin/tracktype.cpp +++ b/source/libr2c2/tracktype.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,7 +11,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { TrackType::TrackType(const ArticleNumber &an): art_nr(an), @@ -191,4 +191,4 @@ void TrackType::Loader::part() obj.parts.push_back(p); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/tracktype.h b/source/libr2c2/tracktype.h similarity index 91% rename from source/libmarklin/tracktype.h rename to source/libr2c2/tracktype.h index d13ea28..d38f1b2 100644 --- a/source/libmarklin/tracktype.h +++ b/source/libr2c2/tracktype.h @@ -1,19 +1,19 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_TRACKTYPE_H_ -#define LIBMARKLIN_TRACKTYPE_H_ +#ifndef LIBR2C2_TRACKTYPE_H_ +#define LIBR2C2_TRACKTYPE_H_ #include #include "articlenumber.h" #include "geometry.h" #include "trackpart.h" -namespace Marklin { +namespace R2C2 { class TrackType { @@ -67,6 +67,6 @@ private: void collect_endpoints(); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/train.cpp b/source/libr2c2/train.cpp similarity index 99% rename from source/libmarklin/train.cpp rename to source/libr2c2/train.cpp index 859d3da..dd7139f 100644 --- a/source/libmarklin/train.cpp +++ b/source/libr2c2/train.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -38,7 +38,7 @@ struct SetFlag } -namespace Marklin { +namespace R2C2 { Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): layout(l), @@ -1417,4 +1417,4 @@ void Train::Loader::vehicle(ArticleNumber art_nr) obj.vehicles.push_back(veh); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/train.h b/source/libr2c2/train.h similarity index 97% rename from source/libmarklin/train.h rename to source/libr2c2/train.h index a13c422..99575bf 100644 --- a/source/libmarklin/train.h +++ b/source/libr2c2/train.h @@ -1,12 +1,12 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_TRAIN_H_ -#define LIBMARKLIN_TRAIN_H_ +#ifndef LIBR2C2_TRAIN_H_ +#define LIBR2C2_TRAIN_H_ #include #include @@ -15,7 +15,7 @@ Distributed under the GPL #include "blockiter.h" #include "controller.h" -namespace Marklin { +namespace R2C2 { class ArticleNumber; class Route; @@ -178,6 +178,6 @@ private: bool is_valid_diversion(const Route &, const TrackIter &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/vehicle.cpp b/source/libr2c2/vehicle.cpp similarity index 98% rename from source/libmarklin/vehicle.cpp rename to source/libr2c2/vehicle.cpp index b54b531..e0a5c96 100644 --- a/source/libmarklin/vehicle.cpp +++ b/source/libr2c2/vehicle.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -18,7 +18,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Vehicle::Vehicle(Layout &l, const VehicleType &t): layout(l), @@ -361,4 +361,4 @@ TrackPoint Vehicle::TrackPosition::get_point() const return TrackPoint(); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/vehicle.h b/source/libr2c2/vehicle.h similarity index 92% rename from source/libmarklin/vehicle.h rename to source/libr2c2/vehicle.h index 75ae859..ec33ede 100644 --- a/source/libmarklin/vehicle.h +++ b/source/libr2c2/vehicle.h @@ -1,16 +1,16 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_VEHICLE_H_ -#define LIBMARKLIN_VEHICLE_H_ +#ifndef LIBR2C2_VEHICLE_H_ +#define LIBR2C2_VEHICLE_H_ #include "geometry.h" -namespace Marklin { +namespace R2C2 { class Layout; class Track; @@ -87,6 +87,6 @@ private: TrackPoint get_point(const TrackPosition &, float, float = 0.5) const; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/libmarklin/vehicletype.cpp b/source/libr2c2/vehicletype.cpp similarity index 97% rename from source/libmarklin/vehicletype.cpp rename to source/libr2c2/vehicletype.cpp index 5c14cba..3d695f8 100644 --- a/source/libmarklin/vehicletype.cpp +++ b/source/libr2c2/vehicletype.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -10,7 +10,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { VehicleType::VehicleType(const ArticleNumber &an): art_nr(an), @@ -157,4 +157,4 @@ void VehicleType::Bogie::Loader::position(float p) obj.position = p/1000; } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/libmarklin/vehicletype.h b/source/libr2c2/vehicletype.h similarity index 92% rename from source/libmarklin/vehicletype.h rename to source/libr2c2/vehicletype.h index 7844825..b97fb92 100644 --- a/source/libmarklin/vehicletype.h +++ b/source/libr2c2/vehicletype.h @@ -1,17 +1,17 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef LIBMARKLIN_VEHICLETYPE_H_ -#define LIBMARKLIN_VEHICLETYPE_H_ +#ifndef LIBR2C2_VEHICLETYPE_H_ +#define LIBR2C2_VEHICLETYPE_H_ #include #include "articlenumber.h" -namespace Marklin { +namespace R2C2 { class VehicleType { @@ -97,6 +97,6 @@ public: const std::string &get_object() const { return object; } }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/network/client.cpp b/source/network/client.cpp index 50db7df..d418b8c 100644 --- a/source/network/client.cpp +++ b/source/network/client.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -10,7 +10,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Client::Client(const Catalogue &c): catalogue(c), @@ -88,4 +88,4 @@ void Client::receive(const ErrorPacket &pkt) signal_error.emit(pkt.message); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/network/client.h b/source/network/client.h index 2ab8722..02295df 100644 --- a/source/network/client.h +++ b/source/network/client.h @@ -1,21 +1,21 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLINNET_CLIENT_H_ -#define MARKLINNET_CLIENT_H_ +#ifndef R2C2_NET_CLIENT_H_ +#define R2C2_NET_CLIENT_H_ #include #include -#include "libmarklin/catalogue.h" +#include "libr2c2/catalogue.h" #include "packets.h" #include "protocol.h" #include "train.h" -namespace Marklin { +namespace R2C2 { class Client: public Msp::Net::PacketReceiver, Msp::Net::PacketReceiver, @@ -64,6 +64,6 @@ private: virtual void receive(const ErrorPacket &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/network/packets.h b/source/network/packets.h index bb08941..8001b8c 100644 --- a/source/network/packets.h +++ b/source/network/packets.h @@ -1,16 +1,16 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLINNET_PACKETS_H_ -#define MARKLINNET_PACKETS_H_ +#ifndef R2C2_NET_PACKETS_H_ +#define R2C2_NET_PACKETS_H_ #include -namespace Marklin { +namespace R2C2 { struct TrainInfoPacket { @@ -54,6 +54,6 @@ struct ErrorPacket std::string message; }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/network/protocol.cpp b/source/network/protocol.cpp index 623eadb..cfbc0fd 100644 --- a/source/network/protocol.cpp +++ b/source/network/protocol.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -8,7 +8,7 @@ Distributed under the GPL #include "packets.h" #include "protocol.h" -namespace Marklin { +namespace R2C2 { Protocol::Protocol() { @@ -26,4 +26,4 @@ Protocol::Protocol() add() (&ErrorPacket::message); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/network/protocol.h b/source/network/protocol.h index 176fdad..7ed85fe 100644 --- a/source/network/protocol.h +++ b/source/network/protocol.h @@ -1,16 +1,16 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLINNET_PROTOCOL_H_ -#define MARKLINNET_PROTOCOL_H_ +#ifndef R2C2_NET_PROTOCOL_H_ +#define R2C2_NET_PROTOCOL_H_ #include -namespace Marklin { +namespace R2C2 { class Protocol: public Msp::Net::Protocol { @@ -18,6 +18,6 @@ public: Protocol(); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/network/server.cpp b/source/network/server.cpp index 2bf6412..404faa9 100644 --- a/source/network/server.cpp +++ b/source/network/server.cpp @@ -1,20 +1,20 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include -#include "libmarklin/route.h" -#include "libmarklin/train.h" -#include "libmarklin/vehicletype.h" +#include "libr2c2/route.h" +#include "libr2c2/train.h" +#include "libr2c2/vehicletype.h" #include "server.h" using namespace std; using namespace Msp; -namespace Marklin { +namespace R2C2 { Server::Server(Layout &l): layout(l), @@ -222,4 +222,4 @@ void Server::Connection::error(const string &msg) comm.send(pkt); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/network/server.h b/source/network/server.h index 056b0dd..ced08aa 100644 --- a/source/network/server.h +++ b/source/network/server.h @@ -1,22 +1,22 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLINNET_SERVER_H_ -#define MARKLINNET_SERVER_H_ +#ifndef R2C2_NET_SERVER_H_ +#define R2C2_NET_SERVER_H_ #include #include #include #include -#include "libmarklin/layout.h" +#include "libr2c2/layout.h" #include "packets.h" #include "protocol.h" -namespace Marklin { +namespace R2C2 { class Server { @@ -63,6 +63,6 @@ private: void send(const P &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/network/train.cpp b/source/network/train.cpp index 4b6c8e8..df9367e 100644 --- a/source/network/train.cpp +++ b/source/network/train.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -10,7 +10,7 @@ Distributed under the GPL using namespace std; -namespace Marklin { +namespace R2C2 { NetTrain::NetTrain(Client &c, const TrainInfoPacket &pkt): client(c), @@ -88,4 +88,4 @@ void NetTrain::process_packet(const TrainRoutePacket &pkt) signal_route_changed.emit(route); } -} // namespace Marklin +} // namespace R2C2 diff --git a/source/network/train.h b/source/network/train.h index 3de4f7d..bffa8a2 100644 --- a/source/network/train.h +++ b/source/network/train.h @@ -1,18 +1,18 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ -#ifndef MARKLINNET_TRAIN_H_ -#define MARKLINNET_TRAIN_H_ +#ifndef R2C2_NET_TRAIN_H_ +#define R2C2_NET_TRAIN_H_ #include -#include "libmarklin/vehicletype.h" +#include "libr2c2/vehicletype.h" #include "packets.h" -namespace Marklin { +namespace R2C2 { class Client; @@ -54,6 +54,6 @@ public: void process_packet(const TrainStatusPacket &); }; -} // namespace Marklin +} // namespace R2C2 #endif diff --git a/source/remote/remote.cpp b/source/remote/remote.cpp index a193b2b..830a06d 100644 --- a/source/remote/remote.cpp +++ b/source/remote/remote.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -50,7 +50,7 @@ void Remote::tick() gtk.iteration(false); } -void Remote::train_added(Marklin::NetTrain &t) +void Remote::train_added(R2C2::NetTrain &t) { TrainPanel *panel = new TrainPanel(*this, client, t); if(!train_panels.empty()) diff --git a/source/remote/remote.h b/source/remote/remote.h index 6d6be33..0d6d413 100644 --- a/source/remote/remote.h +++ b/source/remote/remote.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -20,8 +20,8 @@ class Remote: public Msp::Application { private: Msp::IO::EventDispatcher event_disp; - Marklin::Catalogue catalogue; - Marklin::Client client; + R2C2::Catalogue catalogue; + R2C2::Client client; Gtk::Main gtk; Gtk::Window window; Gtk::Box *train_box; @@ -32,11 +32,11 @@ private: public: Remote(int argc, char **argv); - const Marklin::Catalogue &get_catalogue() const { return catalogue; } + const R2C2::Catalogue &get_catalogue() const { return catalogue; } private: void tick(); - void train_added(Marklin::NetTrain &); + void train_added(R2C2::NetTrain &); }; #endif diff --git a/source/remote/trainpanel.cpp b/source/remote/trainpanel.cpp index b170edc..cfe0c10 100644 --- a/source/remote/trainpanel.cpp +++ b/source/remote/trainpanel.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; -TrainPanel::TrainPanel(Remote &r, Marklin::Client &c, Marklin::NetTrain &t): +TrainPanel::TrainPanel(Remote &r, R2C2::Client &c, R2C2::NetTrain &t): remote(r), client(c), train(t) diff --git a/source/remote/trainpanel.h b/source/remote/trainpanel.h index e1464e3..816d2a0 100644 --- a/source/remote/trainpanel.h +++ b/source/remote/trainpanel.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2009-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -29,8 +29,8 @@ private: }; Remote &remote; - Marklin::Client &client; - Marklin::NetTrain &train; + R2C2::Client &client; + R2C2::NetTrain &train; Gtk::Scale *scl_speed; Gtk::Label *lbl_status; Gtk::CheckButton *chk_reverse; @@ -39,7 +39,7 @@ private: std::map chk_funcs; public: - TrainPanel(Remote &, Marklin::Client &, Marklin::NetTrain &); + TrainPanel(Remote &, R2C2::Client &, R2C2::NetTrain &); private: void name_changed(const std::string &); void status_changed(const std::string &); diff --git a/source/serial/serial.cpp b/source/serial/serial.cpp index 4b94034..e812a99 100644 --- a/source/serial/serial.cpp +++ b/source/serial/serial.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -12,7 +12,7 @@ Distributed under the GPL using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; Application::RegApp Serial::reg; diff --git a/source/serial/serial.h b/source/serial/serial.h index e03bb50..b40a0b9 100644 --- a/source/serial/serial.h +++ b/source/serial/serial.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -16,10 +16,10 @@ class Serial: public Msp::Application { private: Msp::IO::EventDispatcher event_disp; - Marklin::Catalogue catalogue; - Marklin::Client client; + R2C2::Catalogue catalogue; + R2C2::Client client; Msp::IO::Serial serial_port; - Marklin::NetTrain *train; + R2C2::NetTrain *train; bool reverse; char rx_buf[3]; unsigned rx_fill; @@ -31,9 +31,9 @@ public: private: virtual void tick(); - void train_added(Marklin::NetTrain &); + void train_added(R2C2::NetTrain &); void error(const std::string &); - void set_train(Marklin::NetTrain *); + void set_train(R2C2::NetTrain *); void next_train(); void prev_train(); void data_available(); diff --git a/source/shoppinglist/main.cpp b/source/shoppinglist/main.cpp index 2b8f5bf..8390a26 100644 --- a/source/shoppinglist/main.cpp +++ b/source/shoppinglist/main.cpp @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -11,11 +11,11 @@ Distributed under the GPL #include #include #include -#include "libmarklin/articlenumber.h" +#include "libr2c2/articlenumber.h" using namespace std; using namespace Msp; -using namespace Marklin; +using namespace R2C2; class ShoppingList: public Application { -- 2.45.2