summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-10-05 16:58:19 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-10-05 16:58:19 +0000
commit9a0740b27fcad7f06bae507e1957f4bfeb4f9dc7 (patch)
tree8ae4f0148d2bd4901c97ac94244cb413c09a22a8 /src
parentMove obvious ui component to ui/ (diff)
downloadinkscape-9a0740b27fcad7f06bae507e1957f4bfeb4f9dc7.tar.gz
inkscape-9a0740b27fcad7f06bae507e1957f4bfeb4f9dc7.zip
Rename marker.cpp -> sp-marker.cpp to reflect inclusion in SP-tree
(bzr r13341.1.248)
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_insert2
-rw-r--r--src/extension/internal/cairo-renderer.cpp2
-rw-r--r--src/helper/stock-items.cpp2
-rw-r--r--src/selection-chemistry.cpp2
-rw-r--r--src/sp-marker.cpp (renamed from src/marker.cpp)2
-rw-r--r--src/sp-marker.h (renamed from src/marker.h)0
-rw-r--r--src/sp-shape.cpp2
-rw-r--r--src/splivarot.cpp2
-rw-r--r--src/widgets/stroke-marker-selector.cpp2
-rw-r--r--src/widgets/stroke-style.h2
10 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile_insert b/src/Makefile_insert
index 47ea28ebc..f8f0ac122 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -85,7 +85,6 @@ ink_common_sources += \
line-snapper.cpp line-snapper.h \
macros.h \
main-cmdlineact.cpp main-cmdlineact.h \
- marker.cpp marker.h \
media.cpp media.h \
menus-skeleton.h \
message-context.cpp message-context.h \
@@ -167,6 +166,7 @@ ink_common_sources += \
sp-line.cpp sp-line.h \
splivarot.cpp splivarot.h \
sp-lpe-item.cpp sp-lpe-item.h \
+ sp-marker.cpp sp-marker.h \
sp-marker-loc.h \
sp-mask.cpp sp-mask.h \
sp-metadata.cpp sp-metadata.h \
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 0fec68c06..8196e34fb 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -42,7 +42,7 @@
#include "sp-item.h"
#include "sp-item-group.h"
#include "style.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "sp-linear-gradient.h"
#include "sp-radial-gradient.h"
#include "sp-root.h"
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index a12fa377a..582dcd2a8 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -28,7 +28,7 @@
#include "sp-gradient.h"
#include "document-private.h"
#include "sp-pattern.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "desktop-handles.h"
#include "inkscape.h"
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 956e1719c..b87bc421f 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -41,7 +41,7 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
#include "desktop-handles.h"
#include "message-stack.h"
#include "sp-item-transform.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "sp-use.h"
#include "sp-textpath.h"
#include "sp-tspan.h"
diff --git a/src/marker.cpp b/src/sp-marker.cpp
index a4cbc30ca..e955594ab 100644
--- a/src/marker.cpp
+++ b/src/sp-marker.cpp
@@ -24,7 +24,7 @@
#include "display/drawing-group.h"
#include "xml/repr.h"
#include "attributes.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "document.h"
#include "document-private.h"
#include "preferences.h"
diff --git a/src/marker.h b/src/sp-marker.h
index b58523251..b58523251 100644
--- a/src/marker.h
+++ b/src/sp-marker.h
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index d76bd9780..2259088ba 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -35,7 +35,7 @@
#include "print.h"
#include "document.h"
#include "style.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "sp-path.h"
#include "preferences.h"
#include "attributes.h"
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 8bb2a7150..1a75a6f29 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -25,7 +25,7 @@
#include "sp-path.h"
#include "sp-shape.h"
#include "sp-image.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "enums.h"
#include "sp-text.h"
#include "sp-flowtext.h"
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 29c342f21..e80e01c22 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -31,7 +31,7 @@
#include "preferences.h"
#include "path-prefix.h"
#include "io/sys.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "sp-defs.h"
#include "sp-root.h"
#include "ui/cache/svg_preview_cache.h"
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 464e7d2d1..15e394097 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -44,7 +44,7 @@
#include "helper/stock-items.h"
#include "inkscape.h"
#include "io/sys.h"
-#include "marker.h"
+#include "sp-marker.h"
#include "preferences.h"
#include "path-prefix.h"
#include "selection.h"