From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 24 Aug 2011 09:48:28 +0000 (+0300)
Subject: Header updates
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=dce7552c5e2f64fcf5f58b0c934bb4a01f6cbcf7;p=libs%2Fgui.git

Header updates
---

diff --git a/source/gbase/display.cpp b/source/gbase/display.cpp
index 10e86fa..6ae2906 100644
--- 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 fff0678..344048e 100644
--- 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 56aa5c0..eaca017 100644
--- 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 1c2bc89..37ace56 100644
--- 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 50681c1..eb5e9d6 100644
--- 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 {