Update #includes that have been renamed, and remove stray ones

diff --git a/source/3d/overlay.h b/source/3d/overlay.h
index d39b30ebde5b1cbd1b7675410e12ca07d7098e63..7e327c74a37dc0d99c04ab5840aa8a92fd06c4eb 100644 (file)
--- a/source/3d/overlay.h
+++ b/source/3d/overlay.h
@@ -1,7 +1,6 @@
 #ifndef R2C2_3D_OVERLAY_H_
 #define R2C2_3D_OVERLAY_H_
 
-#include <msp/gbase/window.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/font.h>
 #include <msp/gl/mesh.h>

diff --git a/source/designer/cameracontroller.h b/source/designer/cameracontroller.h
index 682b59c9fed2170f791e04227ebcb72238f8b287..6d5270c1056039271c5f63d5fa9a3577b1ebd505 100644 (file)
--- a/source/designer/cameracontroller.h
+++ b/source/designer/cameracontroller.h
@@ -1,7 +1,7 @@
 #ifndef CAMERACONTROLLER_H_
 #define CAMERACONTROLLER_H_
 
-#include <msp/gbase/window.h>
+#include <msp/graphics/window.h>
 #include <msp/gl/camera.h>
 #include "3d/view.h"
 

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 76a31a51d4094be8a09d5959cb4f141f8022b4de..230b46f1ba0df23888a27bd54d7dcd8774d64361 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -11,9 +11,9 @@
 #include <msp/gl/texture2d.h>
 #include <msp/input/keys.h>
 #include <msp/io/print.h>
-#include <msp/strings/codec.h>
+#include <msp/stringcodec/codec.h>
+#include <msp/stringcodec/utf8.h>
 #include <msp/strings/lexicalcast.h>
-#include <msp/strings/utf8.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 0e7fe45e26ba5e1dc4c726bf1e84a68c1f9ac34b..471bfc709d7b7ea3568e78c8fcee305ed4b24250 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/font.h>
 #include <msp/gl/light.h>

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 204226e42fb029480cda3d7371649dc718b934e9..5f0354088f4641eed72f8b0edc751c60ffadce53 100644 (file)
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/tracktype.h"
 #include "designer.h"
 #include "manipulator.h"

diff --git a/source/designer/routebar.cpp b/source/designer/routebar.cpp
index 2cc9058f0638a4cc19c09d8d7eef19ea59cdb63b..66a55d77c838dbd29a8c2847c8eb48322aa9fb1d 100644 (file)
--- a/source/designer/routebar.cpp
+++ b/source/designer/routebar.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/route.h"
 #include "designer.h"
 #include "routebar.h"

diff --git a/source/designer/svgexporter.cpp b/source/designer/svgexporter.cpp
index 4cf9ef4a54a26496d93e499bb41b294cc3b82e91..11edf645ad7cff6cf2571e383a102e58f4ade6f3 100644 (file)
--- a/source/designer/svgexporter.cpp
+++ b/source/designer/svgexporter.cpp
@@ -1,5 +1,5 @@
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/catalogue.h"
 #include "libr2c2/track.h"
 #include "libr2c2/tracktype.h"

diff --git a/source/designer/zonebar.cpp b/source/designer/zonebar.cpp
index 4925b9e950bed9c6a19b3f81102bc78c79b267a8..9f9fd0dd66690ae6ed37893df4d6dc1e893cfc78 100644 (file)
--- a/source/designer/zonebar.cpp
+++ b/source/designer/zonebar.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/zone.h"
 #include "designer.h"
 #include "zonebar.h"

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index a6644abc0c04c58a58ef141492904f99c977d975..dfc677d46410fcf33f3de7f9e0dfd746470e2d07 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -6,8 +6,8 @@
 #include <msp/core/except.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/gbase/display.h>
-#include <msp/gbase/window.h>
+#include <msp/graphics/display.h>
+#include <msp/graphics/window.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/framebuffer.h>
 #include <msp/gl/matrix.h>
@@ -16,7 +16,7 @@
 #include <msp/gl/tests.h>
 #include <msp/gl/transform.h>
 #include <msp/io/print.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "libr2c2/driver.h"

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 2ec017b8a9363e7ce8929d32c13573ae0c6d172d..907fae01ba268161966ef6425a7ff1788e679355 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -2,7 +2,7 @@
 #define ENGINEER_H_
 
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/light.h>
 #include <msp/gl/lighting.h>

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 3d0b0b874923e495af1fc94676b577268e842422..b29836f50736be1aa94a89ac6e29e10aa668cd50 100644 (file)
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,5 +1,5 @@
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "libr2c2/aicontrol.h"
 #include "libr2c2/timetable.h"
 #include "libr2c2/trackiter.h"

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index f36035f52c31f1e2250f779f560ea0e578336e38..867e0a8d32c1e49c02f6cf1b61e59e9936bdf40e 100644 (file)
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,5 +1,5 @@
 #include <msp/gltk/label.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include "libr2c2/driver.h"
 #include "libr2c2/vehicle.h"

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index 61117f5e5f851ae75501d9872724137d9ca60ce0..58e50ddc7fb9fb3b39109f3a68dceb02fd2e7dd7 100644 (file)
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -1,5 +1,5 @@
 #include <queue>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "layout.h"
 #include "route.h"
 #include "track.h"

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index a6c624c9658f8ec6dc4eb5a59a04e62e5b7dcea1..82c5411378c6e5c0f67277f2e328f3ad56e450f0 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
 #include "catalogue.h"

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 620931dd0b2333bbd3f64be70f78c4d273d63d34..782da37cc305935ff5b5186f0151f7dd432a5cef 100644 (file)
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "aicontrol.h"

diff --git a/source/libr2c2/trainstatus.cpp b/source/libr2c2/trainstatus.cpp
index 5c3ba62e72af429644495a48f09a5ba0c30e54f5..a5f187faa26667294a710b655fcc6ec5999071a9 100644 (file)
--- a/source/libr2c2/trainstatus.cpp
+++ b/source/libr2c2/trainstatus.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "catalogue.h"
 #include "layout.h"
 #include "train.h"
@@ -7,8 +7,6 @@
 
 using namespace Msp;
 
-#include <msp/io/print.h>
-
 namespace R2C2 {
 
 TrainStatus::TrainStatus(Train &t):

diff --git a/source/libr2c2/zone.cpp b/source/libr2c2/zone.cpp
index dc0bf6ec30283a18897aadadce339f1171af94f7..28b178afff15107c470cacf16b2dc9cfb674e63e 100644 (file)
--- a/source/libr2c2/zone.cpp
+++ b/source/libr2c2/zone.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "block.h"
 #include "layout.h"
 #include "track.h"