From ce29d0ccf89840c9581314301de0ea2b5b261c43 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 17 Jan 2013 12:38:09 +0200
Subject: [PATCH] Update #includes that have been renamed, and remove stray
 ones

---
 source/3d/overlay.h                 | 1 -
 source/designer/cameracontroller.h  | 2 +-
 source/designer/designer.cpp        | 4 ++--
 source/designer/designer.h          | 2 +-
 source/designer/manipulator.cpp     | 2 +-
 source/designer/routebar.cpp        | 2 +-
 source/designer/svgexporter.cpp     | 2 +-
 source/designer/zonebar.cpp         | 2 +-
 source/engineer/engineer.cpp        | 6 +++---
 source/engineer/engineer.h          | 2 +-
 source/engineer/trainpanel.cpp      | 2 +-
 source/engineer/trainproperties.cpp | 2 +-
 source/libr2c2/route.cpp            | 2 +-
 source/libr2c2/timetable.cpp        | 2 +-
 source/libr2c2/train.cpp            | 2 +-
 source/libr2c2/trainstatus.cpp      | 4 +---
 source/libr2c2/zone.cpp             | 2 +-
 17 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/source/3d/overlay.h b/source/3d/overlay.h
index d39b30e..7e327c7 100644
--- 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 682b59c..6d5270c 100644
--- 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 76a31a5..230b46f 100644
--- 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 0e7fe45..471bfc7 100644
--- 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 204226e..5f03540 100644
--- 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 2cc9058..66a55d7 100644
--- 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 4cf9ef4..11edf64 100644
--- 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 4925b9e..9f9fd0d 100644
--- 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 a6644ab..dfc677d 100644
--- 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 2ec017b..907fae0 100644
--- 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 3d0b0b8..b29836f 100644
--- 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 f36035f..867e0a8 100644
--- 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 61117f5..58e50dd 100644
--- 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 a6c624c..82c5411 100644
--- 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 620931d..782da37 100644
--- 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 5c3ba62..a5f187f 100644
--- 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 dc0bf6e..28b178a 100644
--- 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"
-- 
2.45.2