diff --git a/src/ApplicationConfig.cpp b/src/ApplicationConfig.cpp index 87f1dfc5..2c21f237 100644 --- a/src/ApplicationConfig.cpp +++ b/src/ApplicationConfig.cpp @@ -58,7 +58,7 @@ void EnvironmentConfig::init(std::string name, QJsonObject jsonObject) { throw Exceptions::InvalidConfig("No target configuration provided."); } - this->name = name; + this->name = std::move(name); this->debugToolConfig.init(jsonObject.find("debugTool")->toObject()); this->targetConfig.init(jsonObject.find("target")->toObject()); diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp index 90581a20..e8f05a35 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp @@ -29,7 +29,7 @@ namespace Bloom::Widgets std::size_t currentColumnIndex = 0; ByteItem( - std::size_t byteNumber, + std::size_t byteIndex, std::uint32_t address, std::optional& hoveredByteItem ); @@ -45,11 +45,6 @@ namespace Bloom::Widgets } void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - signals: - void selected(Bloom::Widgets::ByteItem*); - void enter(Bloom::Widgets::ByteItem*); - void leave(Bloom::Widgets::ByteItem*); - private: bool valueChanged = false; diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemGraphicsScene.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemGraphicsScene.cpp index 47f569ef..cdca7e68 100644 --- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemGraphicsScene.cpp +++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItemGraphicsScene.cpp @@ -36,8 +36,8 @@ parent(parent) { const auto memorySize = this->targetMemoryDescriptor.size(); const auto startAddress = this->targetMemoryDescriptor.addressRange.startAddress; Logger::error("Constructing bytes begin"); - for (std::size_t i = 0; i < memorySize; i++) { - const auto address = static_cast(startAddress + i); + for (std::uint32_t i = 0; i < memorySize; i++) { + const auto address = startAddress + i; auto* byteWidget = new ByteItem(i, address, this->hoveredByteWidget); this->byteWidgetsByAddress.insert(std::pair( @@ -87,7 +87,7 @@ void ByteItemGraphicsScene::adjustByteWidgets() { ); const auto columnIndex = static_cast( static_cast(byteWidget->byteIndex) - - (std::floor(byteWidget->byteIndex / rowCapacity) * static_cast(rowCapacity)) + - (std::floor(byteWidget->byteIndex / rowCapacity) * static_cast(rowCapacity)) ); byteWidget->setPos(