diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-07-05 16:01:13 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-07-05 16:01:13 +0000 |
| commit | 962ef8a02c2dbaf2049c1951ec8953ba885f9e19 (patch) | |
| tree | fccc91081bfaf776d3845897c1de695f457984a9 | |
| parent | Put correctly doubles in a function (diff) | |
| download | inkscape-962ef8a02c2dbaf2049c1951ec8953ba885f9e19.tar.gz inkscape-962ef8a02c2dbaf2049c1951ec8953ba885f9e19.zip | |
Fix FTBFS gtk3 & make check
(bzr r13341.1.78)
| -rw-r--r-- | po/POTFILES.in | 3 | ||||
| -rw-r--r-- | src/live_effects/parameter/filletchamferpointarray.cpp | 11 | ||||
| -rw-r--r-- | src/ui/dialog/lpe-fillet-chamfer-properties.h | 10 |
3 files changed, 11 insertions, 13 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 779009eb6..53c7da88d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -147,6 +147,8 @@ src/live_effects/lpe-skeleton.cpp src/live_effects/lpe-sketch.cpp src/live_effects/lpe-vonkoch.cpp src/live_effects/lpe-envelope-perspective.cpp +src/live_effects/lpe-fillet-chamfer.cpp +src/live_effects/parameter/filletchamferpointarray.cpp src/live_effects/parameter/pointreseteable.cpp src/live_effects/parameter/togglebutton.cpp src/live_effects/parameter/bool.cpp @@ -231,6 +233,7 @@ src/ui/dialog/layer-properties.cpp src/ui/dialog/layers.cpp src/ui/dialog/livepatheffect-add.cpp src/ui/dialog/livepatheffect-editor.cpp +src/ui/dialog/lpe-fillet-chamfer-properties.cpp src/ui/dialog/memory.cpp src/ui/dialog/messages.cpp src/ui/dialog/new-from-template.cpp diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp index 94a26dd8d..457b68dd2 100644 --- a/src/live_effects/parameter/filletchamferpointarray.cpp +++ b/src/live_effects/parameter/filletchamferpointarray.cpp @@ -8,6 +8,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <2geom/piecewise.h> +#include <2geom/sbasis-to-bezier.h> +#include <2geom/sbasis-geometric.h> + #include "ui/dialog/lpe-fillet-chamfer-properties.h" #include "live_effects/parameter/filletchamferpointarray.h" #include "live_effects/effect.h" @@ -15,9 +19,6 @@ #include "svg/stringstream.h" #include "knotholder.h" #include "sp-lpe-item.h" -#include <2geom/piecewise.h> -#include <2geom/sbasis-to-bezier.h> -#include <2geom/sbasis-geometric.h> #include "selection.h" // needed for on-canvas editting: @@ -25,8 +26,10 @@ #include "live_effects/lpeobject.h" #include "helper/geom-nodetype.h" #include "helper/geom-curves.h" -#include <cmath> #include "ui/tools/node-tool.h" + +// TODO due to internal breakage in glibmm headers, +// this has to be included last. #include <glibmm/i18n.h> using namespace Geom; diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h index a07b5ab66..d3e859bff 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.h +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h @@ -9,15 +9,7 @@ #define INKSCAPE_DIALOG_FILLET_CHAMFER_PROPERTIES_H #include <2geom/point.h> -#include <gtkmm/dialog.h> -#include <gtkmm/entry.h> -#include <gtkmm/label.h> -#include <gtkmm/table.h> -#include <gtkmm/combobox.h> -#include <gtkmm/liststore.h> -#include <gtkmm/treeview.h> -#include <gtkmm/treestore.h> -#include <gtkmm/scrolledwindow.h> +#include <gtkmm.h> #include "live_effects/parameter/filletchamferpointarray.h" class SPDesktop; |