remove lib/content

[enigma2.git] / lib / gdi / gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index 0d123b3fe526823753ef13e8bf0210e00409046c..9dd170ac49be822a6936b07dbd895bb68720277c 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -2,7 +2,7 @@
 #define __gpixmap_h
 
 #include <pthread.h>
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/object.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
@@ -87,12 +87,12 @@ struct gLookup
  * The font is specified by a name and a size.
  * \c gFont is part of the \ref gdi.
  */
-class gFont: public virtual iObject
+class gFont: public iObject
 {
 DECLARE_REF;
 public:
 
-       eString family;
+       std::string family;
        int pointSize;
        
        /**
@@ -100,7 +100,7 @@ public:
         * \param family The name of the font, for example "NimbusSansL-Regular Sans L Regular".
         * \param pointSize the size of the font in PIXELS.
         */
-       gFont(const eString &family, int pointSize):
+       gFont(const std::string &family, int pointSize):
                        family(family), pointSize(pointSize)
        {
        }