Integrating github/staging through commit ab87ed9

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyOArchive.cpp

@@ -227,7 +227,6 @@ PropertyRow* PropertyOArchive::updateRowPrimitive(const char* name, const char*
 bool PropertyOArchive::operator()(const Serialization::SStruct& ser, const char* name, const char* label)
 {
     const char* typeName = ser.type().name();
-    size_t size = ser.size();
 
     lastNode_ = currentNode_;
     bool hideChildren = outlineMode_ && currentNode_ && currentNode_->isContainer();
@@ -352,8 +351,6 @@ bool PropertyOArchive::operator()(double& value, const char* name, const char* l
 bool PropertyOArchive::operator()(Serialization::IContainer& ser, const char *name, const char *label)
 {
     const char* elementTypeName = ser.elementType().name();
-    bool fixedSizeContainer = ser.isFixedSize();
-    lastNode_ = currentNode_;
     enterNode(updateRow<PropertyRowContainer>(name, label, ser.containerType().name(), ser));
 
     if (!model_->defaultTypeRegistered(elementTypeName)) {
@@ -442,13 +439,9 @@ bool PropertyOArchive::operator()(Serialization::ICallback& callback, const char
 
 bool PropertyOArchive::operator()(Serialization::Object& obj, const char *name, const char *label)
 {
-    const char* typeName = obj.type().name();
-
     PropertyRowObject* row = 0;
-    if (typeName_.empty())
-         row = updateRow<PropertyRowObject>(name, label, obj.type().name(), obj);
-    else
-         row = updateRow<PropertyRowObject>(name, label, obj.type().name(), obj);
+    row = updateRow<PropertyRowObject>(name, label, obj.type().name(), obj);
+
     lastNode_ = row;
     return true;
 }

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRow.cpp

@@ -1512,7 +1512,6 @@ void PropertyRow::dropInto(PropertyRow* parentRow, PropertyRow* cursorRow, QProp
     if(parentRow->isContainer()){
         tree->model()->rowAboutToBeChanged(tree->model()->root()); // FIXME: select optimal row
         setSelected(false);
-        PropertyRowContainer* container = static_cast<PropertyRowContainer*>(parentRow);
         PropertyRow* oldParent = parent();
         TreePath oldParentPath = tree->model()->pathFromRow(oldParent);
         oldParent->erase(this);

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowLocalFrame.cpp

@@ -65,7 +65,7 @@ bool PropertyRowLocalFrameBase::onContextMenu(QMenu& menu, QPropertyTree* tree)
 
     LocalFrameMenuHandler* handler = new LocalFrameMenuHandler(tree, this);
 
-    QAction* action = menu.addAction("Reset", handler, SLOT(onMenuReset()));
+    menu.addAction("Reset", handler, SLOT(onMenuReset()));
 
     tree->addMenuHandler(handler);
     return true;

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowPointer.cpp

@@ -31,7 +31,6 @@ void ClassMenuItemAdder::generateMenu(QMenu& createItem, const StringList& combo
     {
         StringList path;
         splitStringList(&path, it->c_str(), '\\');
-        int level = 0;
         QMenu* item = &createItem;
         //createItem.addMenu(
         for (int level2 = 0; level2 < int(path.size()); ++level2)

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyTreeModel.cpp

@@ -60,7 +60,9 @@ void PropertyTreeModel::selectRow(PropertyRow* row, bool select, bool exclusive)
         setFocusedRow(row);
     }
     else if(it != selection_.end()){
+#if !defined(NDEBUG)
         PropertyRow* it_row = rowFromPath(*it);
+#endif
         YASLI_ASSERT(it_row->refCount() > 0 && it_row->refCount() < 0xFFFF);
         selection_.erase(it);
     }

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/QPropertyTree.cpp

@@ -512,7 +512,6 @@ public:
     bool drop([[maybe_unused]] QPoint screenPoint)
     {
         bool rowLayoutChanged = false;
-        PropertyTreeModel* model = tree_->model();
         if (row_ && hoveredRow_){
             YASLI_ASSERT(destinationRow_);
             clickedRow_->setSelected(false);
@@ -1187,15 +1186,13 @@ void QPropertyTree::updateHeights(bool recalculateTextSize)
 
     updateValidatorIcons();
 
-    int padding = 4;
-
     int totalHeight = 0;
     model()->root()->adjustVerticalPosition(this, totalHeight);
     totalHeight += 4;
     QPoint oldSize = size_;
     size_.setY(totalHeight);
 
-    bool hasScrollBar = updateScrollBar();
+    updateScrollBar();
 
     area_.setLeft(widgetRect.left() + 2);
     area_.setRight(widgetRect.right() - 2 - scrollBarW);
@@ -2493,7 +2490,6 @@ void QPropertyTree::paintEvent([[maybe_unused]] QPaintEvent* ev)
     QPainter painter(this);
     QRect clientRect = this->rect();
 
-    int clientWidth = clientRect.width();
     int clientHeight = clientRect.height();
     backgroundColor_ = palette().color(QPalette::Window);
     painter.fillRect(clientRect, QBrush(backgroundColor_));
@@ -2624,9 +2620,6 @@ void QPropertyTree::mousePressEvent(QMouseEvent* ev)
 
     if (ev->button() == Qt::LeftButton)
     {
-        int x = ev->x();
-        int y = ev->y();
-
         PropertyRow* row = rowByPoint(ev->pos());
         if (row && !row->isSelectable())
             row = row->parent();
@@ -2698,7 +2691,6 @@ void QPropertyTree::mouseReleaseEvent(QMouseEvent* ev)
         }
         else {
             QPoint point = ev->pos();
-            PropertyRow* row = rowByPoint(point);
             if (capturedRow_){
                 QRect rowRect = capturedRow_->rect();
                 onRowLMBUp(capturedRow_, rowRect, pointToRootSpace(ev->pos()));