diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-02-18 21:16:38 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-02-20 15:35:31 +0000 |
| commit | 2aeeb785bf3f166eb9128b72267605bc6535e17f (patch) | |
| tree | 23001a2d0b1805449f4bfd92916ed04d05381f80 /clang_format_diff | |
| parent | Fix compiling issues (diff) | |
| download | inkscape-2aeeb785bf3f166eb9128b72267605bc6535e17f.tar.gz inkscape-2aeeb785bf3f166eb9128b72267605bc6535e17f.zip | |
Merge from master
Diffstat (limited to 'clang_format_diff')
| -rw-r--r-- | clang_format_diff | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/clang_format_diff b/clang_format_diff new file mode 100644 index 000000000..4984e32cc --- /dev/null +++ b/clang_format_diff @@ -0,0 +1,27 @@ +--- src/ui/dialog/cssdialog.h (before formatting) ++++ src/ui/dialog/cssdialog.h (after formatting) +@@ -63,15 +63,15 @@ + add(attr_color); + add(attr_strike); + add(editable); +- } +- Gtk::TreeModelColumn<bool> deleteButton; +- Gtk::TreeModelColumn<Glib::ustring> label; +- Gtk::TreeModelColumn<Glib::ustring> _styleAttrVal; +- Gtk::TreeModelColumn<Glib::ustring> _styleSheetVal; +- Gtk::TreeModelColumn<Gdk::RGBA> label_color; +- Gtk::TreeModelColumn<Gdk::RGBA> attr_color; +- Gtk::TreeModelColumn<bool> attr_strike; +- Gtk::TreeModelColumn<bool> editable; ++ } ++ Gtk::TreeModelColumn<bool> deleteButton; ++ Gtk::TreeModelColumn<Glib::ustring> label; ++ Gtk::TreeModelColumn<Glib::ustring> _styleAttrVal; ++ Gtk::TreeModelColumn<Glib::ustring> _styleSheetVal; ++ Gtk::TreeModelColumn<Gdk::RGBA> label_color; ++ Gtk::TreeModelColumn<Gdk::RGBA> attr_color; ++ Gtk::TreeModelColumn<bool> attr_strike; ++ Gtk::TreeModelColumn<bool> editable; + }; + CssColumns _cssColumns; + |