summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-10-01 00:18:45 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-10-01 22:50:13 +0000
commit848e80d0a4f15b0860e9aeac822f1c2121debce3 (patch)
treebd5ae746e583ce614eacc273a9bd96cf1c49f836 /src/object
parentRemove #include "config.h" wherever possible (diff)
downloadinkscape-848e80d0a4f15b0860e9aeac822f1c2121debce3.tar.gz
inkscape-848e80d0a4f15b0860e9aeac822f1c2121debce3.zip
Move macros.h and remove unneeded macros
Diffstat (limited to 'src/object')
-rw-r--r--src/object/box3d.cpp2
-rw-r--r--src/object/filters/componenttransfer-funcnode.cpp3
-rw-r--r--src/object/filters/distantlight.cpp3
-rw-r--r--src/object/filters/pointlight.cpp2
-rw-r--r--src/object/filters/spotlight.cpp2
-rw-r--r--src/object/sp-filter.cpp2
6 files changed, 1 insertions, 13 deletions
diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp
index 7d4074b64..79779d713 100644
--- a/src/object/box3d.cpp
+++ b/src/object/box3d.cpp
@@ -34,7 +34,7 @@
#include "desktop.h"
-#include "macros.h"
+#include "include/macros.h"
static void box3d_ref_changed(SPObject *old_ref, SPObject *ref, SPBox3D *box);
diff --git a/src/object/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp
index 5fb454075..f45f96958 100644
--- a/src/object/filters/componenttransfer-funcnode.cpp
+++ b/src/object/filters/componenttransfer-funcnode.cpp
@@ -22,9 +22,6 @@
#include "xml/repr.h"
#include "helper-fns.h"
-#define SP_MACROS_SILENT
-
-
/* FeFuncNode class */
SPFeFuncNode::SPFeFuncNode(SPFeFuncNode::Channel channel)
: SPObject(), type(Inkscape::Filters::COMPONENTTRANSFER_TYPE_IDENTITY),
diff --git a/src/object/filters/distantlight.cpp b/src/object/filters/distantlight.cpp
index 382cba4eb..32f50c754 100644
--- a/src/object/filters/distantlight.cpp
+++ b/src/object/filters/distantlight.cpp
@@ -25,9 +25,6 @@
#include "xml/repr.h"
-#define SP_MACROS_SILENT
-
-
SPFeDistantLight::SPFeDistantLight()
: SPObject(), azimuth(0), azimuth_set(FALSE), elevation(0), elevation_set(FALSE) {
}
diff --git a/src/object/filters/pointlight.cpp b/src/object/filters/pointlight.cpp
index 8c8101356..640db877e 100644
--- a/src/object/filters/pointlight.cpp
+++ b/src/object/filters/pointlight.cpp
@@ -27,8 +27,6 @@
#include "xml/node.h"
#include "xml/repr.h"
-#define SP_MACROS_SILENT
-
SPFePointLight::SPFePointLight()
: SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE) {
}
diff --git a/src/object/filters/spotlight.cpp b/src/object/filters/spotlight.cpp
index 9d911047a..1df720722 100644
--- a/src/object/filters/spotlight.cpp
+++ b/src/object/filters/spotlight.cpp
@@ -23,8 +23,6 @@
#include "xml/repr.h"
-#define SP_MACROS_SILENT
-
SPFeSpotLight::SPFeSpotLight()
: SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE), pointsAtX(0), pointsAtX_set(FALSE),
pointsAtY(0), pointsAtY_set(FALSE), pointsAtZ(0), pointsAtZ_set(FALSE),
diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp
index 3c6533892..fa39f5486 100644
--- a/src/object/sp-filter.cpp
+++ b/src/object/sp-filter.cpp
@@ -32,8 +32,6 @@
using std::map;
using std::pair;
-#define SP_MACROS_SILENT
-
static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter);
static void filter_ref_modified(SPObject *href, guint flags, SPFilter *filter);