doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed all using declarations and directives from header files

Browse Source
This commit is contained in:
Nav
2021-05-24 20:58:49 +01:00
parent d39ca609bc
commit ce480a996c
96 changed files with 415 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Insight/Insight.cpp
View File

@@ -10,7 +10,8 @@
#include "src/Targets/TargetState.hpp"
using namespace Bloom;
using namespace Exceptions;
using namespace Bloom::Events;
using namespace Bloom::Exceptions;
void Insight::run() {
try {

2
src/Insight/Insight.hpp
View File

@@ -81,7 +81,7 @@ namespace Bloom
*
* @param event
*/
void onShutdownApplicationEvent(EventPointer<ShutdownApplication> event);
void onShutdownApplicationEvent(Events::EventPointer<Events::ShutdownApplication> event);
/**
* If the something horrible was to happen and the TC dies unexpectedly, Insight will shutdown in response.

5
src/Insight/InsightWorker.cpp
View File

@@ -11,7 +11,10 @@
#include "src/Exceptions/InvalidConfig.hpp"
using namespace Bloom;
using namespace Exceptions;
using namespace Bloom::Events;
using namespace Bloom::Exceptions;
using Bloom::Targets::TargetState;
void InsightWorker::startup() {
Logger::debug("Starting InsightWorker thread");

11
src/Insight/InsightWorker.hpp
View File

@@ -12,9 +12,6 @@
namespace Bloom
{
using namespace Events;
using Targets::TargetState;
/**
* The InsightWorker runs on a separate thread to the main GUI thread. Its purpose is to handle any
* blocking/time-expensive operations.
@@ -33,10 +30,10 @@ namespace Bloom
QTimer* eventDispatchTimer = nullptr;
void onTargetStoppedEvent(EventPointer<TargetExecutionStopped> event);
void onTargetResumedEvent(EventPointer<TargetExecutionResumed> event);
void onTargetPinStatesRetrievedEvent(EventPointer<TargetPinStatesRetrieved> event);
void onTargetIoPortsUpdatedEvent(EventPointer<TargetIoPortsUpdated> event);
void onTargetStoppedEvent(Events::EventPointer<Events::TargetExecutionStopped> event);
void onTargetResumedEvent(Events::EventPointer<Events::TargetExecutionResumed> event);
void onTargetPinStatesRetrievedEvent(Events::EventPointer<Events::TargetPinStatesRetrieved> event);
void onTargetIoPortsUpdatedEvent(Events::EventPointer<Events::TargetIoPortsUpdated> event);
public:
InsightWorker(EventManager& eventManager): eventManager(eventManager) {};

12
src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
View File

@@ -10,10 +10,14 @@
#include "src/Targets/TargetDescriptor.hpp"
using namespace Bloom;
using namespace Exceptions;
using Targets::TargetDescriptor;
using Targets::TargetVariant;
using Targets::TargetPackage;
using namespace Bloom::Exceptions;
using namespace Bloom::InsightTargetWidgets;
using Bloom::Targets::TargetDescriptor;
using Bloom::Targets::TargetState;
using Bloom::Targets::TargetPinState;
using Bloom::Targets::TargetVariant;
using Bloom::Targets::TargetPackage;
void InsightWindow::init(
QApplication& application,

27
src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp
View File

@@ -15,21 +15,12 @@
namespace Bloom
{
using InsightTargetWidgets::TargetPackageWidget;
using InsightTargetWidgets::TargetPinWidget;
using Targets::TargetDescriptor;
using Targets::TargetVariant;
using Targets::TargetPackage;
using Targets::TargetState;
using Targets::TargetPinState;
class InsightWindow: public QObject
{
Q_OBJECT
private:
TargetDescriptor targetDescriptor;
TargetState targetState = TargetState::UNKNOWN;
Targets::TargetDescriptor targetDescriptor;
Targets::TargetState targetState = Targets::TargetState::UNKNOWN;
QWidget* mainWindowWidget = nullptr;
AboutWindow* aboutWindowWidget = nullptr;
@@ -41,19 +32,19 @@ namespace Bloom
QWidget* ioContainerWidget = nullptr;
QWidget* ioUnavailableWidget = nullptr;
TargetPackageWidget* targetPackageWidget = nullptr;
InsightTargetWidgets::TargetPackageWidget* targetPackageWidget = nullptr;
QWidget* footer = nullptr;
QLabel* targetStatusLabel = nullptr;
QLabel* programCounterValueLabel = nullptr;
std::map<std::string, TargetVariant> supportedVariantsByName;
const TargetVariant* selectedVariant = nullptr;
std::map<std::string, Targets::TargetVariant> supportedVariantsByName;
const Targets::TargetVariant* selectedVariant = nullptr;
bool uiDisabled = false;
bool isVariantSupported(const TargetVariant& variant);
bool isVariantSupported(const Targets::TargetVariant& variant);
void selectVariant(const TargetVariant* variant);
void selectVariant(const Targets::TargetVariant* variant);
void toggleUi(bool disable) {
this->uiDisabled = disable;
@@ -83,14 +74,14 @@ namespace Bloom
public slots:
void onTargetPinStatesUpdate(int variantId, Bloom::Targets::TargetPinStateMappingType pinStatesByNumber);
void onTargetStateUpdate(TargetState newState);
void onTargetStateUpdate(Targets::TargetState newState);
void onTargetProgramCounterUpdate(quint32 programCounter);
void onTargetIoPortsUpdate();
void close();
void openReportIssuesUrl();
void openGettingStartedUrl();
void openAboutWindow();
void togglePinIoState(TargetPinWidget* pinWidget);
void togglePinIoState(InsightTargetWidgets::TargetPinWidget* pinWidget);
signals:
void refreshTargetPinStates(int variantId);

9
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.cpp
View File

@@ -15,8 +15,13 @@
using namespace Bloom::InsightTargetWidgets::Dip;
using namespace Bloom::Exceptions;
DualInlinePackageWidget::DualInlinePackageWidget(const TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent):
TargetPackageWidget(targetVariant, insightWindowObj, parent) {
using Bloom::Targets::TargetVariant;
DualInlinePackageWidget::DualInlinePackageWidget(
const TargetVariant& targetVariant,
QObject* insightWindowObj,
QWidget* parent
): TargetPackageWidget(targetVariant, insightWindowObj, parent) {
auto stylesheetFile = QFile(":/compiled/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/Stylesheets/DualInlinePackage.qss");
stylesheetFile.open(QFile::ReadOnly);
this->setStyleSheet(stylesheetFile.readAll());

4
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/DualInlinePackageWidget.hpp
View File

@@ -12,8 +12,6 @@
namespace Bloom::InsightTargetWidgets::Dip
{
using Targets::TargetVariant;
/**
* The DualInlinePackageWidget implements a custom Qt widget for the Dual-inline package target variants.
*/
@@ -32,6 +30,6 @@ namespace Bloom::InsightTargetWidgets::Dip
void drawWidget(QPainter& painter);
public:
DualInlinePackageWidget(const TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent);
DualInlinePackageWidget(const Targets::TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent);
};
}

1
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.cpp
View File

@@ -10,6 +10,7 @@
#include "src/Exceptions/Exception.hpp"
using namespace Bloom::InsightTargetWidgets::Dip;
using namespace Bloom::Targets;
using namespace Bloom::Exceptions;
void PinBodyWidget::paintEvent(QPaintEvent* event) {

15
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinBodyWidget.hpp
View File

@@ -7,10 +7,6 @@
namespace Bloom::InsightTargetWidgets::Dip
{
using Targets::TargetPinDescriptor;
using Targets::TargetPinType;
using Targets::TargetPinState;
class PinBodyWidget: public QWidget
{
Q_OBJECT
@@ -18,8 +14,8 @@ namespace Bloom::InsightTargetWidgets::Dip
Q_PROPERTY(int disableAlphaLevel READ getDisableAlphaLevel WRITE setDisableAlphaLevel DESIGNABLE true)
private:
TargetPinDescriptor pinDescriptor;
std::optional<TargetPinState> pinState;
Targets::TargetPinDescriptor pinDescriptor;
std::optional<Targets::TargetPinState> pinState;
QColor bodyColor = QColor("#AFB1B3");
int disableAlphaLevel = 100;
@@ -40,12 +36,15 @@ namespace Bloom::InsightTargetWidgets::Dip
static const int WIDTH = 30;
static const int HEIGHT = 40;
PinBodyWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor): QWidget(parent), pinDescriptor(pinDescriptor) {
PinBodyWidget(
QWidget* parent,
const Targets::TargetPinDescriptor& pinDescriptor
): QWidget(parent), pinDescriptor(pinDescriptor) {
this->setFixedSize(PinBodyWidget::WIDTH, PinBodyWidget::HEIGHT);
this->setObjectName("target-pin-body");
}
void setPinState(const TargetPinState& pinState) {
void setPinState(const Targets::TargetPinState& pinState) {
this->pinState = pinState;
}

1
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.cpp
View File

@@ -9,6 +9,7 @@
#include "src/Logger/Logger.hpp"
using namespace Bloom::InsightTargetWidgets::Dip;
using namespace Bloom::Targets;
PinWidget::PinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant):
TargetPinWidget(parent, pinDescriptor, targetVariant) {

16
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/DIP/PinWidget.hpp
View File

@@ -34,16 +34,22 @@ namespace Bloom::InsightTargetWidgets::Dip
static const int MINIMUM_WIDTH = 30;
static const int MAXIMUM_LABEL_COUNT = 3;
static const int LABEL_HEIGHT = 20;
static const int MAXIMUM_HEIGHT = PinBodyWidget::HEIGHT + (PinWidget::LABEL_HEIGHT * PinWidget::MAXIMUM_LABEL_COUNT);
static const int MAXIMUM_HEIGHT = PinBodyWidget::HEIGHT
+ (PinWidget::LABEL_HEIGHT * PinWidget::MAXIMUM_LABEL_COUNT);
PinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant);
PinWidget(
QWidget* parent,
const Targets::TargetPinDescriptor& pinDescriptor,
const Targets::TargetVariant& targetVariant
);
virtual void updatePinState(const TargetPinState& pinState) override {
virtual void updatePinState(const Targets::TargetPinState& pinState) override {
TargetPinWidget::updatePinState(pinState);
if (pinState.ioDirection.has_value()) {
this->pinDirectionLabel->setText(pinState.ioDirection.value() == TargetPinState::IoDirection::INPUT ?
"IN" : "OUT");
this->pinDirectionLabel->setText(
pinState.ioDirection.value() == Targets::TargetPinState::IoDirection::INPUT ? "IN" : "OUT"
);
} else {
this->pinDirectionLabel->setText("");

4
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.cpp
View File

@@ -1,16 +1,14 @@
#include <QPainter>
#include <QLayout>
#include <cmath>
#include <QEvent>
#include <QMenu>
#include <QContextMenuEvent>
#include "PinBodyWidget.hpp"
#include "src/Logger/Logger.hpp"
#include "src/Exceptions/Exception.hpp"
using namespace Bloom::InsightTargetWidgets::Qfp;
using namespace Bloom::Exceptions;
using namespace Bloom::Targets;
void PinBodyWidget::paintEvent(QPaintEvent* event) {
auto painter = QPainter(this);

12
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinBodyWidget.hpp
View File

@@ -7,10 +7,6 @@
namespace Bloom::InsightTargetWidgets::Qfp
{
using Targets::TargetPinDescriptor;
using Targets::TargetPinType;
using Targets::TargetPinState;
class PinBodyWidget: public QWidget
{
Q_OBJECT
@@ -18,8 +14,8 @@ namespace Bloom::InsightTargetWidgets::Qfp
Q_PROPERTY(int disableAlphaLevel READ getDisableAlphaLevel WRITE setDisableAlphaLevel DESIGNABLE true)
private:
TargetPinDescriptor pinDescriptor;
std::optional<TargetPinState> pinState;
Targets::TargetPinDescriptor pinDescriptor;
std::optional<Targets::TargetPinState> pinState;
QColor bodyColor = QColor("#AFB1B3");
int disableAlphaLevel = 100;
bool isVertical = false;
@@ -42,7 +38,7 @@ namespace Bloom::InsightTargetWidgets::Qfp
static const int WIDTH = 30;
static const int HEIGHT = 40;
PinBodyWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, bool isVertical):
PinBodyWidget(QWidget* parent, const Targets::TargetPinDescriptor& pinDescriptor, bool isVertical):
QWidget(parent), pinDescriptor(pinDescriptor), isVertical(isVertical) {
this->setObjectName("target-pin-body");
@@ -54,7 +50,7 @@ namespace Bloom::InsightTargetWidgets::Qfp
}
}
void setPinState(const TargetPinState& pinState) {
void setPinState(const Targets::TargetPinState& pinState) {
this->pinState = pinState;
}

1
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.cpp
View File

@@ -9,6 +9,7 @@
#include "src/Logger/Logger.hpp"
using namespace Bloom::InsightTargetWidgets::Qfp;
using namespace Bloom::Targets;
PinWidget::PinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant):
TargetPinWidget(parent, pinDescriptor, targetVariant) {

19
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/PinWidget.hpp
View File

@@ -41,19 +41,26 @@ namespace Bloom::InsightTargetWidgets::Qfp
static const int LABEL_HEIGHT = 20;
static const int MAXIMUM_LABEL_WIDTH = PinBodyWidget::WIDTH;
static const int MAXIMUM_LABEL_HEIGHT = 20;
static const int MAXIMUM_HORIZONTAL_WIDTH = PinBodyWidget::HEIGHT + (PinWidget::MAXIMUM_LABEL_WIDTH * PinWidget::MAXIMUM_LABEL_COUNT);
static const int MAXIMUM_HORIZONTAL_WIDTH = PinBodyWidget::HEIGHT
+ (PinWidget::MAXIMUM_LABEL_WIDTH * PinWidget::MAXIMUM_LABEL_COUNT);
static const int MAXIMUM_HORIZONTAL_HEIGHT = PinBodyWidget::WIDTH;
static const int MAXIMUM_VERTICAL_HEIGHT = PinBodyWidget::HEIGHT + (PinWidget::MAXIMUM_LABEL_HEIGHT * PinWidget::MAXIMUM_LABEL_COUNT);
static const int MAXIMUM_VERTICAL_HEIGHT = PinBodyWidget::HEIGHT
+ (PinWidget::MAXIMUM_LABEL_HEIGHT * PinWidget::MAXIMUM_LABEL_COUNT);
static const int MAXIMUM_VERTICAL_WIDTH = PinBodyWidget::WIDTH;
PinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant);
PinWidget(
QWidget* parent,
const Targets::TargetPinDescriptor& pinDescriptor,
const Targets::TargetVariant& targetVariant
);
virtual void updatePinState(const TargetPinState& pinState) override {
virtual void updatePinState(const Targets::TargetPinState& pinState) override {
TargetPinWidget::updatePinState(pinState);
if (pinState.ioDirection.has_value()) {
this->pinDirectionLabel->setText(pinState.ioDirection.value() == TargetPinState::IoDirection::INPUT ?
"IN" : "OUT");
this->pinDirectionLabel->setText(
pinState.ioDirection.value() == Targets::TargetPinState::IoDirection::INPUT ? "IN" : "OUT"
);
} else {
this->pinDirectionLabel->setText("");

12
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.cpp
View File

@@ -7,16 +7,17 @@
#include "../../InsightWindow.hpp"
#include "QuadFlatPackageWidget.hpp"
#include "src/Logger/Logger.hpp"
#include "src/Exceptions/Exception.hpp"
#include "PinWidget.hpp"
#include "BodyWidget.hpp"
using namespace Bloom::InsightTargetWidgets::Qfp;
using namespace Bloom::Exceptions;
using namespace Bloom::Targets;
QuadFlatPackageWidget::QuadFlatPackageWidget(const TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent):
TargetPackageWidget(targetVariant, insightWindowObj, parent) {
QuadFlatPackageWidget::QuadFlatPackageWidget(
const TargetVariant& targetVariant,
QObject* insightWindowObj,
QWidget* parent
): TargetPackageWidget(targetVariant, insightWindowObj, parent) {
assert((targetVariant.pinDescriptorsByNumber.size() % 4) == 0);
auto stylesheetFile = QFile(":/compiled/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/Stylesheets/QuadFlatPackage.qss");
@@ -212,4 +213,3 @@ void QuadFlatPackageWidget::drawWidget(QPainter& painter) {
containerHeight
);
}

4
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/QFP/QuadFlatPackageWidget.hpp
View File

@@ -12,8 +12,6 @@
namespace Bloom::InsightTargetWidgets::Qfp
{
using Targets::TargetVariant;
/**
* QuadFlatPackageWidget implements a custom Qt widget for Quad-flat package variants.
*/
@@ -36,6 +34,6 @@ namespace Bloom::InsightTargetWidgets::Qfp
public:
static const int PIN_WIDGET_LAYOUT_PADDING = 46;
static const int PIN_WIDGET_SPACING = 8;
QuadFlatPackageWidget(const TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent);
QuadFlatPackageWidget(const Targets::TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent);
};
}

9
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPackageWidget.hpp
View File

@@ -10,9 +10,6 @@
namespace Bloom::InsightTargetWidgets
{
using Targets::TargetVariant;
using Targets::TargetPinState;
/**
* Each custom target package widget should be derived from this class.
*/
@@ -20,14 +17,14 @@ namespace Bloom::InsightTargetWidgets
{
Q_OBJECT
protected:
TargetVariant targetVariant;
Targets::TargetVariant targetVariant;
std::vector<TargetPinWidget*> pinWidgets;
public:
TargetPackageWidget(const TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent):
TargetPackageWidget(const Targets::TargetVariant& targetVariant, QObject* insightWindowObj, QWidget* parent):
QWidget(parent), targetVariant(targetVariant) {};
virtual void updatePinStates(std::map<int, TargetPinState> pinStatesByNumber) {
virtual void updatePinStates(std::map<int, Targets::TargetPinState> pinStatesByNumber) {
for (auto& pinWidget : this->pinWidgets) {
auto pinNumber = pinWidget->getPinNumber();
if (pinStatesByNumber.contains(pinNumber)) {

30
src/Insight/UserInterfaces/InsightWindow/TargetWidgets/TargetPinWidget.hpp
View File

@@ -7,23 +7,21 @@
namespace Bloom::InsightTargetWidgets
{
using Targets::TargetVariant;
using Targets::TargetPinDescriptor;
using Targets::TargetPinType;
using Targets::TargetPinState;
class TargetPinWidget: public QWidget
{
Q_OBJECT
protected:
TargetVariant targetVariant;
TargetPinDescriptor pinDescriptor;
std::optional<TargetPinState> pinState;
Targets::TargetVariant targetVariant;
Targets::TargetPinDescriptor pinDescriptor;
std::optional<Targets::TargetPinState> pinState;
bool pinStateChanged = false;
public:
TargetPinWidget(QWidget* parent, const TargetPinDescriptor& pinDescriptor, const TargetVariant& targetVariant):
QWidget(parent), targetVariant(targetVariant), pinDescriptor(pinDescriptor) {
TargetPinWidget(
QWidget* parent,
const Targets::TargetPinDescriptor& pinDescriptor,
const Targets::TargetVariant& targetVariant
): QWidget(parent), targetVariant(targetVariant), pinDescriptor(pinDescriptor) {
this->setDisabled(false);
};
@@ -31,15 +29,15 @@ namespace Bloom::InsightTargetWidgets
return this->pinDescriptor.number;
}
const TargetPinDescriptor& getPinDescriptor() const {
const Targets::TargetPinDescriptor& getPinDescriptor() const {
return this->pinDescriptor;
}
std::optional<TargetPinState> getPinState() const {
std::optional<Targets::TargetPinState> getPinState() const {
return this->pinState;
}
virtual void updatePinState(const TargetPinState& pinState) {
virtual void updatePinState(const Targets::TargetPinState& pinState) {
this->pinStateChanged = !this->pinState.has_value()
|| this->pinState->ioState != pinState.ioState
|| this->pinState->ioDirection != pinState.ioDirection;
@@ -48,9 +46,9 @@ namespace Bloom::InsightTargetWidgets
}
void setDisabled(bool disabled) {
if (pinDescriptor.type != TargetPinType::GND
&& pinDescriptor.type != TargetPinType::VCC
&& pinDescriptor.type != TargetPinType::UNKNOWN
if (pinDescriptor.type != Targets::TargetPinType::GND
&& pinDescriptor.type != Targets::TargetPinType::VCC
&& pinDescriptor.type != Targets::TargetPinType::UNKNOWN
) {
QWidget::setDisabled(disabled);