Remove legacy JFI structures

Serial-Studio.pro

@@ -174,7 +174,6 @@ HEADERS += \
     src/JSON/Dataset.h \
     src/JSON/Editor.h \
     src/JSON/Frame.h \
-    src/JSON/FrameInfo.h \
     src/JSON/Generator.h \
     src/JSON/Group.h \
     src/MQTT/Client.h \
@@ -217,7 +216,6 @@ SOURCES += \
     src/JSON/Dataset.cpp \
     src/JSON/Editor.cpp \
     src/JSON/Frame.cpp \
-    src/JSON/FrameInfo.cpp \
     src/JSON/Generator.cpp \
     src/JSON/Group.cpp \
     src/MQTT/Client.cpp \

src/CSV/Export.cpp

@@ -20,20 +20,19 @@
  * THE SOFTWARE.
  */
 
-#include "Export.h"
-
-#include <AppInfo.h>
-#include <IO/Manager.h>
-#include <UI/Dashboard.h>
-#include <Misc/Utilities.h>
-#include <Misc/TimerEvents.h>
-
 #include <QDir>
 #include <QUrl>
 #include <QFileInfo>
 #include <QApplication>
 #include <QDesktopServices>
 
+#include <AppInfo.h>
+#include <IO/Manager.h>
+#include <CSV/Export.h>
+#include <UI/Dashboard.h>
+#include <Misc/Utilities.h>
+#include <Misc/TimerEvents.h>
+
 /**
  * Connect JSON Parser & Serial Manager signals to begin registering JSON
  * dataframes into JSON list.

src/CSV/Player.cpp

@@ -20,8 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "Player.h"
-
 #include <QtMath>
 #include <QFileDialog>
 #include <QApplication>
@@ -29,6 +27,7 @@
 #include <qtcsv/stringdata.h>
 #include <qtcsv/reader.h>
 
+#include <CSV/Player.h>
 #include <IO/Manager.h>
 #include <Misc/Utilities.h>
 

src/IO/Checksum.cpp

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include "Checksum.h"
+#include <IO/Checksum.h>
 
 uint8_t IO::crc8(const char *data, const int length)
 {

src/IO/Console.cpp

@@ -20,9 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "Console.h"
-#include "Manager.h"
-
 #include <QFile>
 #include <QPrinter>
 #include <QDateTime>
@@ -30,6 +27,8 @@
 #include <QPrintDialog>
 #include <QTextDocument>
 
+#include <IO/Manager.h>
+#include <IO/Console.h>
 #include <Misc/Utilities.h>
 #include <Misc/TimerEvents.h>
 

src/IO/DataSources/Network.cpp

@@ -20,10 +20,9 @@
  * THE SOFTWARE.
  */
 
-#include "Network.h"
-
 #include <IO/Manager.h>
 #include <Misc/Utilities.h>
+#include <IO/DataSources/Network.h>
 
 /**
  * Constructor function

src/IO/DataSources/Serial.cpp

@@ -20,11 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include "Serial.h"
-
 #include <IO/Manager.h>
 #include <Misc/Utilities.h>
 #include <Misc/TimerEvents.h>
+#include <IO/DataSources/Serial.h>
 
 /**
  * Constructor function

src/IO/Manager.cpp

@@ -21,13 +21,12 @@
  * THE SOFTWARE.
  */
 
-#include "Manager.h"
+#include <IO/Manager.h>
-#include "Checksum.h"
+#include <IO/Checksum.h>
-
-#include <MQTT/Client.h>
 #include <IO/DataSources/Serial.h>
 #include <IO/DataSources/Network.h>
 
