Header updates

diff --git a/source/gbase/display.cpp b/source/gbase/display.cpp
index 10e86fa064503c20a888216dee32aa0cf88bb08a..6ae2906f42cbf903bbe4e2c20b90e4a2e5cb6e1e 100644 (file)
--- a/source/gbase/display.cpp
+++ b/source/gbase/display.cpp
@@ -6,7 +6,7 @@
 #endif
 #endif
 #include <msp/core/except.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include "display.h"
 #include "window.h"

diff --git a/source/input/keyboard.cpp b/source/input/keyboard.cpp
index fff0678441786d7610a8a1e6c23dae1d85d441b8..344048e802b43638df33ba97a4bd0f9059e7e869 100644 (file)
--- a/source/input/keyboard.cpp
+++ b/source/input/keyboard.cpp
@@ -3,8 +3,8 @@
 #else
 #include <X11/Xlib.h>
 #endif
-#include <msp/strings/formatter.h>
-#include "../gbase/display.h"
+#include <msp/gbase/display.h>
+#include <msp/strings/format.h>
 #include "keyboard.h"
 #include "keys.h"
 

diff --git a/source/input/keyboard.h b/source/input/keyboard.h
index 56aa5c00921390f4cc13f4c74dffa31b03d1f0a8..eaca0175c6284bba7584b992c5a2940558ec55b3 100644 (file)
--- a/source/input/keyboard.h
+++ b/source/input/keyboard.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GBASE_KEYBOARD_H_
 #define MSP_GBASE_KEYBOARD_H_
 
+#include <msp/gbase/window.h>
 #include "device.h"
-#include "../gbase/window.h"
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/mouse.cpp b/source/input/mouse.cpp
index 1c2bc8992521811d74b0cd8ba597592d09cbe254..37ace5661dafa7915b150b2491d84a77a95b1467 100644 (file)
--- a/source/input/mouse.cpp
+++ b/source/input/mouse.cpp
@@ -1,4 +1,4 @@
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "mouse.h"
 
 namespace Msp {

diff --git a/source/input/mouse.h b/source/input/mouse.h
index 50681c11954b03b9c0d7b51f751b87f5a29f87cb..eb5e9d61a4a1da49fda275a4b0b3e21bcdeb1ae7 100644 (file)
--- a/source/input/mouse.h
+++ b/source/input/mouse.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GBASE_MOUSE_H_
 #define MSP_GBASE_MOUSE_H_
 
+#include <msp/gbase/window.h>
 #include "device.h"
-#include "../gbase/window.h"
 
 namespace Msp {
 namespace Input {