summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-02-23 12:53:54 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-02-23 12:53:54 +0000
commit02bf327fc775c0e552dc7328b76e9d87b8605fc7 (patch)
tree680dda6870ce2af20655f7426b22c3867208b39c
parentRemov force allocation (diff)
downloadinkscape-02bf327fc775c0e552dc7328b76e9d87b8605fc7.tar.gz
inkscape-02bf327fc775c0e552dc7328b76e9d87b8605fc7.zip
fix building
-rw-r--r--clang_format_diff27
-rw-r--r--po/POTFILES.in1
2 files changed, 0 insertions, 28 deletions
diff --git a/clang_format_diff b/clang_format_diff
deleted file mode 100644
index 4984e32cc..000000000
--- a/clang_format_diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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;
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f8670010e..4d4637b74 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -273,7 +273,6 @@ src/ui/dialog/svg-fonts-dialog.cpp
src/ui/dialog/svg-preview.cpp
src/ui/dialog/swatches.cpp
src/ui/dialog/symbols.cpp
-src/ui/dialog/tags.cpp
src/ui/dialog/template-load-tab.cpp
src/ui/dialog/template-widget.cpp
src/ui/dialog/text-edit.cpp