This commit is contained in:
Nav
2021-10-21 19:24:48 +01:00
parent 9b21e55815
commit 6b11956c90
27 changed files with 93 additions and 93 deletions

View File

@@ -19,8 +19,8 @@ ByteWidget::ByteWidget(
this->addressHex = "0x" + QString::number(this->address, 16).rightJustified(8, '0').toUpper();
this->relativeAddressHex = "0x" + QString::number(this->byteIndex, 16).rightJustified(8, '0').toUpper();
this->connect(this, &ClickableWidget::clicked, this, onClick);
this->connect(this, &ClickableWidget::rightClicked, this, onClick);
QObject::connect(this, &ClickableWidget::clicked, this, onClick);
QObject::connect(this, &ClickableWidget::rightClicked, this, onClick);
this->setSelected(false);
}

View File

@@ -41,9 +41,9 @@ namespace Bloom::Widgets
void setSelected(bool selected);
signals:
void selected(ByteWidget*);
void enter(ByteWidget*);
void leave(ByteWidget*);
void selected(Bloom::Widgets::ByteWidget*);
void enter(Bloom::Widgets::ByteWidget*);
void leave(Bloom::Widgets::ByteWidget*);
protected:
virtual void postSetSelected(bool selected) {};

View File

@@ -47,11 +47,11 @@ parent(parent) {
byteWidget
));
this->connect(byteWidget, &ByteWidget::enter, this, &ByteWidgetContainer::onByteWidgetEnter);
this->connect(byteWidget, &ByteWidget::leave, this, &ByteWidgetContainer::onByteWidgetLeave);
QObject::connect(byteWidget, &ByteWidget::enter, this, &ByteWidgetContainer::onByteWidgetEnter);
QObject::connect(byteWidget, &ByteWidget::leave, this, &ByteWidgetContainer::onByteWidgetLeave);
}
this->connect(
QObject::connect(
&insightWorker,
&InsightWorker::targetStateUpdated,
this,
@@ -117,8 +117,8 @@ void ByteWidgetContainer::adjustByteWidgets() {
this->setMinimumHeight(minHeight);
this->parent->setMinimumHeight(minHeight);
this->byteWidgetsByRowIndex.swap(byteWidgetsByRowIndex);
this->byteWidgetsByColumnIndex.swap(byteWidgetsByColumnIndex);
this->byteWidgetsByRowIndex = std::move(byteWidgetsByRowIndex);
this->byteWidgetsByColumnIndex = std::move(byteWidgetsByColumnIndex);
emit this->byteWidgetsAdjusted();
}

View File

@@ -58,7 +58,7 @@ namespace Bloom::Widgets
private slots:
void onTargetStateChanged(Targets::TargetState newState);
void onByteWidgetEnter(ByteWidget* widget);
void onByteWidgetLeave(ByteWidget* widget);
void onByteWidgetEnter(Bloom::Widgets::ByteWidget* widget);
void onByteWidgetLeave(Bloom::Widgets::ByteWidget* widget);
};
}

View File

@@ -76,13 +76,13 @@ HexViewerWidget::HexViewerWidget(
this->byteWidgetAddressLayout = this->byteWidgetAddressContainer->findChild<QVBoxLayout*>();
this->byteWidgetAddressLayout->setContentsMargins(5, 10, 0, 5);
this->connect(
QObject::connect(
this->byteWidgetContainer,
&ByteWidgetContainer::byteWidgetsAdjusted,
this,
&HexViewerWidget::onByteWidgetsAdjusted
);
this->connect(
QObject::connect(
&insightWorker,
&InsightWorker::targetStateUpdated,
this,