index 8e65593c1aef7c2f10ba598941da3d5034aa7b61..5b5011381a41fd18758d3bd9a6e3bdd30a41589c 100644 (file)
--- a/src/sp-use-reference.cpp
+++ b/src/sp-use-reference.cpp
* Released under GNU GPL, read the file 'COPYING' for more information.
*/
+#include <cstring>
+#include <string>
+#include <string.h>
+
#include "enums.h"
#include "sp-use-reference.h"
sourceHref = NULL;
sourceRepr = NULL;
sourceObject = NULL;
- new (&_modified_connection) sigc::connection();
- new (&_delete_connection) sigc::connection();
- new (&_changed_connection) sigc::connection();
- new (&_transformed_connection) sigc::connection();
_changed_connection = changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_usepath_href_changed), this)); // listening to myself, this should be virtual instead
user_unlink = NULL;
quit_listening();
unlink();
-
- _modified_connection.~connection();
- _delete_connection.~connection();
- _changed_connection.~connection();
- _transformed_connection.~connection();
}
void
@@ -152,6 +147,7 @@ sp_usepath_move_compensate(NR::Matrix const *mp, SPItem *original, SPUsePath *se
}
SPItem *item = SP_ITEM(self->owner);
+// TODO kill naughty naughty #if 0
#if 0
NR::Matrix m(*mp);
if (!(m.is_translation())) {
@@ -175,6 +171,9 @@ sp_usepath_move_compensate(NR::Matrix const *mp, SPItem *original, SPUsePath *se
// Commit the compensation.
item->transform *= clone_move;
sp_item_write_transform(item, SP_OBJECT_REPR(item), item->transform, &advertized_move);
+#else
+ (void)mp;
+ (void)original;
#endif
self->sourceDirty = true;
}
static void
-sp_usepath_source_modified(SPObject *iSource, guint flags, SPUsePath *offset)
+sp_usepath_source_modified(SPObject */*iSource*/, guint /*flags*/, SPUsePath *offset)
{
offset->sourceDirty = true;
offset->owner->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
}
}
originalPath = new Path;
- originalPath->LoadArtBPath(SP_CURVE_BPATH(curve), NR::Matrix(item->transform), true);
- sp_curve_unref(curve);
+ originalPath->LoadPathVector(curve->get_pathvector(), to_2geom(item->transform), true);
+ curve->unref();
}