ustring seems to be working! yay!

[chaz/openbox] / otk / font.cc

diff --git a/otk/font.cc b/otk/font.cc
index 6932971c1c3ca6c9cb83d8793d1b3616a7dcdf12..6fbdb0957f1d7dddf9622028aeb8afc2edde4e00 100644 (file)
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -10,7 +10,11 @@ extern "C" {
 #endif // HAVE_STDLIB_H
 }
 
+#include <iostream>
+#include <algorithm>
+
 #include "font.hh"
+#include "util.hh"
 #include "display.hh"
 #include "color.hh"
 #include "screeninfo.hh"
@@ -78,7 +82,7 @@ Font::~Font(void)
 
 
 void Font::drawString(XftDraw *d, int x, int y, const Color &color,
-                       const userstring &string) const
+                       const ustring &string) const
 {
   assert(d);
 
@@ -118,7 +122,7 @@ void Font::drawString(XftDraw *d, int x, int y, const Color &color,
 }
 
 
-unsigned int Font::measureString(const userstring &string) const
+unsigned int Font::measureString(const ustring &string) const
 {
   XGlyphInfo info;