Cleanup of strange includes, moving files around

2025-10-13 21:15:10 +02:00
parent f8a008a105
commit 8d85e77a6d
15 changed files with 79 additions and 90 deletions
--- a/src/PtouchPrint.cpp
+++ b/src/PtouchPrint.cpp
@@ -23,10 +23,10 @@
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/spdlog.h>

-#include "PrinterDriverFactory.hpp"
 #include "cli/CliParser.hpp"
 #include "cli/interface/ICliParser.hpp"
 #include "constants.hpp"
+#include "core/PrinterDriverFactory.hpp"
 #include "core/PrinterService.hpp"
 #include "core/interface/IPrinterService.hpp"
 #include "graphics/LabelBuilder.hpp"
--- a/src/core/PrinterDriverFactory.cpp
+++ b/src/core/PrinterDriverFactory.cpp
--- a/src/core/PrinterDriverFactory.hpp
+++ b/src/core/PrinterDriverFactory.hpp
--- a/src/core/PrinterService.cpp
+++ b/src/core/PrinterService.cpp
@@ -21,7 +21,7 @@

 #include <spdlog/spdlog.h>

-#include "PrinterDriverFactory.hpp"
+#include "core/PrinterDriverFactory.hpp"

 namespace ptprnt::core {

--- a/src/core/PrinterService.hpp
+++ b/src/core/PrinterService.hpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>

-#include "../printers/interface/IPrinterDriver.hpp"
 #include "interface/IPrinterService.hpp"
-#include "../libusbwrap/UsbDeviceFactory.hpp"
+#include "libusbwrap/UsbDeviceFactory.hpp"
+#include "printers/interface/IPrinterDriver.hpp"

 namespace ptprnt::core {

--- a/src/core/interface/IPrinterService.hpp
+++ b/src/core/interface/IPrinterService.hpp
@@ -23,8 +23,8 @@
 #include <string>
 #include <vector>

-#include "../../printers/interface/IPrinterDriver.hpp"
-#include "../../graphics/interface/ILabel.hpp"
+#include "graphics/interface/ILabel.hpp"
+#include "printers/interface/IPrinterDriver.hpp"

 namespace ptprnt::core {

--- a/src/meson.build
+++ b/src/meson.build
@@ -1,34 +1,34 @@
-ptprnt_hpps = files (
-    'libusbwrap/interface/IUsbDeviceFactory.hpp',
-    'libusbwrap/interface/IUsbDevice.hpp',
-    'libusbwrap/UsbDeviceFactory.hpp',
-    'libusbwrap/LibUsbTypes.hpp',
-    'libusbwrap/UsbDevice.hpp',
-    'interface/IPrinterDriver.hpp',
-    'interface/IPrinterTypes.hpp',
-    'printers/P700Printer.hpp',
-    'printers/FakePrinter.hpp',
-    'PtouchPrint.hpp',
-    'PrinterDriverFactory.hpp',
+ptprnt_hpps = files(
+    'cli/CliParser.hpp',
+    'core/PrinterDriverFactory.hpp',
+    'core/PrinterService.hpp',
    'graphics/Bitmap.hpp',
    'graphics/Label.hpp',
    'graphics/LabelBuilder.hpp',
    'graphics/Monochrome.hpp',
-    'cli/CliParser.hpp',
-    'core/PrinterService.hpp'
+    'libusbwrap/LibUsbTypes.hpp',
+    'libusbwrap/UsbDevice.hpp',
+    'libusbwrap/UsbDeviceFactory.hpp',
+    'libusbwrap/interface/IUsbDevice.hpp',
+    'libusbwrap/interface/IUsbDeviceFactory.hpp',
+    'printers/FakePrinter.hpp',
+    'printers/P700Printer.hpp',
+    'printers/interface/IPrinterDriver.hpp',
+    'printers/interface/IPrinterTypes.hpp',
+    'PtouchPrint.hpp',
 )

-ptprnt_srcs = files (
-    'PtouchPrint.cpp',
-    'PrinterDriverFactory.cpp',
-    'printers/P700Printer.cpp',
-    'printers/FakePrinter.cpp',
+ptprnt_srcs = files(
+    'cli/CliParser.cpp',
+    'core/PrinterDriverFactory.cpp',
+    'core/PrinterService.cpp',
+    'graphics/Bitmap.cpp',
    'graphics/Label.cpp',
    'graphics/LabelBuilder.cpp',
-    'graphics/Bitmap.cpp',
    'graphics/Monochrome.cpp',
-    'libusbwrap/UsbDeviceFactory.cpp',
    'libusbwrap/UsbDevice.cpp',
-    'cli/CliParser.cpp',
-    'core/PrinterService.cpp'
+    'libusbwrap/UsbDeviceFactory.cpp',
+    'printers/FakePrinter.cpp',
+    'printers/P700Printer.cpp',
+    'PtouchPrint.cpp',
 )
--- a/src/printers/FakePrinter.cpp
+++ b/src/printers/FakePrinter.cpp
@@ -19,27 +19,25 @@

 #include "FakePrinter.hpp"

-#include <spdlog/spdlog.h>
 #include <cairo.h>
+#include <spdlog/spdlog.h>

-#include <cstdint>
-#include <stdexcept>
-#include <vector>
 #include <chrono>
+#include <cstdint>
 #include <iomanip>
 #include <sstream>
+#include <stdexcept>
+#include <vector>

-#include "../graphics/Monochrome.hpp"
+#include "graphics/Monochrome.hpp"

 namespace ptprnt::printer {

-const PrinterInfo FakePrinter::mInfo = {
-    .driverName = "FakePrinter",
+const PrinterInfo FakePrinter::mInfo = {.driverName = "FakePrinter",
                                        .name       = "Virtual Test Printer",
                                        .version    = "v1.0",
                                        .usbId{0x0000, 0x0000},  // No USB ID - virtual printer created explicitly
-    .pixelLines = 128
-};
+                                        .pixelLines = 128};

 const std::string_view FakePrinter::getDriverName() {
    return mInfo.driverName;
@@ -94,8 +92,8 @@ bool FakePrinter::printMonochromeData(const graphics::MonochromeData& data) {
    auto printed = simulatePrinting(data);
    mLastPrint   = std::make_unique<graphics::Bitmap<graphics::ALPHA8>>(std::move(printed));

-    spdlog::info("FakePrinter: Successfully 'printed' label ({}x{} pixels)",
-                 mLastPrint->getWidth(), mLastPrint->getHeight());
+    spdlog::info("FakePrinter: Successfully 'printed' label ({}x{} pixels)", mLastPrint->getWidth(),
+                 mLastPrint->getHeight());

    // Save to timestamped PNG file
    std::string filename = generateTimestampedFilename();
@@ -120,7 +118,8 @@ bool FakePrinter::printLabel(const std::unique_ptr<graphics::ILabel> label) {
    // Transform to portrait orientation for printing
    monoData.transformTo(graphics::Orientation::PORTRAIT);

-    spdlog::debug("FakePrinter: Label surface is {}x{}, transformed to portrait", label->getWidth(), label->getHeight());
+    spdlog::debug("FakePrinter: Label surface is {}x{}, transformed to portrait", label->getWidth(),
+                  label->getHeight());

    return printMonochromeData(monoData);
 }
@@ -177,8 +176,8 @@ graphics::Bitmap<graphics::ALPHA8> FakePrinter::simulatePrinting(const graphics:
    // Set the pixels in the result bitmap
    result.setPixels(pixels);

-    spdlog::debug("FakePrinter: Simulation complete, reconstructed {}x{} bitmap",
-                  result.getWidth(), result.getHeight());
+    spdlog::debug("FakePrinter: Simulation complete, reconstructed {}x{} bitmap", result.getWidth(),
+                  result.getHeight());

    return result;
 }
@@ -218,13 +217,8 @@ bool FakePrinter::saveBitmapToPng(const graphics::Bitmap<graphics::ALPHA8>& bitm

    // Create Cairo surface
    int stride               = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
-    cairo_surface_t* surface = cairo_image_surface_create_for_data(
-        reinterpret_cast<unsigned char*>(argbPixels.data()),
-        CAIRO_FORMAT_ARGB32,
-        width,
-        height,
-        stride
-    );
+    cairo_surface_t* surface = cairo_image_surface_create_for_data(reinterpret_cast<unsigned char*>(argbPixels.data()),
+                                                                   CAIRO_FORMAT_ARGB32, width, height, stride);

    if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) {
        spdlog::error("FakePrinter: Failed to create Cairo surface: {}",
@@ -253,9 +247,7 @@ std::string FakePrinter::generateTimestampedFilename() const {

    // Format: fakelabel_YYYYMMDD_HHMMSS.png
    std::stringstream ss;
-    ss << "fakelabel_"
-       << std::put_time(std::localtime(&time), "%Y%m%d_%H%M%S")
-       << ".png";
+    ss << "fakelabel_" << std::put_time(std::localtime(&time), "%Y%m%d_%H%M%S") << ".png";

    return ss.str();
 }
--- a/src/printers/FakePrinter.hpp
+++ b/src/printers/FakePrinter.hpp
@@ -19,15 +19,15 @@

 #pragma once

+#include <cstdint>
 #include <memory>
 #include <vector>
-#include <cstdint>

+#include "graphics/Bitmap.hpp"
 #include "interface/IPrinterDriver.hpp"
 #include "interface/IPrinterTypes.hpp"
-#include "../libusbwrap/LibUsbTypes.hpp"
-#include "../libusbwrap/interface/IUsbDevice.hpp"
-#include "../graphics/Bitmap.hpp"
+#include "libusbwrap/LibUsbTypes.hpp"
+#include "libusbwrap/interface/IUsbDevice.hpp"

 namespace ptprnt::printer {

--- a/src/printers/P700Printer.cpp
+++ b/src/printers/P700Printer.cpp
@@ -28,9 +28,9 @@
 #include <thread>
 #include <vector>

-#include "../graphics/Bitmap.hpp"
-#include "../graphics/Monochrome.hpp"
-#include "../libusbwrap/LibUsbTypes.hpp"
+#include "graphics/Bitmap.hpp"
+#include "graphics/Monochrome.hpp"
+#include "libusbwrap/LibUsbTypes.hpp"
 #include "spdlog/fmt/bin_to_hex.h"

 namespace ptprnt::printer {
--- a/src/printers/P700Printer.hpp
+++ b/src/printers/P700Printer.hpp
@@ -27,8 +27,8 @@

 #include "interface/IPrinterDriver.hpp"
 #include "interface/IPrinterTypes.hpp"
-#include "../libusbwrap/LibUsbTypes.hpp"
-#include "../libusbwrap/interface/IUsbDevice.hpp"
+#include "libusbwrap/LibUsbTypes.hpp"
+#include "libusbwrap/interface/IUsbDevice.hpp"

 namespace ptprnt::printer {
 namespace p700::commands {
--- a/src/printers/interface/IPrinterDriver.hpp
+++ b/src/printers/interface/IPrinterDriver.hpp
@@ -22,11 +22,11 @@
 #include <memory>
 #include <string_view>

-#include "../../graphics/Bitmap.hpp"
-#include "../../graphics/Monochrome.hpp"
-#include "../../graphics/interface/ILabel.hpp"
-#include "../../libusbwrap/interface/IUsbDevice.hpp"
 #include "IPrinterTypes.hpp"
+#include "graphics/Bitmap.hpp"
+#include "graphics/Monochrome.hpp"
+#include "graphics/interface/ILabel.hpp"
+#include "libusbwrap/interface/IUsbDevice.hpp"

 namespace ptprnt {
 class IPrinterDriver {
--- a/src/printers/interface/IPrinterTypes.hpp
+++ b/src/printers/interface/IPrinterTypes.hpp
@@ -20,7 +20,6 @@
 #pragma once

 #include <cstdint>
-#include <string>
 #include <string_view>
 #include <vector>

--- a/src/ptprnt.log
+++ b/src/ptprnt.log
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -36,5 +36,3 @@ foreach test : tests
        ),
    )
 endforeach
-
-