diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-07-17 13:53:18 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-07-17 13:53:18 +0000 |
| commit | 10067e713619333f20201c7d01c99e302464f6b2 (patch) | |
| tree | dba02600760724653c45c48b36c414a247bca456 /src/widgets/desktop-widget.cpp | |
| parent | Fixed botched merge. (diff) | |
| download | inkscape-10067e713619333f20201c7d01c99e302464f6b2.tar.gz inkscape-10067e713619333f20201c7d01c99e302464f6b2.zip | |
Port remaining files away from "helper/unit-tracker.h".
(bzr r12380.1.19)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index fbef9bbce..1c6852f35 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -43,8 +43,8 @@ #include "file.h" #include "helper/action.h" #include "helper/action-context.h" -#include "helper/units.h" -#include "helper/unit-tracker.h" +#include "util/units.h" +#include "ui/widget/unit-tracker.h" #include "inkscape-private.h" #include "interface.h" #include "macros.h" @@ -79,7 +79,7 @@ using Inkscape::round; #endif -using Inkscape::UnitTracker; +using Inkscape::UI::Widget::UnitTracker; using Inkscape::UI::UXManager; using Inkscape::UI::ToolboxFactory; using ege::AppearTimeTracker; @@ -1780,7 +1780,7 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags) if (tracker == NULL) // it's null when inkscape is first opened continue; - // tracker->setActiveUnit( nv->doc_units ); + tracker->setActiveUnit( nv->doc_units ); } // grandchildren } // if child is a container } // children |