+#include <MQTT/Client.h>
 #include <QNetworkDatagram>
 
 /**

src/JSON/Dataset.cpp

@@ -20,9 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "Dataset.h"
+#include <JSON/Dataset.h>
-#include "Generator.h"
+#include <JSON/Generator.h>
-#include "FrameInfo.h"
 
 JSON::Dataset::Dataset()
     : m_fft(false)

src/JSON/Editor.cpp

@@ -20,12 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "Editor.h"
-#include "FrameInfo.h"
-#include "Generator.h"
-#include "IO/Manager.h"
-#include "Misc/Utilities.h"
-
 #include <QFile>
 #include <QFileInfo>
 #include <QJsonArray>
@@ -33,6 +27,12 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
+#include <AppInfo.h>
+#include <IO/Manager.h>
+#include <JSON/Editor.h>
+#include <JSON/Generator.h>
+#include <Misc/Utilities.h>
+
 //----------------------------------------------------------------------------------------
 // Constructor/deconstructor & singleton
 //----------------------------------------------------------------------------------------

src/JSON/Editor.h

@@ -24,9 +24,8 @@
 
 #include <QObject>
 #include <DataTypes.h>
-
+#include <JSON/Group.h>
-#include "Group.h"
+#include <JSON/Dataset.h>
-#include "Dataset.h"
 
 namespace JSON
 {

src/JSON/Frame.cpp

@@ -20,8 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include "Frame.h"
+#include <JSON/Frame.h>
-#include "FrameInfo.h"
 
 /**
  * Destructor function, free memory used by the @c Group objects before destroying an

src/JSON/Frame.h

@@ -27,8 +27,7 @@
 #include <QVariant>
 #include <QJsonArray>
 #include <QJsonObject>
-
+#include <JSON/Group.h>
-#include "Group.h"
 
 namespace JSON
 {

src/JSON/FrameInfo.cpp

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Alex Spataru <https://github.com/alex-spataru>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "FrameInfo.h"
-
-/**
- * Creates an empty JFI structure with the current system date/time and frame number @c n
- */
-JFI_Object JFI_Empty(const quint64 n)
-{
-    JFI_Object info;
-    info.frameNumber = n;
-    info.rxDateTime = QDateTime::currentDateTime();
-    return info;
-}
-
-/**
- * Creates a new JFI structure with the given information
- *
- * @param n frame number
- * @param t date/time
- * @param d JSON document
- */
-JFI_Object JFI_CreateNew(const quint64 n, const QDateTime &t, const QJsonDocument &d)
-{
-    JFI_Object info;
-    info.rxDateTime = t;
-    info.frameNumber = n;
-    info.jsonDocument = d;
-    return info;
-}

src/JSON/FrameInfo.h

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Alex Spataru <https://github.com/alex-spataru>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#pragma once
-
-#include <QVector>
-#include <QDateTime>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QJsonObject>
-#include <QJsonDocument>
-
-#include "DataTypes.h"
-
-typedef struct
-{
-    quint64 frameNumber;
-    QDateTime rxDateTime;
-    QJsonDocument jsonDocument;
-} JFI_Object;
-Q_DECLARE_METATYPE(JFI_Object)
-
-extern JFI_Object JFI_Empty(const quint64 n = 0);
-extern JFI_Object JFI_CreateNew(const quint64 n, const QDateTime &t,
-                                const QJsonDocument &d);

src/JSON/Generator.cpp

@@ -20,25 +20,23 @@
  * THE SOFTWARE.
  */
 
-#include "Editor.h"
+#include <QFileInfo>
-#include "Generator.h"
+#include <QFileDialog>
-#include "FrameInfo.h"
+#include <QRegularExpression>
+
+#include <JSON/Editor.h>
+#include <JSON/Generator.h>
 
 #include <CSV/Player.h>
 #include <IO/Manager.h>
 #include <MQTT/Client.h>
 #include <Misc/Utilities.h>
 
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QRegularExpression>
-
 /**
  * Initializes the JSON Parser class and connects appropiate SIGNALS/SLOTS
  */
 JSON::Generator::Generator()
