Tidying/consistency of includes

This commit is contained in:
Nav
2021-10-02 17:39:27 +01:00
parent fc6d7dfc51
commit df6b94b0de
27 changed files with 51 additions and 29 deletions

View File

@@ -1,4 +1,5 @@
#include "ApplicationConfig.hpp" #include "ApplicationConfig.hpp"
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"
#include "src/Exceptions/InvalidConfig.hpp" #include "src/Exceptions/InvalidConfig.hpp"

View File

@@ -1,6 +1,7 @@
#include "DebugServer.hpp"
#include <variant> #include <variant>
#include "DebugServer.hpp"
#include "src/Exceptions/InvalidConfig.hpp" #include "src/Exceptions/InvalidConfig.hpp"
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"

View File

@@ -1,8 +1,9 @@
#include "CommandPacket.hpp" #include "CommandPacket.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;
void CommandPacket::dispatchToHandler(Gdb::GdbRspDebugServer& gdbRspDebugServer) { void CommandPacket::dispatchToHandler(Gdb::GdbRspDebugServer& gdbRspDebugServer) {
gdbRspDebugServer.handleGdbPacket(*this); gdbRspDebugServer.handleGdbPacket(*this);
} }

View File

@@ -1,9 +1,9 @@
#include "CommandPacketFactory.hpp"
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <map> #include <map>
#include "CommandPacketFactory.hpp"
using namespace Bloom::DebugServers::Gdb; using namespace Bloom::DebugServers::Gdb;
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,7 +1,8 @@
#include "ContinueExecution.hpp"
#include <cstdint> #include <cstdint>
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
#include "ContinueExecution.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,4 +1,5 @@
#include "InterruptExecution.hpp" #include "InterruptExecution.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,4 +1,5 @@
#include "ReadMemory.hpp" #include "ReadMemory.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,4 +1,5 @@
#include "ReadRegisters.hpp" #include "ReadRegisters.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,6 +1,7 @@
#include "RemoveBreakpoint.hpp"
#include <QtCore/QString> #include <QtCore/QString>
#include "RemoveBreakpoint.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,4 +1,5 @@
#include "SetBreakpoint.hpp" #include "SetBreakpoint.hpp"
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>

View File

@@ -1,6 +1,7 @@
#include "SupportedFeaturesQuery.hpp"
#include <QtCore/QString> #include <QtCore/QString>
#include "SupportedFeaturesQuery.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,4 +1,5 @@
#include "WriteMemory.hpp" #include "WriteMemory.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,4 +1,5 @@
#include "WriteRegister.hpp" #include "WriteRegister.hpp"
#include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp" #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"

View File

@@ -1,15 +1,16 @@
#include "Connection.hpp"
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <cerrno> #include <cerrno>
#include <fcntl.h> #include <fcntl.h>
#include "src/Logger/Logger.hpp" #include "CommandPackets/CommandPacketFactory.hpp"
#include "src/Exceptions/Exception.hpp"
#include "src/Exceptions/DebugServerInterrupted.hpp"
#include "Connection.hpp"
#include "Exceptions/ClientDisconnected.hpp" #include "Exceptions/ClientDisconnected.hpp"
#include "Exceptions/ClientCommunicationError.hpp" #include "Exceptions/ClientCommunicationError.hpp"
#include "CommandPackets/CommandPacketFactory.hpp" #include "src/Exceptions/Exception.hpp"
#include "src/Exceptions/DebugServerInterrupted.hpp"
#include "src/Logger/Logger.hpp"
using namespace Bloom::DebugServers::Gdb; using namespace Bloom::DebugServers::Gdb;
using namespace Bloom::DebugServers::Gdb::CommandPackets; using namespace Bloom::DebugServers::Gdb::CommandPackets;

View File

@@ -1,8 +1,9 @@
#include "GdbRspDebugServer.hpp"
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <cstdint> #include <cstdint>
#include "GdbRspDebugServer.hpp"
#include "Exceptions/ClientDisconnected.hpp" #include "Exceptions/ClientDisconnected.hpp"
#include "Exceptions/ClientNotSupported.hpp" #include "Exceptions/ClientNotSupported.hpp"
#include "Exceptions/ClientCommunicationError.hpp" #include "Exceptions/ClientCommunicationError.hpp"

View File

@@ -1,6 +1,7 @@
#include "src/Exceptions/Exception.hpp"
#include "Response.hpp" #include "Response.hpp"
#include "src/Exceptions/Exception.hpp"
using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap; using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap;
void Response::init(const std::vector<unsigned char>& rawResponse) { void Response::init(const std::vector<unsigned char>& rawResponse) {

View File

@@ -1,4 +1,5 @@
#include "AvrEvent.hpp" #include "AvrEvent.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr; using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr;

View File

@@ -1,6 +1,7 @@
#include "AvrResponse.hpp"
#include <cstdint> #include <cstdint>
#include "AvrResponse.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr; using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr;
@@ -40,4 +41,3 @@ void AvrResponse::init(const std::vector<unsigned char>& rawResponse) {
this->setResponsePacket(responsePacket); this->setResponsePacket(responsePacket);
} }

View File

@@ -1,7 +1,7 @@
#include <math.h>
#include "AvrCommandFrame.hpp" #include "AvrCommandFrame.hpp"
#include <math.h>
using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr; using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr;
std::vector<AvrCommand> AvrCommandFrame::generateAvrCommands(std::size_t maximumCommandPacketSize) const { std::vector<AvrCommand> AvrCommandFrame::generateAvrCommands(std::size_t maximumCommandPacketSize) const {

View File

@@ -1,6 +1,7 @@
#include "BreakEvent.hpp"
#include <cstdint> #include <cstdint>
#include "BreakEvent.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr; using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr;

View File

@@ -1,6 +1,7 @@
#include "AvrResponseFrame.hpp"
#include <cstdint> #include <cstdint>
#include "AvrResponseFrame.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"
using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr; using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr;

View File

@@ -1,10 +1,11 @@
#include "Paths.hpp"
#include <unistd.h> #include <unistd.h>
#include <array> #include <array>
#include <filesystem> #include <filesystem>
#include <climits> #include <climits>
#include <src/Exceptions/Exception.hpp>
#include "Paths.hpp" #include "src/Exceptions/Exception.hpp"
using namespace Bloom; using namespace Bloom;

View File

@@ -1,6 +1,7 @@
#include "Logger.hpp"
#include <iostream> #include <iostream>
#include <thread> #include <thread>
#include "Logger.hpp"
using namespace Bloom; using namespace Bloom;

View File

@@ -1,7 +1,8 @@
#include "SignalHandler.hpp"
#include <csignal> #include <csignal>
#include <thread> #include <thread>
#include "SignalHandler.hpp"
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"
#include "src/Exceptions/Exception.hpp" #include "src/Exceptions/Exception.hpp"

View File

@@ -1,3 +1,5 @@
#include "Avr8.hpp"
#include <cstdint> #include <cstdint>
#include <QtCore> #include <QtCore>
#include <QJsonDocument> #include <QJsonDocument>
@@ -5,7 +7,6 @@
#include <bitset> #include <bitset>
#include <limits> #include <limits>
#include "Avr8.hpp"
#include "PadDescriptor.hpp" #include "PadDescriptor.hpp"
#include "PhysicalInterface.hpp" #include "PhysicalInterface.hpp"
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"

View File

@@ -1,7 +1,8 @@
#include "TargetDescriptionFile.hpp"
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonArray> #include <QJsonArray>
#include "TargetDescriptionFile.hpp"
#include "Exceptions/TargetDescriptionParsingFailureException.hpp" #include "Exceptions/TargetDescriptionParsingFailureException.hpp"
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"
@@ -462,7 +463,6 @@ void TargetDescriptionFile::loadPinouts() {
} }
} }
void TargetDescriptionFile::loadInterfaces() { void TargetDescriptionFile::loadInterfaces() {
auto interfaceNodes = this->deviceElement.elementsByTagName("interfaces").item(0).toElement() auto interfaceNodes = this->deviceElement.elementsByTagName("interfaces").item(0).toElement()
.elementsByTagName("interface"); .elementsByTagName("interface");

View File

@@ -1,8 +1,8 @@
#include "Application.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
#include "Application.hpp"
using namespace Bloom; using namespace Bloom;
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {