Corrected member initialisation order (addressing -Wreorder warnings)

This commit is contained in:
Nav
2023-08-19 21:53:00 +01:00
parent c622c9bd2e
commit 9a6e22e6c7
25 changed files with 49 additions and 42 deletions

View File

@@ -30,16 +30,16 @@ using Targets::TargetPinDescriptor;
using Targets::TargetMemoryType;
InsightWindow::InsightWindow(
const EnvironmentConfig& environmentConfig,
const InsightConfig& insightConfig,
InsightProjectSettings& insightProjectSettings,
const InsightConfig& insightConfig,
const EnvironmentConfig& environmentConfig,
const Targets::TargetDescriptor& targetDescriptor
)
: QMainWindow(nullptr)
, insightProjectSettings(insightProjectSettings)
, insightConfig(insightConfig)
, environmentConfig(environmentConfig)
, targetConfig(environmentConfig.targetConfig)
, insightConfig(insightConfig)
, insightProjectSettings(insightProjectSettings)
, targetDescriptor(targetDescriptor)
{
this->setObjectName("main-window");

View File

@@ -31,9 +31,9 @@ class InsightWindow: public QMainWindow
public:
InsightWindow(
const EnvironmentConfig& environmentConfig,
const InsightConfig& insightConfig,
InsightProjectSettings& insightProjectSettings,
const InsightConfig& insightConfig,
const EnvironmentConfig& environmentConfig,
const Targets::TargetDescriptor& targetDescriptor
);

View File

@@ -2,7 +2,10 @@
namespace Widgets
{
LabeledSeparator::LabeledSeparator(QString title, QWidget* parent): title(std::move(title)), QWidget(parent) {
LabeledSeparator::LabeledSeparator(QString title, QWidget* parent)
: QWidget(parent)
, title(std::move(title))
{
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
this->setFixedHeight(LabeledSeparator::DEFAULT_HEIGHT);
}

View File

@@ -12,8 +12,8 @@ namespace Widgets
ListScene::ListItemSetType&& items,
QGraphicsView* parent
)
: parent(parent)
, QGraphicsScene(parent)
: QGraphicsScene(parent)
, parent(parent)
{
this->setItemIndexMethod(QGraphicsScene::NoIndex);
this->setItems(std::move(items));

View File

@@ -3,9 +3,9 @@
namespace Widgets
{
PaneWidget::PaneWidget(PaneState& state, PanelWidget* parent)
: state(state)
: QWidget(parent)
, state(state)
, parentPanel(parent)
, QWidget(parent)
{
this->setMouseTracking(false);
this->setAttribute(Qt::WA_Hover, true);

View File

@@ -8,9 +8,9 @@
namespace Widgets
{
PanelWidget::PanelWidget(PanelWidgetType type, PanelState& state, QWidget* parent)
: panelType(type)
: QFrame(parent)
, state(state)
, QFrame(parent)
, panelType(type)
{
this->setMouseTracking(false);
this->setAttribute(Qt::WA_Hover, true);

View File

@@ -3,8 +3,8 @@
namespace Widgets
{
ByteAddressItem::ByteAddressItem(const HexViewerSharedState& hexViewerState, QGraphicsItem* parent)
: hexViewerState(hexViewerState)
, QGraphicsItem(parent)
: QGraphicsItem(parent)
, hexViewerState(hexViewerState)
{}
void ByteAddressItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) {

View File

@@ -7,7 +7,7 @@ namespace Widgets
std::optional<IsEnabledCallbackType> isEnabledCallback,
QWidget* parent
)
: isEnabledCallback(isEnabledCallback)
, QAction(text, parent)
: QAction(text, parent)
, isEnabledCallback(isEnabledCallback)
{}
}

View File

@@ -18,10 +18,10 @@ namespace Widgets
static constexpr int RIGHT_MARGIN = 5;
static constexpr int BOTTOM_MARGIN = 5;
HexViewerItem* parent = nullptr;
const Targets::TargetMemoryAddress startAddress = 0;
HexViewerItem* parent = nullptr;
QPoint relativePosition = {};
HexViewerItem(Targets::TargetMemoryAddress startAddress, HexViewerItem* parent = nullptr);

View File

@@ -51,11 +51,11 @@ namespace Widgets
const Targets::TargetMemoryDescriptor& targetMemoryDescriptor;
const std::optional<Targets::TargetMemoryBuffer>& data;
HexViewerWidgetSettings& settings;
const std::vector<FocusedMemoryRegion>& focusedMemoryRegions;
const std::vector<ExcludedMemoryRegion>& excludedMemoryRegions;
HexViewerWidgetSettings& settings;
QWidget* container = nullptr;
QWidget* toolBar = nullptr;
QWidget* bottomBar = nullptr;

View File

@@ -25,7 +25,8 @@ namespace Widgets
HexViewerWidgetSettings& settings,
QGraphicsView* parent
)
: state(
: QGraphicsScene(parent)
, state(
HexViewerSharedState(
targetMemoryDescriptor,
data,
@@ -35,7 +36,6 @@ namespace Widgets
, focusedMemoryRegions(focusedMemoryRegions)
, excludedMemoryRegions(excludedMemoryRegions)
, parent(parent)
, QGraphicsScene(parent)
{
this->setObjectName("byte-widget-container");

View File

@@ -13,7 +13,8 @@ namespace Widgets
const Targets::TargetMemoryDescriptor& memoryDescriptor,
QWidget* parent
)
: memoryRegion(region), RegionItem(region, memoryDescriptor, parent)
: RegionItem(region, memoryDescriptor, parent)
, memoryRegion(region)
{
auto formUiFile = QFile(
QString::fromStdString(Services::PathService::compiledResourcesPath()

View File

@@ -15,7 +15,8 @@ namespace Widgets
const Targets::TargetMemoryDescriptor& memoryDescriptor,
QWidget* parent
)
: memoryRegion(region), RegionItem(region, memoryDescriptor, parent)
: RegionItem(region, memoryDescriptor, parent)
, memoryRegion(region)
{
auto formUiFile = QFile(
QString::fromStdString(Services::PathService::compiledResourcesPath()

View File

@@ -12,8 +12,8 @@ namespace Widgets
const Targets::TargetMemoryDescriptor& memoryDescriptor,
QWidget* parent
)
: memoryDescriptor(memoryDescriptor)
, ClickableWidget(parent)
: ClickableWidget(parent)
, memoryDescriptor(memoryDescriptor)
{
this->setObjectName("region-item");
this->setFixedHeight(50);

View File

@@ -35,8 +35,6 @@ namespace Widgets
Q_OBJECT
public:
TargetMemoryInspectionPaneSettings& settings;
TargetMemoryInspectionPane(
const Targets::TargetMemoryDescriptor& targetMemoryDescriptor,
TargetMemoryInspectionPaneSettings& settings,
@@ -58,6 +56,8 @@ namespace Widgets
private:
const Targets::TargetMemoryDescriptor& targetMemoryDescriptor;
TargetMemoryInspectionPaneSettings& settings;
std::optional<Targets::TargetMemoryBuffer> data;
std::optional<Targets::TargetStackPointer> stackPointer;
std::optional<QSharedPointer<ReadTargetMemory>> activeRefreshTask;