Change mspparser -> mspdatafile

[libs/gltk.git] / source / graphic.h

diff --git a/source/graphic.h b/source/graphic.h
index 16d8cf406a006096e95fc31778136e6996384d2a..912786ce380f195fd173460d3406ed8087eec4ee 100644 (file)
--- a/source/graphic.h
+++ b/source/graphic.h
@@ -2,7 +2,7 @@
 #define MSP_GLTK_GRAPHIC_H_
 
 #include <msp/gl/texture2d.h>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "geometry.h"
 
 namespace Msp {
@@ -13,7 +13,7 @@ class Resources;
 class Graphic
 {
 public:
-       class Loader: public Parser::Loader
+       class Loader: public DataFile::Loader
        {
        public:
                Loader(Graphic &);
@@ -26,25 +26,6 @@ public:
                void shadow();
        };
 
-       struct Sides
-       {
-               class Loader: public Parser::Loader
-               {
-               public:
-                       Loader(Sides &);
-                       Sides &get_object() { return sides; }
-               private:
-                       Sides &sides;
-               };
-
-               unsigned top;
-               unsigned right;
-               unsigned bottom;
-               unsigned left;
-
-               Sides();
-       };
-
        Graphic(const Resources &, const std::string &);
        const Sides &get_border() const { return border; }
        const Sides &get_shadow() const { return shadow; }