From cac09437c8824df247029a09c3b946520bea63b9 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sat, 29 Aug 2015 23:01:19 +0200
Subject: [PATCH] + fix various warnings

---
 src/Mod/Spreadsheet/App/Cell.cpp           | 4 ++--
 src/Mod/Spreadsheet/App/Expression.cpp     | 4 ++--
 src/Mod/Spreadsheet/App/PropertySheet.cpp  | 5 ++---
 src/Mod/Spreadsheet/App/Sheet.cpp          | 1 +
 src/Mod/Spreadsheet/App/SheetObserver.cpp  | 2 +-
 src/Mod/Spreadsheet/App/Utils.cpp          | 1 -
 src/Mod/Spreadsheet/Gui/SheetModel.cpp     | 4 ++--
 src/Mod/Spreadsheet/Gui/SheetTableView.cpp | 1 -
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp
index 0e9a888c5..3496bd2bb 100644
--- a/src/Mod/Spreadsheet/App/Cell.cpp
+++ b/src/Mod/Spreadsheet/App/Cell.cpp
@@ -105,14 +105,14 @@ Cell::Cell(const Cell &other)
     , owner(other.owner)
     , used(other.used)
     , expression(other.expression ? other.expression->copy() : 0)
-    , style(other.style)
     , alignment(other.alignment)
+    , style(other.style)
     , foregroundColor(other.foregroundColor)
     , backgroundColor(other.backgroundColor)
     , displayUnit(other.displayUnit)
     , computedUnit(other.computedUnit)
-    , colSpan(other.colSpan)
     , rowSpan(other.rowSpan)
+    , colSpan(other.colSpan)
 {
 }
 
diff --git a/src/Mod/Spreadsheet/App/Expression.cpp b/src/Mod/Spreadsheet/App/Expression.cpp
index a06340b21..50e5f5aad 100644
--- a/src/Mod/Spreadsheet/App/Expression.cpp
+++ b/src/Mod/Spreadsheet/App/Expression.cpp
@@ -481,7 +481,7 @@ Expression * OperatorExpression::eval() const
     NumberExpression * v1;
     std::auto_ptr<Expression> e2(right->eval());
     NumberExpression * v2;
-    NumberExpression * output;
+    NumberExpression * output = 0;
 
     v1 = freecad_dynamic_cast<NumberExpression>(e1.get());
     v2 = freecad_dynamic_cast<NumberExpression>(e2.get());
@@ -877,7 +877,7 @@ Expression * FunctionExpression::eval() const
     std::auto_ptr<Expression> e2(args.size() > 1 ? args[1]->eval() : 0);
     NumberExpression * v1 = freecad_dynamic_cast<NumberExpression>(e1.get());
     NumberExpression * v2 = freecad_dynamic_cast<NumberExpression>(e2.get());
-    double output;
+    double output = 0;
     Unit unit;
     double scaler = 1;
 
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index bd8c9318c..35e53b987 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -203,9 +203,9 @@ PropertySheet::PropertySheet(Sheet *_owner)
 }
 
 PropertySheet::PropertySheet(const PropertySheet &other)
-    : owner(other.owner)
-    , dirty(other.dirty)
+    : dirty(other.dirty)
     , mergedCells(other.mergedCells)
+    , owner(other.owner)
     , propertyNameToCellMap(other.propertyNameToCellMap)
     , documentObjectToCellMap(other.documentObjectToCellMap)
     , signalCounter(0)
@@ -857,7 +857,6 @@ bool PropertySheet::isHidden(CellAddress address) const
 void PropertySheet::addDependencies(CellAddress key)
 {
     Cell * cell = getValue(key);
-    bool hasUnresolvedDeps = false;
 
     if (!cell)
         return;
diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp
index 86d700205..81a767c6d 100644
--- a/src/Mod/Spreadsheet/App/Sheet.cpp
+++ b/src/Mod/Spreadsheet/App/Sheet.cpp
@@ -622,6 +622,7 @@ void Sheet::updateProperty(CellAddress key)
         clear(key);
 
     cellUpdated(key);
+    (void)prop;
 }
 
 /**
diff --git a/src/Mod/Spreadsheet/App/SheetObserver.cpp b/src/Mod/Spreadsheet/App/SheetObserver.cpp
index 8235d9fb2..ae739b679 100644
--- a/src/Mod/Spreadsheet/App/SheetObserver.cpp
+++ b/src/Mod/Spreadsheet/App/SheetObserver.cpp
@@ -37,8 +37,8 @@ using namespace App;
 
 SheetObserver::SheetObserver(App::Document * document, PropertySheet *_sheet)
     : DocumentObserver(document)
-    , sheet(_sheet)
     , refCount(1)
+    , sheet(_sheet)
 {
 }
 
diff --git a/src/Mod/Spreadsheet/App/Utils.cpp b/src/Mod/Spreadsheet/App/Utils.cpp
index 8eef12e5c..74345bb1c 100644
--- a/src/Mod/Spreadsheet/App/Utils.cpp
+++ b/src/Mod/Spreadsheet/App/Utils.cpp
@@ -145,7 +145,6 @@ int Spreadsheet::decodeColumn(const std::string &colstr)
 
 Spreadsheet::CellAddress Spreadsheet::stringToAddress(const char * strAddress)
 {
-    int i = 0;
     static const boost::regex e("\\${0,1}([A-Za-z]+)\\${0,1}([0-9]+)");
     boost::cmatch cm;
 
diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.cpp b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
index 00e38a5ba..ebcacb819 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
@@ -106,7 +106,7 @@ static std::string getUnitString(const Base::Unit & unit)
     std::string unitStr;
 
     if (numerator.size() > 0) {
-        for (int i = 0; i < numerator.size(); ++i) {
+        for (std::size_t i = 0; i < numerator.size(); ++i) {
             if (i > 0)
                 unitStr += "*";
             unitStr += numerator[i];
@@ -120,7 +120,7 @@ static std::string getUnitString(const Base::Unit & unit)
 
         if (denominator.size() > 1)
             unitStr += "(";
-        for (int i = 0; i < denominator.size(); ++i) {
+        for (std::size_t i = 0; i < denominator.size(); ++i) {
             if (i > 0)
                 unitStr += "*";
             unitStr += denominator[i];
diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
index 09c5d36bd..0c929d90b 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
@@ -153,7 +153,6 @@ void SheetTableView::removeRows()
 
     QModelIndexList rows = selectionModel()->selectedRows();
     std::vector<int> sortedRows;
-    int extra = 0;
 
     /* Make sure rows are sorted in descending order */
     for (QModelIndexList::const_iterator it = rows.begin(); it != rows.end(); ++it)