diff --git a/src/graphics/Label.cpp b/src/graphics/Label.cpp index d978eeb..8ab09c3 100644 --- a/src/graphics/Label.cpp +++ b/src/graphics/Label.cpp @@ -90,14 +90,6 @@ int Label::getHeight() { return mPrinterHeight; } -int Label::getLayoutHeight() { - return mLayoutHeight; -} - -int Label::getLayoutWidth() { - return mLayoutWidth; -} - void Label::configureLayout(PangoLayout* layout, const std::string& text, PangoFontDescription* fontDesc) { pango_layout_set_font_description(layout, fontDesc); pango_layout_set_text(layout, text.c_str(), static_cast(text.length())); @@ -189,7 +181,7 @@ bool Label::create(const std::string& labelText) { break; case VAlignPosition::MIDDLE: cairo_move_to(mCairoCtx.get(), 0.0, (mPrinterHeight - mLayoutHeight) / 2); - [[fallthrough]]; + break; default: break; } diff --git a/src/graphics/Label.hpp b/src/graphics/Label.hpp index 2dc6bc1..f7625ab 100644 --- a/src/graphics/Label.hpp +++ b/src/graphics/Label.hpp @@ -69,8 +69,6 @@ class Label : public ILabel { void writeToPng(const std::string& file); [[nodiscard]] int getWidth() override; [[nodiscard]] int getHeight() override; - [[nodiscard]] int getLayoutWidth() override; - [[nodiscard]] int getLayoutHeight() override; [[nodiscard]] std::vector getRaw() override; void setFontSize(const double fontSize) override; void setFontFamily(const std::string& fontFamily) override; diff --git a/src/graphics/interface/ILabel.hpp b/src/graphics/interface/ILabel.hpp index 46acd05..d63c6e6 100644 --- a/src/graphics/interface/ILabel.hpp +++ b/src/graphics/interface/ILabel.hpp @@ -70,8 +70,6 @@ class ILabel { virtual std::vector getRaw() = 0; virtual int getWidth() = 0; virtual int getHeight() = 0; - virtual int getLayoutWidth() = 0; - virtual int getLayoutHeight() = 0; virtual void setText(const std::string& text) = 0; virtual void setFontSize(const double fontSize) = 0; diff --git a/src/printers/P700Printer.hpp b/src/printers/P700Printer.hpp index 5ebb6b4..1309db6 100644 --- a/src/printers/P700Printer.hpp +++ b/src/printers/P700Printer.hpp @@ -23,10 +23,10 @@ #include #include -#include "../interface/IPrinterDriver.hpp" -#include "../interface/IPrinterTypes.hpp" -#include "../libusbwrap/LibUsbTypes.hpp" -#include "../libusbwrap/interface/IUsbDevice.hpp" +#include "interface/IPrinterDriver.hpp" +#include "interface/IPrinterTypes.hpp" +#include "libusbwrap/LibUsbTypes.hpp" +#include "libusbwrap/interface/IUsbDevice.hpp" #pragma once