From 1a0ca6c782d2310bb91f1b7a7c9a68d63c8b0248 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 18 May 2023 10:27:40 +0300 Subject: [PATCH] Refactoring. Fix code style. --- src/libs/vlayout/vtextmanager.h | 40 ++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/libs/vlayout/vtextmanager.h b/src/libs/vlayout/vtextmanager.h index 36ee0075f..7a061c015 100644 --- a/src/libs/vlayout/vtextmanager.h +++ b/src/libs/vlayout/vtextmanager.h @@ -29,36 +29,39 @@ #ifndef VTEXTMANAGER_H #define VTEXTMANAGER_H +#include #include #include #include #include #include +#include #include #include -#include -#include + +#include "../vmisc/defglobal.h" class VPieceLabelData; class VAbstractPattern; class VContainer; -#define MIN_FONT_SIZE 5 -#define MAX_FONT_SIZE 128 +#define MIN_FONT_SIZE 5 +#define MAX_FONT_SIZE 128 /** * @brief The TextLine struct holds the information about one text line */ struct TextLine { - QString m_qsText{}; - int m_iFontSize{MIN_FONT_SIZE}; // 0 means default - bool m_bold{false}; - bool m_italic{false}; + QString m_qsText{}; + int m_iFontSize{MIN_FONT_SIZE}; // 0 means default + bool m_bold{false}; + bool m_italic{false}; Qt::Alignment m_eAlign{Qt::AlignCenter}; - friend auto operator<<(QDataStream& dataStream, const TextLine& data) -> QDataStream&; - friend auto operator>>(QDataStream& dataStream, TextLine& data) -> QDataStream&; + friend auto operator<<(QDataStream &dataStream, const TextLine &data) -> QDataStream &; + friend auto operator>>(QDataStream &dataStream, TextLine &data) -> QDataStream &; + private: static const quint32 streamHeader; static const quint16 classVersion; @@ -71,6 +74,7 @@ private: class VTextManager { Q_DECLARE_TR_FUNCTIONS(VTextManager) // NOLINT + public: VTextManager() = default; virtual ~VTextManager() = default; @@ -85,26 +89,26 @@ public: virtual auto GetSpacing() const -> int; - void SetFont(const QFont& font); - auto GetFont() const -> const QFont&; + void SetFont(const QFont &font); + auto GetFont() const -> const QFont &; void SetFontSize(int iFS); void FitFontSize(qreal fW, qreal fH); auto GetAllSourceLines() const -> QVector; void SetAllSourceLines(const QVector &lines); auto GetSourceLinesCount() const -> vsizetype; - auto GetSourceLine(vsizetype i) const -> const TextLine&; + auto GetSourceLine(vsizetype i) const -> const TextLine &; auto MaxLineWidth(int width) const -> int; - void Update(const QString& qsName, const VPieceLabelData& data, const VContainer *pattern); - void Update(VAbstractPattern* pDoc, const VContainer *pattern); + void Update(const QString &qsName, const VPieceLabelData &data, const VContainer *pattern); + void Update(VAbstractPattern *pDoc, const VContainer *pattern); - friend auto operator<<(QDataStream& dataStream, const VTextManager& data) -> QDataStream&; - friend auto operator>>(QDataStream& dataStream, VTextManager& data) -> QDataStream&; + friend auto operator<<(QDataStream &dataStream, const VTextManager &data) -> QDataStream &; + friend auto operator>>(QDataStream &dataStream, VTextManager &data) -> QDataStream &; private: - QFont m_font{}; + QFont m_font{}; QVector m_liLines{}; static const quint32 streamHeader;