summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 13:55:58 +0000
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 13:55:58 +0000
commit884fe02952017ac219cd23f9407d27ed4d8a8620 (patch)
treea86d66e240ae1e72007ba75b23757c71d5a9a28c /src/live_effects
parentRun clang-tidy’s modernize-use-emplace pass. (diff)
downloadinkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.tar.gz
inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.zip
Run clang-tidy’s modernize-redundant-void-arg pass.
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-clone-original.cpp2
-rw-r--r--src/live_effects/lpe-embrodery-stitch-ordering.cpp20
-rw-r--r--src/live_effects/lpe-embrodery-stitch-ordering.h20
-rw-r--r--src/live_effects/lpeobject-reference.cpp6
-rw-r--r--src/live_effects/lpeobject-reference.h4
-rw-r--r--src/live_effects/parameter/item.cpp2
-rw-r--r--src/live_effects/parameter/item.h2
-rw-r--r--src/live_effects/parameter/parameter.cpp2
-rw-r--r--src/live_effects/parameter/path.cpp2
-rw-r--r--src/live_effects/parameter/path.h2
10 files changed, 31 insertions, 31 deletions
diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index f491c7ad7..54b7dd090 100644
--- a/src/live_effects/lpe-clone-original.cpp
+++ b/src/live_effects/lpe-clone-original.cpp
@@ -241,7 +241,7 @@ LPECloneOriginal::start_listening()
}
void
-LPECloneOriginal::quit_listening(void)
+LPECloneOriginal::quit_listening()
{
modified_connection.disconnect();
listening = false;
diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.cpp b/src/live_effects/lpe-embrodery-stitch-ordering.cpp
index 7cd69e1b6..6d788870f 100644
--- a/src/live_effects/lpe-embrodery-stitch-ordering.cpp
+++ b/src/live_effects/lpe-embrodery-stitch-ordering.cpp
@@ -294,7 +294,7 @@ void OrderingPoint::FindNearest2(const std::vector<OrderingInfoEx *> &infos)
// Check if "this" is among the nearest of its nearest
-void OrderingPoint::EnforceMutual(void)
+void OrderingPoint::EnforceMutual()
{
if (nearest[0] && !(this == nearest[0]->nearest[0] || this == nearest[0]->nearest[1])) {
nearest[0] = nullptr;
@@ -334,7 +334,7 @@ void OrderingPoint::EnforceSymmetric(const OrderingPoint &other)
}
}
-void OrderingPoint::Dump(void)
+void OrderingPoint::Dump()
{
Coord dist0 = nearest[0] ? distance(point, nearest[0]->point) : -1.0;
Coord dist1 = nearest[1] ? distance(point, nearest[1]->point) : -1.0;
@@ -400,7 +400,7 @@ bool OrderingGroupNeighbor::Compare(const OrderingGroupNeighbor &a, const Orderi
// Find the nearest unused neighbor point
-OrderingGroupNeighbor *OrderingGroupPoint::FindNearestUnused(void)
+OrderingGroupNeighbor *OrderingGroupPoint::FindNearestUnused()
{
for (std::vector<OrderingGroupNeighbor>::iterator it = nearest.begin(); it != nearest.end(); ++it) {
if (!it->point->used) {
@@ -420,14 +420,14 @@ OrderingGroupNeighbor *OrderingGroupPoint::FindNearestUnused(void)
// Return the other end in the group of the point
-OrderingGroupPoint *OrderingGroupPoint::GetOtherEndGroup(void)
+OrderingGroupPoint *OrderingGroupPoint::GetOtherEndGroup()
{
return group->endpoints[ indexInGroup ^ 1 ];
}
// Return the alternate point (if one exists), 0 otherwise
-OrderingGroupPoint *OrderingGroupPoint::GetAltPointGroup(void)
+OrderingGroupPoint *OrderingGroupPoint::GetAltPointGroup()
{
if (group->nEndPoints < 4) {
return nullptr;
@@ -440,7 +440,7 @@ OrderingGroupPoint *OrderingGroupPoint::GetAltPointGroup(void)
// Sets the rev flags in the group assuming that the group starts with this point
-void OrderingGroupPoint::SetRevInGroup(void)
+void OrderingGroupPoint::SetRevInGroup()
{
// If this is not a front point, the item list needs to be reversed
group->revItemList = !front;
@@ -452,7 +452,7 @@ void OrderingGroupPoint::SetRevInGroup(void)
// Mark an end point as used and also mark the two other alternating points as used
// Returns the used point
-void OrderingGroupPoint::UsePoint(void)
+void OrderingGroupPoint::UsePoint()
{
group->UsePoint(indexInGroup);
}
@@ -460,13 +460,13 @@ void OrderingGroupPoint::UsePoint(void)
// Mark an end point as unused and possibly also mark the two other alternating points as unused
// Returns the used point
-void OrderingGroupPoint::UnusePoint(void)
+void OrderingGroupPoint::UnusePoint()
{
group->UnusePoint(indexInGroup);
}
// Return the other end in the connection
-OrderingGroupPoint *OrderingGroupPoint::GetOtherEndConnection(void)
+OrderingGroupPoint *OrderingGroupPoint::GetOtherEndConnection()
{
assert(connection);
assert(connection->points[ indexInConnection ] == this);
@@ -478,7 +478,7 @@ OrderingGroupPoint *OrderingGroupPoint::GetOtherEndConnection(void)
// Set the end points of a group from the items
-void OrderingGroup::SetEndpoints(void)
+void OrderingGroup::SetEndpoints()
{
assert(items.size() >= 1);
diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.h b/src/live_effects/lpe-embrodery-stitch-ordering.h
index 5f64462f7..c5c71e50c 100644
--- a/src/live_effects/lpe-embrodery-stitch-ordering.h
+++ b/src/live_effects/lpe-embrodery-stitch-ordering.h
@@ -71,11 +71,11 @@ struct OrderingPoint {
// Find 2 nearest points to given point
void FindNearest2(const std::vector<OrderingInfoEx *> &infos);
// Check if "this" is among the nearest of its nearest
- void EnforceMutual(void);
+ void EnforceMutual();
// Check if the subpath indices of this and other are the same, otherwise zero both nearest
void EnforceSymmetric(const OrderingPoint &other);
// Dump point information
- void Dump(void);
+ void Dump();
Geom::Point point;
OrderingInfoEx *infoex;
@@ -146,21 +146,21 @@ struct OrderingGroupPoint {
}
// Find the nearest unused neighbor point
- OrderingGroupNeighbor *FindNearestUnused(void);
+ OrderingGroupNeighbor *FindNearestUnused();
// Return the other end in the group of the point
- OrderingGroupPoint *GetOtherEndGroup(void);
+ OrderingGroupPoint *GetOtherEndGroup();
// Return the alternate point (if one exists), 0 otherwise
- OrderingGroupPoint *GetAltPointGroup(void);
+ OrderingGroupPoint *GetAltPointGroup();
// Sets the rev flags in the group assuming that the group starts with this point
- void SetRevInGroup(void);
+ void SetRevInGroup();
// Mark an end point as used and also mark the two other alternating points as used
// Returns the used point
- void UsePoint(void);
+ void UsePoint();
// Mark an end point as unused and possibly also mark the two other alternating points as unused
// Returns the used point
- void UnusePoint(void);
+ void UnusePoint();
// Return the other end in the connection
- OrderingGroupPoint *GetOtherEndConnection(void);
+ OrderingGroupPoint *GetOtherEndConnection();
// The coordinates of the point
Geom::Point point;
@@ -239,7 +239,7 @@ struct OrderingGroup {
}
// Set the endpoints of a group from the items
- void SetEndpoints(void);
+ void SetEndpoints();
// Add all points from another group as neighbors
void AddNeighbors(OrderingGroup *nghb);
// Mark an end point as used and also mark the two other alternating points as used
diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp
index e430c12f1..f8d4e08f5 100644
--- a/src/live_effects/lpeobject-reference.cpp
+++ b/src/live_effects/lpeobject-reference.cpp
@@ -33,7 +33,7 @@ LPEObjectReference::LPEObjectReference(SPObject* i_owner) : URIReference(i_owner
user_unlink = nullptr;
}
-LPEObjectReference::~LPEObjectReference(void)
+LPEObjectReference::~LPEObjectReference()
{
_changed_connection.disconnect(); // to do before unlinking
@@ -76,7 +76,7 @@ LPEObjectReference::link(const char *to)
}
void
-LPEObjectReference::unlink(void)
+LPEObjectReference::unlink()
{
if (lpeobject_href) {
g_free(lpeobject_href);
@@ -98,7 +98,7 @@ LPEObjectReference::start_listening(LivePathEffectObject* to)
}
void
-LPEObjectReference::quit_listening(void)
+LPEObjectReference::quit_listening()
{
_modified_connection.disconnect();
_delete_connection.disconnect();
diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h
index 328fa9eaf..a86c10eee 100644
--- a/src/live_effects/lpeobject-reference.h
+++ b/src/live_effects/lpeobject-reference.h
@@ -43,9 +43,9 @@ public:
sigc::connection _changed_connection;
void link(const char* to);
- void unlink(void);
+ void unlink();
void start_listening(LivePathEffectObject* to);
- void quit_listening(void);
+ void quit_listening();
void (*user_unlink) (LPEObjectReference *me, SPObject *user);
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index c22a3df33..8a8b12307 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -166,7 +166,7 @@ ItemParam::start_listening(SPObject * to)
}
void
-ItemParam::quit_listening(void)
+ItemParam::quit_listening()
{
linked_modified_connection.disconnect();
linked_delete_connection.disconnect();
diff --git a/src/live_effects/parameter/item.h b/src/live_effects/parameter/item.h
index 1c285fcff..315f7618d 100644
--- a/src/live_effects/parameter/item.h
+++ b/src/live_effects/parameter/item.h
@@ -55,7 +55,7 @@ protected:
void ref_changed(SPObject *old_ref, SPObject *new_ref);
void remove_link();
void start_listening(SPObject * to);
- void quit_listening(void);
+ void quit_listening();
void linked_delete(SPObject *deleted);
void linked_modified(SPObject *linked_obj, guint flags);
void linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item);
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index d87bd4d1b..1bdd31a0f 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -45,7 +45,7 @@ Parameter::param_write_to_repr(const char * svgd)
param_effect->getRepr()->setAttribute(param_key.c_str(), svgd);
}
-void Parameter::write_to_SVG(void)
+void Parameter::write_to_SVG()
{
gchar * str = param_getSVGValue();
param_write_to_repr(str);
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 649d3a1ef..52e1b62a6 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -410,7 +410,7 @@ PathParam::start_listening(SPObject * to)
}
void
-PathParam::quit_listening(void)
+PathParam::quit_listening()
{
linked_modified_connection.disconnect();
linked_delete_connection.disconnect();
diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index 5993b54e6..99c073997 100644
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -77,7 +77,7 @@ protected:
void ref_changed(SPObject *old_ref, SPObject *new_ref);
void remove_link();
void start_listening(SPObject * to);
- void quit_listening(void);
+ void quit_listening();
void linked_delete(SPObject *deleted);
void linked_modified(SPObject *linked_obj, guint flags);
void linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item);