diff options
Diffstat (limited to 'src/widgets')
24 files changed, 36 insertions, 36 deletions
diff --git a/src/widgets/arc-toolbar.cpp b/src/widgets/arc-toolbar.cpp index 5569780e7..69b540762 100644 --- a/src/widgets/arc-toolbar.cpp +++ b/src/widgets/arc-toolbar.cpp @@ -56,7 +56,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-ellipse.h" #include "../mod360.h" diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp index 91d4ebdec..32516bbfb 100644 --- a/src/widgets/box3d-toolbar.cpp +++ b/src/widgets/box3d-toolbar.cpp @@ -58,9 +58,9 @@ #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" -#include "../box3d-context.h" +#include "ui/tools/box3d-tool.h" #include "../box3d.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp index 12228ce56..9f08d3462 100644 --- a/src/widgets/calligraphy-toolbar.cpp +++ b/src/widgets/calligraphy-toolbar.cpp @@ -57,7 +57,7 @@ #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" using Inkscape::UI::UXManager; using Inkscape::DocumentUndo; diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp index 32a6e8fb9..7230f521c 100644 --- a/src/widgets/connector-toolbar.cpp +++ b/src/widgets/connector-toolbar.cpp @@ -55,10 +55,10 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-namedview.h" #include "../conn-avoid-ref.h" -#include "../connector-context.h" +#include "ui/tools/connector-tool.h" #include "../graphlayout.h" #include "../sp-path.h" diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 3ca433586..7e254cdcd 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -27,7 +27,7 @@ #include <2geom/rect.h> #include "ui/dialog/dialog-manager.h" -#include "box3d-context.h" +#include "ui/tools/box3d-tool.h" #include "cms-system.h" #include "conn-avoid-ref.h" #include "desktop.h" diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp index 054955d8f..991489b86 100644 --- a/src/widgets/dropper-toolbar.cpp +++ b/src/widgets/dropper-toolbar.cpp @@ -54,7 +54,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../tools-switch.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 1af574ed6..5e09521c9 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -55,7 +55,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index a9122e54b..f02185a15 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -35,7 +35,7 @@ #include "desktop-handles.h" #include <glibmm/i18n.h> -#include "gradient-context.h" +#include "ui/tools/gradient-tool.h" #include "gradient-drag.h" #include "sp-linear-gradient.h" #include "sp-radial-gradient.h" @@ -54,7 +54,7 @@ #include "svg/css-ostringstream.h" #include "svg/svg-color.h" #include "desktop-style.h" -#include "gradient-context.h" +#include "ui/tools/gradient-tool.h" #include "gradient-toolbar.h" #include "toolbox.h" diff --git a/src/widgets/lpe-toolbar.cpp b/src/widgets/lpe-toolbar.cpp index 9fdb7b036..559f3fc3c 100644 --- a/src/widgets/lpe-toolbar.cpp +++ b/src/widgets/lpe-toolbar.cpp @@ -59,12 +59,12 @@ #include "../helper/action-context.h" #include "util/units.h" #include "ui/widget/unit-tracker.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-namedview.h" #include "../tools-switch.h" #include "../live_effects/effect.h" #include "../live_effects/lpe-angle_bisector.h" -#include "../lpe-tool-context.h" +#include "ui/tools/lpe-tool.h" using Inkscape::UI::Widget::UnitTracker; using Inkscape::Util::Unit; diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp index 58244566d..a75dd7600 100644 --- a/src/widgets/measure-toolbar.cpp +++ b/src/widgets/measure-toolbar.cpp @@ -52,7 +52,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-namedview.h" #include "ui/widget/unit-tracker.h" diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp index 926a42f90..15dda94f0 100644 --- a/src/widgets/mesh-toolbar.cpp +++ b/src/widgets/mesh-toolbar.cpp @@ -41,7 +41,7 @@ #include "desktop-handles.h" #include <glibmm/i18n.h> -#include "gradient-context.h" +#include "ui/tools/gradient-tool.h" #include "gradient-drag.h" #include "sp-mesh-gradient.h" #include "gradient-chemistry.h" @@ -59,7 +59,7 @@ #include "svg/css-ostringstream.h" #include "svg/svg-color.h" #include "desktop-style.h" -#include "gradient-context.h" +#include "ui/tools/gradient-tool.h" #include "toolbox.h" diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp index 8d24fdf82..6a0968424 100644 --- a/src/widgets/node-toolbar.cpp +++ b/src/widgets/node-toolbar.cpp @@ -55,12 +55,12 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/tool/control-point-selection.h" -#include "../ui/tool/node-tool.h" +#include "ui/tools/node-tool.h" #include "../ui/tool/multi-path-manipulator.h" #include "../ui/icon-names.h" #include "util/units.h" #include "ui/widget/unit-tracker.h" -#include "../lpe-tool-context.h" +#include "ui/tools/lpe-tool.h" #include "../sp-namedview.h" using Inkscape::UI::Widget::UnitTracker; diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp index e0d406c04..8c4de2b32 100644 --- a/src/widgets/paintbucket-toolbar.cpp +++ b/src/widgets/paintbucket-toolbar.cpp @@ -56,9 +56,9 @@ #include "../ui/icon-names.h" #include "util/units.h" #include "ui/widget/unit-tracker.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-namedview.h" -#include "../flood-context.h" +#include "ui/tools/flood-tool.h" #include <gtk/gtk.h> diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index a70cb0d28..d9d53117c 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -63,11 +63,11 @@ #include "ui/uxmanager.h" //#include "../ui/tool/control-point-selection.h" -//#include "../ui/tool/node-tool.h" +//#include "ui/tools/node-tool.h" //#include "../ui/tool/multi-path-manipulator.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" //#include "../sp-namedview.h" #include "../tools-switch.h" diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp index 0287a9aeb..f5a509db3 100644 --- a/src/widgets/rect-toolbar.cpp +++ b/src/widgets/rect-toolbar.cpp @@ -55,7 +55,7 @@ #include "../ui/icon-names.h" #include "util/units.h" #include "ui/widget/unit-tracker.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-namedview.h" #include "../sp-rect.h" diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index 8b42f4ae1..e081f98e0 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -39,7 +39,7 @@ #include "color-profile.h" #include "cms-system.h" #include "tools-switch.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" using Inkscape::CMSSystem; diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index ac5f0040d..0280694f6 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -18,7 +18,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include "../event-context.h" +#include "ui/tools/tool-base.h" #include "sp-widget.h" #include "widget-sizes.h" diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp index b4e8e68a7..6b10bfce9 100644 --- a/src/widgets/spiral-toolbar.cpp +++ b/src/widgets/spiral-toolbar.cpp @@ -53,7 +53,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-spiral.h" using Inkscape::UI::UXManager; diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp index 247df53e2..2a8c85475 100644 --- a/src/widgets/spray-toolbar.cpp +++ b/src/widgets/spray-toolbar.cpp @@ -52,8 +52,8 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" -#include "../spray-context.h" +#include "ui/tools/pen-tool.h" +#include "ui/tools/spray-tool.h" using Inkscape::UI::UXManager; using Inkscape::DocumentUndo; diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp index 9e26988ff..bac0271db 100644 --- a/src/widgets/star-toolbar.cpp +++ b/src/widgets/star-toolbar.cpp @@ -53,7 +53,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-star.h" diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index a9d29ae98..750fa1de6 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -56,7 +56,7 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" +#include "ui/tools/pen-tool.h" #include "../sp-namedview.h" #include "../svg/css-ostringstream.h" #include "../sp-flowtext.h" @@ -64,7 +64,7 @@ #include "../style.h" #include "../libnrtype/font-lister.h" #include "../libnrtype/font-instance.h" -#include "../text-context.h" +#include "ui/tools/text-tool.h" #include "../text-editing.h" #include "widgets/font-selector.h" diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 528451304..9f64f6336 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -96,7 +96,7 @@ #include "toolbox.h" #include <gtk/gtk.h> -#include "event-context.h" +#include "ui/tools/tool-base.h" //#define DEBUG_TEXT diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp index c828373d7..6999b057d 100644 --- a/src/widgets/tweak-toolbar.cpp +++ b/src/widgets/tweak-toolbar.cpp @@ -52,8 +52,8 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" -#include "../tweak-context.h" +#include "ui/tools/pen-tool.h" +#include "ui/tools/tweak-tool.h" using Inkscape::UI::UXManager; using Inkscape::DocumentUndo; diff --git a/src/widgets/zoom-toolbar.cpp b/src/widgets/zoom-toolbar.cpp index 9cdbc3d6a..a5ab6e211 100644 --- a/src/widgets/zoom-toolbar.cpp +++ b/src/widgets/zoom-toolbar.cpp @@ -51,8 +51,8 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../pen-context.h" -#include "../tweak-context.h" +#include "ui/tools/pen-tool.h" +#include "ui/tools/tweak-tool.h" using Inkscape::UI::UXManager; |