From 0081d219f9006ded33be52c539bf1f0dbcccda2d Mon Sep 17 00:00:00 2001 From: Moritz Martinius Date: Tue, 8 Nov 2022 19:18:18 +0100 Subject: [PATCH] Fix indentation back to 4 --- .clang-format | 2 +- inc/Bitmap.hpp | 2 +- inc/DriverTypes.hpp | 4 ++-- inc/IDriver.hpp | 20 ++++++++++---------- inc/IPrinter.hpp | 16 ++++++++-------- inc/P700Driver.hpp | 14 +++++++------- inc/P700Printer.hpp | 18 +++++++++--------- inc/PrinterTypes.hpp | 16 ++++++++-------- src/P700Driver.cpp | 12 +++++++----- src/P700Printer.cpp | 18 +++++++++--------- src/main.cpp | 12 ++++++------ 11 files changed, 68 insertions(+), 66 deletions(-) diff --git a/.clang-format b/.clang-format index d5f2d07..6f7ba0a 100644 --- a/.clang-format +++ b/.clang-format @@ -51,7 +51,7 @@ FixNamespaceComments: true IncludeBlocks: Preserve IndentCaseLabels: true IndentPPDirectives: None -IndentWidth: 2 +IndentWidth: 4 KeepEmptyLinesAtTheStartOfBlocks: true MaxEmptyLinesToKeep: 1 NamespaceIndentation: None diff --git a/inc/Bitmap.hpp b/inc/Bitmap.hpp index d83cb66..1f2fd7b 100644 --- a/inc/Bitmap.hpp +++ b/inc/Bitmap.hpp @@ -5,7 +5,7 @@ namespace ptprnt::bitmap { struct Bitmap { - std::vector> map; + std::vector> map; }; } // namespace ptprnt::bitmap \ No newline at end of file diff --git a/inc/DriverTypes.hpp b/inc/DriverTypes.hpp index 6a101ac..aeedf98 100644 --- a/inc/DriverTypes.hpp +++ b/inc/DriverTypes.hpp @@ -5,8 +5,8 @@ namespace ptprnt::driver { struct info { - std::string name{""}; - std::string version{""}; + std::string name{""}; + std::string version{""}; }; } // namespace ptprnt::driver \ No newline at end of file diff --git a/inc/IDriver.hpp b/inc/IDriver.hpp index 4eee07f..937d8ff 100644 --- a/inc/IDriver.hpp +++ b/inc/IDriver.hpp @@ -6,39 +6,39 @@ namespace ptprnt::driver { class IDriver { - public: - virtual ~IDriver(){}; + public: + virtual ~IDriver(){}; - /** + /** * @brief Get Information struct about this driver * * @return driver::info */ - virtual driver::info getInfo() = 0; + virtual driver::info getInfo() = 0; - /** + /** * @brief opens up the device specified * * @return true successfully open up device * @return false failed to open device */ - virtual bool open() = 0; + virtual bool open() = 0; - /** + /** * @brief close the device * * @return true successfully closed device * @return false failed to close device */ - virtual bool close() = 0; + virtual bool close() = 0; - /** + /** * @brief Send a command to device * * @return true successfully sent command to device * @return false error sending command */ - virtual bool command() = 0; + virtual bool command() = 0; }; } // namespace ptprnt::driver \ No newline at end of file diff --git a/inc/IPrinter.hpp b/inc/IPrinter.hpp index 0ea9dda..20773fc 100644 --- a/inc/IPrinter.hpp +++ b/inc/IPrinter.hpp @@ -10,17 +10,17 @@ namespace ptprnt::printer { class IPrinter { - public: - virtual ~IPrinter(){}; + public: + virtual ~IPrinter(){}; - /** + /** * @brief Get Information struct about the printer * * @return driver::info */ - virtual printer::info getInfo() = 0; + virtual printer::info getInfo() = 0; - /** + /** * @brief Prints text immediatly * * @param text Text to print @@ -28,16 +28,16 @@ class IPrinter { * @return true Printing succeeded * @return false Printing failed */ - virtual bool printText(std::string_view text, uint32_t fontSize) = 0; + virtual bool printText(std::string_view text, uint32_t fontSize) = 0; - /** + /** * @brief Prints supplied bitmap immediatly * * @param bm Bitmap to print * @return true Printing succeeded * @return false Printing failed */ - virtual bool printBitmap(std::shared_ptr bm) = 0; + virtual bool printBitmap(std::shared_ptr bm) = 0; }; } // namespace ptprnt::printer \ No newline at end of file diff --git a/inc/P700Driver.hpp b/inc/P700Driver.hpp index 0d4d308..d6e050c 100644 --- a/inc/P700Driver.hpp +++ b/inc/P700Driver.hpp @@ -9,14 +9,14 @@ namespace ptprnt::driver { class P700Driver : public IDriver { - public: - P700Driver(uint16_t UsbDevVendor = 0x04f9, uint16_t UsbDevId = 0x2061); - ~P700Driver() override; + public: + P700Driver(uint16_t UsbDevVendor = 0x04f9, uint16_t UsbDevId = 0x2061); + ~P700Driver() override; - driver::info getInfo() override; - bool open() override; - bool close() override; - bool command() override; + driver::info getInfo() override; + bool open() override; + bool close() override; + bool command() override; }; } // namespace ptprnt::driver \ No newline at end of file diff --git a/inc/P700Printer.hpp b/inc/P700Printer.hpp index e0061b7..16dc082 100644 --- a/inc/P700Printer.hpp +++ b/inc/P700Printer.hpp @@ -9,17 +9,17 @@ namespace ptprnt::printer { class P700Printer : public IPrinter { - public: - P700Printer(std::unique_ptr driver); - ~P700Printer() override; + public: + P700Printer(std::unique_ptr driver); + ~P700Printer() override; - printer::info getInfo() override; - bool printText(std::string_view text, uint32_t fontSize) override; - bool printBitmap(std::shared_ptr bm) override; + printer::info getInfo() override; + bool printText(std::string_view text, uint32_t fontSize) override; + bool printBitmap(std::shared_ptr bm) override; - private: - static info mPrinterInfo; - std::unique_ptr mDriver; + private: + static info mPrinterInfo; + std::unique_ptr mDriver; }; } // namespace ptprnt::printer \ No newline at end of file diff --git a/inc/PrinterTypes.hpp b/inc/PrinterTypes.hpp index 10137ee..6d5f6e3 100644 --- a/inc/PrinterTypes.hpp +++ b/inc/PrinterTypes.hpp @@ -5,17 +5,17 @@ namespace ptprnt::printer { enum class colorMode { - monochrome = 0, - color = 0, + monochrome = 0, + color = 0, }; struct info { - std::string name{""}; - std::string revision{""}; - uint32_t xres = {0}; - uint32_t yres = {0}; - colorMode color = {colorMode::monochrome}; - bool cutter = {false}; + std::string name{""}; + std::string revision{""}; + uint32_t xres = {0}; + uint32_t yres = {0}; + colorMode color = {colorMode::monochrome}; + bool cutter = {false}; }; } // namespace ptprnt::printer \ No newline at end of file diff --git a/src/P700Driver.cpp b/src/P700Driver.cpp index 4026329..b228d88 100644 --- a/src/P700Driver.cpp +++ b/src/P700Driver.cpp @@ -7,22 +7,24 @@ namespace ptprnt::driver { P700Driver::P700Driver(uint16_t UsbDevVendor, uint16_t UsbDevId) {} -P700Driver::~P700Driver() {} +P700Driver::~P700Driver() { + libusb_init(NULL); +} driver::info P700Driver::getInfo() { - return driver::info{}; + return driver::info{}; } bool P700Driver::open() { - return false; + return false; } bool P700Driver::close() { - return false; + return false; } bool P700Driver::command() { - return false; + return false; } } // namespace ptprnt::driver \ No newline at end of file diff --git a/src/P700Printer.cpp b/src/P700Printer.cpp index 4b9f1af..fee0054 100644 --- a/src/P700Printer.cpp +++ b/src/P700Printer.cpp @@ -6,27 +6,27 @@ namespace ptprnt::printer { P700Printer::P700Printer(std::unique_ptr driver) { - if (!driver->open()) { - throw std::invalid_argument("Could not open driver!"); - } + if (!driver->open()) { + throw std::invalid_argument("Could not open driver!"); + } } P700Printer::~P700Printer() { - if (!mDriver->close()) { - std::cerr << "Could not close driver properly!" << std::endl; - } + if (!mDriver->close()) { + std::cerr << "Could not close driver properly!" << std::endl; + } } printer::info P700Printer::getInfo() { - return printer::info{}; + return printer::info{}; } bool P700Printer::printText(std::string_view text, uint32_t fontSize) { - return false; + return false; } bool P700Printer::printBitmap(std::shared_ptr bm) { - return false; + return false; } } // namespace ptprnt::printer \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index b3e7d88..2d564cc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,11 +9,11 @@ using namespace ptprnt; int main(int argc, char** argv) { - std::cout << "Hello ptprnt!" << std::endl; - libusb_init(NULL); - auto driver = std::make_unique(); - auto printer = std::make_unique(std::move(driver)); - printer::info info = printer->getInfo(); + std::cout << "Hello ptprnt!" << std::endl; - return 0; + auto driver = std::make_unique(); + auto printer = std::make_unique(std::move(driver)); + printer::info info = printer->getInfo(); + + return 0; } \ No newline at end of file