diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
| commit | 73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch) | |
| tree | 75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/widgets | |
| parent | Merged from trunk (r12419). (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip | |
Merge from trunk (r12439).
(bzr r11608.1.108)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/widgets/Makefile_insert | 4 | ||||
| -rw-r--r-- | src/widgets/eraser-toolbar.cpp (renamed from src/widgets/erasor-toolbar.cpp) | 2 | ||||
| -rw-r--r-- | src/widgets/eraser-toolbar.h (renamed from src/widgets/erasor-toolbar.h) | 0 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 19410ee1d..fe4433153 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -6,7 +6,7 @@ set(widgets_SRC calligraphy-toolbar.cpp connector-toolbar.cpp dropper-toolbar.cpp - erasor-toolbar.cpp + eraser-toolbar.cpp lpe-toolbar.cpp measure-toolbar.cpp mesh-toolbar.cpp @@ -62,7 +62,7 @@ set(widgets_SRC calligraphy-toolbar.h connector-toolbar.h dropper-toolbar.h - erasor-toolbar.h + eraser-toolbar.h lpe-toolbar.h measure-toolbar.h mesh-toolbar.h diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 46f0bd645..97713cbee 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -21,8 +21,8 @@ ink_common_sources += \ widgets/eek-preview.h \ widgets/ege-paint-def.cpp \ widgets/ege-paint-def.h \ - widgets/erasor-toolbar.cpp \ - widgets/erasor-toolbar.h \ + widgets/eraser-toolbar.cpp \ + widgets/eraser-toolbar.h \ widgets/fill-style.cpp \ widgets/fill-style.h \ widgets/fill-n-stroke-factory.h \ diff --git a/src/widgets/erasor-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 2e074490d..aca960c00 100644 --- a/src/widgets/erasor-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -31,7 +31,7 @@ #include "ui/widget/spinbutton.h" #include <glibmm/i18n.h> #include "toolbox.h" -#include "erasor-toolbar.h" +#include "eraser-toolbar.h" #include "calligraphy-toolbar.h" #include "../desktop.h" diff --git a/src/widgets/erasor-toolbar.h b/src/widgets/eraser-toolbar.h index b1bb3a3fa..b1bb3a3fa 100644 --- a/src/widgets/erasor-toolbar.h +++ b/src/widgets/eraser-toolbar.h diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 0b47b1e15..a3cd151ff 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -79,7 +79,7 @@ #include "calligraphy-toolbar.h" #include "connector-toolbar.h" #include "dropper-toolbar.h" -#include "erasor-toolbar.h" +#include "eraser-toolbar.h" #include "gradient-toolbar.h" #include "lpe-toolbar.h" #include "mesh-toolbar.h" |