[Wesnoth-commits] r25596 - in /trunk/src/gui/widgets: canvas.cpp canvas.hpp

[koraq]

Author: mordante
Date: Sat Apr  5 21:58:11 2008
New Revision: 25596

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25596&view=rev
Log:
Let the canvas use configs instead of vconfigs since we use the formula
system for variables. So the $foo based variables of vconfig aren't used.

Modified:
    trunk/src/gui/widgets/canvas.cpp
    trunk/src/gui/widgets/canvas.hpp

Modified: trunk/src/gui/widgets/canvas.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/canvas.cpp?rev=25596&r1=25595&r2=25596&view=diff
==============================================================================
--- trunk/src/gui/widgets/canvas.cpp (original)
+++ trunk/src/gui/widgets/canvas.cpp Sat Apr  5 21:58:11 2008
@@ -24,7 +24,6 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "serialization/parser.hpp"
-#include "variable.hpp"
 #include "wml_exception.hpp"
 
 #include <algorithm>
@@ -199,7 +198,7 @@
                        cfg.ordered_begin(); itor != cfg.ordered_end(); ++itor) 
{
 
                const std::string& type = *((*itor).first);;
-               const vconfig data(&(*((*itor).second)));
+               const config& data = *((*itor).second);
 
                DBG_G_P << "Canvas: found shape of the type " << type << ".\n";
 
@@ -296,7 +295,7 @@
        }
 }
 
-tcanvas::tline::tline(const vconfig& cfg) :
+tcanvas::tline::tline(const config& cfg) :
        x1_(0),
        y1_(0),
        x2_(0),
@@ -445,7 +444,7 @@
        
 }
 
-tcanvas::trectangle::trectangle(const vconfig& cfg) :
+tcanvas::trectangle::trectangle(const config& cfg) :
        x_(0),
        y_(0),
        w_(0),
@@ -584,7 +583,7 @@
 */     
 }
 
-tcanvas::timage::timage(const vconfig& cfg) :
+tcanvas::timage::timage(const config& cfg) :
        src_clip_(),
        dst_clip_(),
        image_()
@@ -618,7 +617,7 @@
        SDL_BlitSurface(image_, &src_clip, canvas, &dst_clip);
 }
 
-tcanvas::ttext::ttext(const vconfig& cfg) :
+tcanvas::ttext::ttext(const config& cfg) :
        x_(0),
        y_(0),
        w_(0),

Modified: trunk/src/gui/widgets/canvas.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/canvas.hpp?rev=25596&r1=25595&r2=25596&view=diff
==============================================================================
--- trunk/src/gui/widgets/canvas.hpp (original)
+++ trunk/src/gui/widgets/canvas.hpp Sat Apr  5 21:58:11 2008
@@ -31,7 +31,6 @@
 
 class config;
 class surface;
-class vconfig;
 
 namespace gui2 {
 
@@ -73,7 +72,7 @@
        class tline : public tshape
        {
        public:
-               tline(const vconfig& cfg);
+               tline(const config& cfg);
 
                //! Implement shape::draw().
                void draw(surface& canvas,
@@ -101,7 +100,7 @@
        class trectangle : public tshape
        {
        public:
-               trectangle(const vconfig& cfg);
+               trectangle(const config& cfg);
 
                //! Implement shape::draw().
                void draw(surface& canvas,
@@ -129,7 +128,7 @@
        class timage : public tshape
        {
        public:
-               timage(const vconfig& cfg);
+               timage(const config& cfg);
                
                //! Implement shape::draw().
                void draw(surface& canvas,
@@ -145,7 +144,7 @@
        class ttext : public tshape
        {
        public:
-               ttext(const vconfig& cfg);
+               ttext(const config& cfg);
                
                //! Implement shape::draw().
                void draw(surface& canvas,


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits