From f6c82a02188953dcb6d2119123ffc0aaa8d35010 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sat, 16 Mar 2013 20:42:47 +0100
Subject: cppcheck

(bzr r12217)
---
 src/selection.cpp                     | 1 -
 src/snap.cpp                          | 1 -
 src/text-editing.cpp                  | 2 +-
 src/trace/siox.cpp                    | 4 ++--
 src/ui/dialog/document-properties.cpp | 2 --
 5 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/selection.cpp b/src/selection.cpp
index 72f50137c..564f1fdd3 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -418,7 +418,6 @@ Geom::OptRect Selection::documentBounds(SPItem::BBoxType type) const
 // will be returned; this is also the case in SelTrans::centerRequest()
 boost::optional<Geom::Point> Selection::center() const {
     GSList *items = (GSList *) const_cast<Selection *>(this)->itemList();
-    Geom::Point center;
     if (items) {
         SPItem *first = reinterpret_cast<SPItem*>(g_slist_last(items)->data); // from the first item in selection
         if (first->isCenterSet()) { // only if set explicitly
diff --git a/src/snap.cpp b/src/snap.cpp
index 695424194..15f24ef53 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -500,7 +500,6 @@ Inkscape::SnappedPoint SnapManager::_snapTransformed(
     /* The current best metric for the best transformation; lower is better, Geom::infinity()
     ** means that we haven't snapped anything.
     */
-    Geom::Point best_scale_metric(Geom::infinity(), Geom::infinity());
     Inkscape::SnappedPoint best_snapped_point;
     g_assert(best_snapped_point.getAlwaysSnap() == false); // Check initialization of snapped point
     g_assert(best_snapped_point.getAtIntersection() == false);
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 47b4d35ac..401f56bb2 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -69,7 +69,7 @@ void te_update_layout_now_recursive(SPItem *item)
     if (SP_IS_GROUP(item)) {
         GSList *item_list = sp_item_group_item_list(SP_GROUP(item));
         for(GSList* elem = item_list; elem; elem = elem->next) {
-            SPItem* list_item = (SPItem*) elem->data;
+            SPItem* list_item = static_cast<SPItem*>(elem->data);
             te_update_layout_now_recursive(list_item);
         }
         g_slist_free(item_list);
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 9376fad66..1a1426b83 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -591,7 +591,7 @@ bool SioxImage::writePPM(const std::string &fileName)
     if (!f)
         return false;
 
-    fprintf(f, "P6 %d %d 255\n", width, height);
+    fprintf(f, "P6 %u %u 255\n", width, height);
 
     for (unsigned int y=0 ; y<height; y++)
         {
@@ -933,7 +933,7 @@ SioxImage Siox::extractForeground(const SioxImage &originalImage,
 
     //trace("### bgSignature:%d", bgSignature.size());
 
-    if (bgSignature.size() < 1)
+    if (bgSignature.empty())
         {
         // segmentation impossible
         error("Signature size is < 1.  Segmentation is impossible");
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 045b34814..d335fb303 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -792,8 +792,6 @@ void DocumentProperties::build_scripting()
     _page_external_scripts->table().attach(_external_remove_btn, 2, 3, row, row + 1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0, 0, 0);
 #endif
 
-    row++;
-
     //# Set up the External Scripts box
     _ExternalScriptsListStore = Gtk::ListStore::create(_ExternalScriptsListColumns);
     _ExternalScriptsList.set_model(_ExternalScriptsListStore);
-- 
cgit v1.2.3