summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2015-12-07 20:38:35 +0000
committerKris De Gussem <Kris.De.Gussem@hotmail.com>2015-12-07 20:38:35 +0000
commitd0e818f6aab594de812e51550a8b81838f3f783d (patch)
treea908671d3f0ba494814382d88d54515d25ed5d95 /src
parentstatic code analysis (diff)
downloadinkscape-d0e818f6aab594de812e51550a8b81838f3f783d.tar.gz
inkscape-d0e818f6aab594de812e51550a8b81838f3f783d.zip
static code analysis
(bzr r14511)
Diffstat (limited to 'src')
-rw-r--r--src/knot-holder-entity.h5
-rw-r--r--src/sp-flowtext.cpp6
-rw-r--r--src/sp-item-group.cpp14
3 files changed, 15 insertions, 10 deletions
diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
index 43ab25e5c..63a068cab 100644
--- a/src/knot-holder-entity.h
+++ b/src/knot-holder-entity.h
@@ -44,7 +44,10 @@ public:
item(NULL),
desktop(NULL),
parent_holder(NULL),
- my_counter(0)
+ my_counter(0),
+ handler_id(0),
+ _click_handler_id(0),
+ _ungrab_handler_id(0)
{}
virtual ~KnotHolderEntity();
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index cac3cc61d..b87507e18 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -34,8 +34,10 @@
#include "display/drawing-text.h"
-SPFlowtext::SPFlowtext() : SPItem() {
- this->par_indent = 0;
+SPFlowtext::SPFlowtext() : SPItem(),
+ par_indent(0),
+ _optimizeScaledText(false)
+{
}
SPFlowtext::~SPFlowtext() {
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 8cd0bf8d3..83d67cf5a 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -58,8 +58,11 @@ using Inkscape::DocumentUndo;
static void sp_group_perform_patheffect(SPGroup *group, SPGroup *topgroup, bool write);
-SPGroup::SPGroup() : SPLPEItem() {
- this->_layer_mode = SPGroup::GROUP;
+SPGroup::SPGroup() : SPLPEItem(),
+ _expanded(false),
+ _insertBottom(false),
+ _layer_mode(SPGroup::GROUP)
+{
}
SPGroup::~SPGroup() {
@@ -90,10 +93,9 @@ void SPGroup::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref)
if ( item ) {
/* TODO: this should be moved into SPItem somehow */
SPItemView *v;
- Inkscape::DrawingItem *ac;
for (v = this->display; v != NULL; v = v->next) {
- ac = item->invoke_show (v->arenaitem->drawing(), v->key, v->flags);
+ Inkscape::DrawingItem *ac = item->invoke_show (v->arenaitem->drawing(), v->key, v->flags);
if (ac) {
v->arenaitem->appendChild(ac);
@@ -105,12 +107,10 @@ void SPGroup::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref)
if ( item ) {
/* TODO: this should be moved into SPItem somehow */
SPItemView *v;
- Inkscape::DrawingItem *ac;
-
unsigned position = item->pos_in_parent();
for (v = this->display; v != NULL; v = v->next) {
- ac = item->invoke_show (v->arenaitem->drawing(), v->key, v->flags);
+ Inkscape::DrawingItem *ac = item->invoke_show (v->arenaitem->drawing(), v->key, v->flags);
if (ac) {
v->arenaitem->prependChild(ac);