Associate categories and appearances at filter level

[poefilter.git] / source / appearance.h

diff --git a/source/appearance.h b/source/appearance.h
index a522796c663270469e4692a2bed9ecfa405797b0..41350744234f877b84b7d7142bc114792ee361f2 100644 (file)
--- a/source/appearance.h
+++ b/source/appearance.h
@@ -1,9 +1,11 @@
 #ifndef APPEARANCE_H_
 #define APPEARANCE_H_
 
+#include <list>
 #include <msp/datafile/objectloader.h>
 #include "color.h"
 
+class FilterStatement;
 class Theme;
 
 class Appearance
@@ -12,10 +14,10 @@ public:
        class Loader: public Msp::DataFile::ObjectLoader<Appearance>
        {
        private:
-               const Theme &theme;
+               const Theme *theme;
 
        public:
-               Loader(Appearance &, const Theme &);
+               Loader(Appearance &, const Theme * = 0);
 
                void background_color(unsigned, unsigned, unsigned);
                void background_color_named(const std::string &);
@@ -37,12 +39,16 @@ private:
 public:
        Appearance();
 
+       void merge_from(const Appearance &);
+
        unsigned get_font_size() const { return font_size; }
        const Color &get_border_color() const { return border_color; }
        const Color &get_background_color() const { return background_color; }
        const Color &get_text_color() const { return text_color; }
        unsigned get_sound_type() const { return sound_type; }
        unsigned get_sound_volume() const { return sound_volume; }
+
+       void add_lines(FilterStatement &) const;
 };
 
 #endif