Refactor of code, minor bugs fixed.

(bzr r14458)

1 files changed, 18 insertions, 8 deletions

diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 377893f0d..438318bf4 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -89,22 +89,32 @@ public:
     bool has_dilated;
     Geom::Point last_push;
     SPCanvasItem *dilate_area;
-    bool nooverlap;
+    bool no_overlap;
     bool picker;
-    bool pickcenter;
-    bool pickinversevalue;
-    bool pickfill;
-    bool pickstroke;
-    bool picknooverlap;
-    bool overtransparent;
-    bool overnotransparent;
+    bool pick_center;
+    bool pick_inverse_value;
+    bool pick_fill;
+    bool pick_stroke;
+    bool pick_no_overlap;
+    bool over_transparent;
+    bool over_no_transparent;
     double offset;
+    int pick;
+    bool do_trace;
+    bool pick_to_size;
+    bool pick_to_presence;
+    bool pick_to_color;
+    bool pick_to_opacity;
+    bool invert_picked;
+    double gamma_picked;
+    double rand_picked;
     sigc::connection style_set_connection;
 
     static const std::string prefsPath;
 
     virtual void setup();
     virtual void set(const Inkscape::Preferences::Entry& val);
+    virtual void setCloneTilerPrefs();
     virtual bool root_handler(GdkEvent* event);
 
     virtual const std::string& getPrefsPath();