-    : m_frameCount(0)
+    : m_opMode(kAutomatic)
-    , m_opMode(kAutomatic)
 {
     // clang-format off
     connect(&CSV::Player::instance(), &CSV::Player::openChanged,
@@ -220,8 +218,8 @@ void JSON::Generator::writeSettings(const QString &path)
  */
 void JSON::Generator::reset()
 {
-    m_frameCount = 0;
+    m_json = QJsonObject();
-    Q_EMIT jsonChanged(JFI_Empty());
+    Q_EMIT jsonChanged(m_json);
 }
 
 /**
@@ -243,25 +241,9 @@ void JSON::Generator::readData(const QByteArray &data)
     if (data.isEmpty())
         return;
 
-    // Increment received frames and process frame
-    m_frameCount++;
-    processFrame(data, m_frameCount, QDateTime::currentDateTime());
-}
-
-/**
- * Reads the frame & inserts its values on the JSON map, and/or extracts the JSON frame
- * directly from the serial data.
- */
-void JSON::Generator::processFrame(const QByteArray &data, const quint64 frame,
-                                   const QDateTime &time)
-{
-    //
-    // TODO: Re-write this function because it leaks memory
-    //
-
     // Serial device sends JSON (auto mode)
     if (operationMode() == JSON::Generator::kAutomatic)
-        m_jfi.jsonDocument = QJsonDocument::fromJson(data, &m_error);
+        m_json = QJsonDocument::fromJson(data, &m_error).object();
 
     // We need to use a map file, check if its loaded & replace values into map
     else
@@ -278,7 +260,7 @@ void JSON::Generator::processFrame(const QByteArray &data, const quint64 frame,
             json.replace(QString("\"%%1\"").arg(i + 1), "\"" + list.at(i) + "\"");
 
         // Create JSON document
-        m_jfi.jsonDocument = QJsonDocument::fromJson(json.toUtf8(), &m_error);
+        m_json = QJsonDocument::fromJson(json.toUtf8(), &m_error).object();
 
         // Clear strings
         json.clear();
@@ -286,11 +268,7 @@ void JSON::Generator::processFrame(const QByteArray &data, const quint64 frame,
 
     // No parse error, update UI & reset error counter
     if (m_error.error == QJsonParseError::NoError)
-    {
+        Q_EMIT jsonChanged(m_json);
-        m_jfi.rxDateTime = time;
-        m_jfi.frameNumber = frame;
-        Q_EMIT jsonChanged(m_jfi);
-    }
 }
 
 #ifdef SERIAL_STUDIO_INCLUDE_MOC

src/JSON/Generator.h

@@ -30,8 +30,7 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
-#include "Frame.h"
+#include <JSON/Frame.h>
-#include "FrameInfo.h"
 
 namespace JSON
 {
@@ -76,7 +75,7 @@ class Generator : public QObject
 Q_SIGNALS:
     void jsonFileMapChanged();
     void operationModeChanged();
-    void jsonChanged(const JFI_Object &info);
+    void jsonChanged(const QJsonObject &json);
 
 private:
     explicit Generator();
@@ -112,12 +111,10 @@ public Q_SLOTS:
 private Q_SLOTS:
     void reset();
     void readData(const QByteArray &data);
-    void processFrame(const QByteArray &data, const quint64 frame, const QDateTime &time);
 
 private:
     QFile m_jsonMap;
-    JFI_Object m_jfi;
+    QJsonObject m_json;
-    quint64 m_frameCount;
     QSettings m_settings;
     QString m_jsonMapData;
     OperationMode m_opMode;

src/JSON/Group.cpp

@@ -20,9 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "Group.h"
+#include <QJsonArray>
-#include "Dataset.h"
+#include <JSON/Group.h>
-#include "FrameInfo.h"
 
 /**
  * Destructor function

src/JSON/Group.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#include <QVector>
+#include <JSON/Dataset.h>
-#include <QObject>
-#include <QVariant>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "Dataset.h"
 
 namespace UI
 {

src/MQTT/Client.cpp

@@ -20,12 +20,11 @@
  * THE SOFTWARE.
  */
 
-#include "Client.h"
-
 #include <QFile>
 #include <QFileDialog>
 
 #include <IO/Manager.h>
+#include <MQTT/Client.h>
 #include <Misc/Utilities.h>
 #include <Misc/TimerEvents.h>
 

src/Misc/MacExtras.cpp

@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "MacExtras.h"
+#include <Misc/MacExtras.h>
-#include "Translator.h"
+#include <Misc/Translator.h>
 
 #ifdef Q_OS_MAC
 #    include <kdmactouchbar.h>

src/Misc/ModuleManager.cpp

@@ -20,8 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "ModuleManager.h"
-
 #include <AppInfo.h>
 
 #include <CSV/Export.h>
@@ -32,7 +30,6 @@
 #include <JSON/Editor.h>
 #include <JSON/Dataset.h>
 #include <JSON/Generator.h>
-#include <JSON/FrameInfo.h>
 
 #include <IO/Manager.h>
 #include <IO/Console.h>
@@ -135,7 +132,6 @@ void Misc::ModuleManager::configureUpdater()
  */
 void Misc::ModuleManager::registerQmlTypes()
 {
-    qRegisterMetaType<JFI_Object>("JFI_Object");
     qmlRegisterType<Widgets::Terminal>("SerialStudio", 1, 0, "Terminal");
     qmlRegisterType<UI::DashboardWidget>("SerialStudio", 1, 0, "DashboardWidget");
 }

src/Misc/ThemeManager.cpp

@@ -20,10 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "AppInfo.h"
-#include "Utilities.h"
-#include "ThemeManager.h"
-
 #include <QDir>
 #include <QFile>
 #include <QPalette>
@@ -33,6 +29,10 @@
 #include <QApplication>
 #include <QJsonDocument>
 
+#include <AppInfo.h>
+#include <Misc/Utilities.h>
+#include <Misc/ThemeManager.h>
+
 /**
  * Constructor function, searches for available themes & loads
  * the theme variant selected by the user.

src/Misc/TimerEvents.cpp

@@ -21,7 +21,7 @@
  */
 
 #include <QTimerEvent>
-#include "TimerEvents.h"
+#include <Misc/TimerEvents.h>
 
 /**
  * Returns a pointer to the only instance of the class

src/Misc/Translator.cpp

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include "Translator.h"
+#include <Misc/Translator.h>
 
 /**
  * Constructor function

src/Misc/Utilities.cpp

@@ -20,8 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "Utilities.h"
-
 #include <QDir>
 #include <QUrl>
 #include <QPalette>
@@ -33,6 +31,7 @@
 #include <QDesktopServices>
 
 #include <AppInfo.h>
+#include <Misc/Utilities.h>
 
 /**
  * Returns a pointer to the only instance of the class

src/Misc/Utilities.h

@@ -26,8 +26,6 @@
 #include <QMessageBox>
 #include <QApplication>
 
-#include "AppInfo.h"
-
 namespace Misc
 {
 /**

src/Plugins/Server.cpp

@@ -20,8 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "Server.h"
-
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QJsonDocument>
@@ -29,6 +27,7 @@
 #include <IO/Manager.h>
 #include <JSON/Generator.h>
 #include <Misc/Utilities.h>
+#include <Plugins/Server.h>
 #include <Misc/TimerEvents.h>
 
 /**
@@ -215,9 +214,7 @@ void Plugins::Server::sendProcessedData()
     {
         QJsonObject object;
         auto frame = m_frames.at(i);
-        object.insert("id", QString::number(frame.frameNumber));
+        object.insert("data", frame);
-        object.insert("timestamp", frame.rxDateTime.toString());
-        object.insert("data", frame.jsonDocument.object());
         array.append(object);
     }
 
@@ -282,9 +279,9 @@ void Plugins::Server::sendRawData(const QByteArray &data)
  * Obtains the latest JSON dataframe & appends it to the JSON list, which is later read
  * and sent by the @c sendProcessedData() function.
  */
-void Plugins::Server::registerFrame(const JFI_Object &frameInfo)
+void Plugins::Server::registerFrame(const QJsonObject &json)
 {
-    m_frames.append(frameInfo);
+    m_frames.append(json);
 }
 
 /**

src/Plugins/Server.h

@@ -30,7 +30,6 @@
 
 #include <JSON/Frame.h>
 #include <JSON/Dataset.h>
-#include <JSON/FrameInfo.h>
 
 /**
  * Default TCP port to use for incoming connections, I choose 7777 because 7 is one of
@@ -85,13 +84,13 @@ private Q_SLOTS:
     void acceptConnection();
     void sendProcessedData();
     void sendRawData(const QByteArray &data);
-    void registerFrame(const JFI_Object &frameInfo);
+    void registerFrame(const QJsonObject &json);
     void onErrorOccurred(const QAbstractSocket::SocketError socketError);
 
 private:
     bool m_enabled;
     QTcpServer m_server;
-    QVector<JFI_Object> m_frames;
+    QVector<QJsonObject> m_frames;
     QVector<QTcpSocket *> m_sockets;
 };
 }

src/UI/Dashboard.cpp

@@ -20,16 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include <QtAlgorithms>
-
 #include <IO/Manager.h>
 #include <IO/Console.h>
 #include <CSV/Player.h>
+#include <UI/Dashboard.h>
 #include <JSON/Generator.h>
 #include <Misc/TimerEvents.h>
 
-#include "Dashboard.h"
-
 //----------------------------------------------------------------------------------------
 // Constructor/deconstructor & singleton
 //----------------------------------------------------------------------------------------
@@ -737,7 +734,7 @@ void UI::Dashboard::updatePlots()
 /**
  * Regenerates the data displayed on the dashboard widgets
  */
-void UI::Dashboard::processLatestJSON(const JFI_Object &frameInfo)
+void UI::Dashboard::processLatestJSON(const QJsonObject &json)
 {
     // Save widget count
     const int barC = barCount();
@@ -756,7 +753,7 @@ void UI::Dashboard::processLatestJSON(const JFI_Object &frameInfo)
     auto pTitle = title();
 
     // Try to read latest frame for widget updating
-    if (!m_latestFrame.read(frameInfo.jsonDocument.object()))
+    if (!m_latestFrame.read(json))
         return;
 
     // Regenerate plot data

src/UI/Dashboard.h

@@ -26,7 +26,6 @@
 #include <QObject>
 #include <DataTypes.h>
 #include <JSON/Frame.h>
-#include <JSON/FrameInfo.h>
 
 namespace UI
 {
@@ -265,7 +264,7 @@ public Q_SLOTS:
 private Q_SLOTS:
     void resetData();
     void updatePlots();
-    void processLatestJSON(const JFI_Object &frameInfo);
+    void processLatestJSON(const QJsonObject &json);
 
 private:
     QVector<JSON::Group> getLEDWidgets() const;

src/UI/DashboardWidget.cpp

@@ -20,9 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "DashboardWidget.h"
-
 #include <Misc/ThemeManager.h>
+#include <UI/DashboardWidget.h>
 
 #include <UI/Widgets/Bar.h>
 #include <UI/Widgets/GPS.h>

src/UI/DeclarativeWidget.cpp

@@ -20,8 +20,8 @@
  * THE SOFTWARE.
  */
 
-#include "DeclarativeWidget.h"
 #include <Misc/ThemeManager.h>
+#include <UI/DeclarativeWidget.h>
 
 /**
  * Creates a subclass of @c QWidget that allows us to call the given protected/private

src/UI/Widgets/Accelerometer.cpp

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include "UI/Dashboard.h"
-#include "Accelerometer.h"
-#include "Misc/ThemeManager.h"
-
 #include <QtMath>
 #include <QResizeEvent>
 
+#include <UI/Dashboard.h>
+#include <Misc/ThemeManager.h>
+#include <UI/Widgets/Accelerometer.h>
+
 /**
  * Constructor function, configures widget style & signal/slot connections.
  */

src/UI/Widgets/Accelerometer.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Common/BaseWidget.h"
+#include <UI/Widgets/Common/BaseWidget.h>
-#include "Common/AnalogGauge.h"
+#include <UI/Widgets/Common/AnalogGauge.h>
 
 namespace Widgets
 {

src/UI/Widgets/Bar.cpp

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-#include "Bar.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-
 #include <QResizeEvent>
 
+#include <UI/Dashboard.h>
+#include <UI/Widgets/Bar.h>
+#include <Misc/ThemeManager.h>
+
 /**
  * Constructor function, configures widget style & signal/slot connections.
  */

src/UI/Widgets/Bar.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <QwtThermo>
-#include "Common/BaseWidget.h"
+#include <UI/Widgets/Common/BaseWidget.h>
 
 namespace Widgets
 {

src/UI/Widgets/Common/AnalogGauge.cpp

@@ -24,8 +24,8 @@
 #include <QwtDialNeedle>
 #include <QwtRoundScaleDraw>
 
-#include "AnalogGauge.h"
+#include <Misc/ThemeManager.h>
-#include "Misc/ThemeManager.h"
+#include <UI/Widgets/Common/AnalogGauge.h>
 
 Widgets::AnalogGauge::AnalogGauge(QWidget *parent)
     : QwtDial(parent)

src/UI/Widgets/Common/AttitudeIndicator.cpp

@@ -20,8 +20,6 @@
  * THE SOFTWARE.
  */
 
-#include "AttitudeIndicator.h"
-
 #include <QtMath>
 #include <QPainter>
 #include <QPainterPath>
@@ -29,6 +27,8 @@
 #include <QwtDialNeedle>
 #include <QwtRoundScaleDraw>
 
+#include <UI/Widgets/Common/AttitudeIndicator.h>
+
 namespace Widgets
 {
 namespace

src/UI/Widgets/Common/BaseWidget.cpp

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-#include "BaseWidget.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-
 #include <QResizeEvent>
 
+#include <UI/Dashboard.h>
+#include <Misc/ThemeManager.h>
+#include <UI/Widgets/Common/BaseWidget.h>
+
 Widgets::BaseWidget::BaseWidget()
     : m_index(-1)
     , m_widget(Q_NULLPTR)

src/UI/Widgets/Common/ElidedLabel.cpp

@@ -22,8 +22,7 @@
 
 #include <QTimer>
 #include <QResizeEvent>
-
+#include <UI/Widgets/Common/ElidedLabel.h>
-#include "ElidedLabel.h"
 
 Widgets::ElidedLabel::ElidedLabel(QWidget *parent, Qt::WindowFlags flags)
     : QLabel(parent, flags)

src/UI/Widgets/Common/KLed.cpp

@@ -6,12 +6,11 @@
     SPDX-License-Identifier: LGPL-2.0-or-later
 */
 
-#include "KLed.h"
-
 #include <QImage>
-#include <QPainter>
 #include <QStyle>
+#include <QPainter>
 #include <QStyleOption>
+#include <UI/Widgets/Common/KLed.h>
 
 class KLedPrivate
 {

src/UI/Widgets/Compass.cpp

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-#include "Compass.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-
 #include <QResizeEvent>
 #include <QwtCompassScaleDraw>
 #include <QwtCompassMagnetNeedle>
 
+#include <UI/Dashboard.h>
+#include <Misc/ThemeManager.h>
+#include <UI/Widgets/Compass.h>
+
 /**
  * Constructor function, configures widget style & signal/slot connections.
  */

src/UI/Widgets/Compass.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <QwtCompass>
-#include "Common/BaseWidget.h"
+#include <UI/Widgets/Common/BaseWidget.h>
 
 namespace Widgets
 {

src/UI/Widgets/DataGroup.cpp

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include "DataGroup.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-
 #include <QResizeEvent>
 #include <QRegularExpression>
 
+#include <UI/Dashboard.h>
+#include <Misc/ThemeManager.h>
+#include <UI/Widgets/DataGroup.h>
+
 #define EXEC_EVENT(pointer, function, event)                                             \
     if (pointer)                                                                         \
     {                                                                                    \

src/UI/Widgets/DataGroup.h

@@ -25,9 +25,9 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 #include <QScrollArea>
-#include <UI/DashboardWidget.h>
 
-#include "Common/ElidedLabel.h"
+#include <UI/DashboardWidget.h>
+#include <UI/Widgets/Common/ElidedLabel.h>
 
 namespace Widgets
 {

src/UI/Widgets/FFTPlot.cpp

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-#include "FFTPlot.h"
+#include <UI/Dashboard.h>
-#include "UI/Dashboard.h"
+#include <Misc/ThemeManager.h>
-#include "Misc/ThemeManager.h"
+#include <UI/Widgets/FFTPlot.h>
 
 /**
  * Constructor function, configures widget style & signal/slot connections.

src/UI/Widgets/FFTPlot.h

@@ -27,9 +27,9 @@
 #include <QVBoxLayout>
 #include <QwtPlotCurve>
 #include <QwtScaleEngine>
-#include <UI/DashboardWidget.h>
 
-#include "qfouriertransformer.h"
+#include <UI/DashboardWidget.h>
+#include <qfouriertransformer.h>
 
 namespace Widgets
 {

src/UI/Widgets/GPS.cpp

@@ -20,13 +20,12 @@
  * THE SOFTWARE.
  */
 
-#include "GPS.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-#include "Misc/ModuleManager.h"
-
 #include <googlemapadapter.h>
 
+#include <UI/Dashboard.h>
+#include <UI/Widgets/GPS.h>
+#include <Misc/ThemeManager.h>
+
 /**
  * Generates the user interface elements & layout
  */

src/UI/Widgets/Gauge.cpp

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-#include "Gauge.h"
+#include <UI/Dashboard.h>
-#include "UI/Dashboard.h"
+#include <UI/Widgets/Gauge.h>
-#include "Misc/ThemeManager.h"
+#include <Misc/ThemeManager.h>
 
 /**
  * Constructor function, configures widget style & signal/slot connections.

src/UI/Widgets/Gauge.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Common/BaseWidget.h"
+#include <UI/Widgets/Common/BaseWidget.h>
-#include "Common/AnalogGauge.h"
+#include <UI/Widgets/Common/AnalogGauge.h>
 
 namespace Widgets
 {

src/UI/Widgets/Gyroscope.cpp

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-#include "Gyroscope.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-#include "Misc/TimerEvents.h"
-
 #include <QResizeEvent>
 
+#include <UI/Dashboard.h>
+#include <Misc/TimerEvents.h>
+#include <Misc/ThemeManager.h>
+#include <UI/Widgets/Gyroscope.h>
+
 /**
  * Constructor function, configures widget style & signal/slot connections.
  */

src/UI/Widgets/Gyroscope.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Common/BaseWidget.h"
+#include <UI/Widgets/Common/BaseWidget.h>
-#include "Common/AttitudeIndicator.h"
+#include <UI/Widgets/Common/AttitudeIndicator.h>
 
 namespace Widgets
 {

src/UI/Widgets/LEDPanel.cpp

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-#include "LEDPanel.h"
-#include "UI/Dashboard.h"
-#include "Misc/ThemeManager.h"
-
 #include <QResizeEvent>
 
+#include <UI/Dashboard.h>
+#include <Misc/ThemeManager.h>
+#include <UI/Widgets/LEDPanel.h>
+
 /**
  * Generates the user interface elements & layout
  */

src/UI/Widgets/LEDPanel.h

@@ -28,8 +28,7 @@
 #include <QScrollArea>
 
 #include <UI/DashboardWidget.h>
-
+#include <UI/Widgets/Common/KLed.h>
-#include "Common/KLed.h"
 
 namespace Widgets
 {

src/UI/Widgets/MultiPlot.cpp

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include "MultiPlot.h"
+#include <CSV/Player.h>
-#include "CSV/Player.h"
+#include <UI/Dashboard.h>
-#include "UI/Dashboard.h"
+#include <Misc/ThemeManager.h>
-#include "Misc/ThemeManager.h"
+#include <UI/Widgets/MultiPlot.h>
 
 /**
  * Constructor function, configures widget style & signal/slot connections.

src/UI/Widgets/Plot.cpp

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-#include "Plot.h"
+#include <CSV/Player.h>
-#include "CSV/Player.h"
+#include <UI/Dashboard.h>
-#include "UI/Dashboard.h"
+#include <UI/Widgets/Plot.h>
-#include "Misc/ThemeManager.h"
+#include <Misc/ThemeManager.h>
 
 /**
  * Constructor function, configures widget style & signal/slot connections.

src/UI/Widgets/Terminal.cpp

@@ -22,11 +22,11 @@
 
 #include <QtMath>
 #include <QScrollBar>
+
 #include <IO/Console.h>
 #include <Misc/TimerEvents.h>
 #include <Misc/ThemeManager.h>
-
+#include <UI/Widgets/Terminal.h>
-#include "Terminal.h"
 
 //----------------------------------------------------------------------------------------
 // QML PlainTextEdit implementation

src/main.cpp

@@ -22,16 +22,15 @@
 
 #include <QtQml>
 #include <QSysInfo>
+#include <QQuickStyle>
 #include <QApplication>
+#include <QStyleFactory>
 
 #include <AppInfo.h>
 #include <JSON/Frame.h>
 #include <Misc/Utilities.h>
 #include <Misc/ModuleManager.h>
 
-#include <QQuickStyle>
-#include <QStyleFactory>
-
 #ifdef Q_OS_WIN
 #    include <windows.h>
 #endif