From 9850b9a3c4ca93f4566396a3b5192b86388a72b0 Mon Sep 17 00:00:00 2001 From: Julien Rosset Date: Fri, 9 Oct 2020 17:29:16 +0200 Subject: [PATCH] Reformating code --- CMakeLists.txt | 4 +- MainWindow/MainWindow.cpp | 32 +- MainWindow/MainWindow.h | 12 +- MainWindow/MainWindow.ui | 869 +++++++++++++++++++------------------- NBT/AbstractNamedTag.cpp | 10 +- NBT/AbstractNamedTag.h | 12 +- NBT/AbstractTag.cpp | 12 +- NBT/AbstractTag.h | 18 +- NBT/TagByte.cpp | 9 +- NBT/TagByte.h | 8 +- NBT/TagByteArray.cpp | 16 +- NBT/TagByteArray.h | 8 +- NBT/TagDouble.cpp | 8 +- NBT/TagDouble.h | 8 +- NBT/TagEnd.cpp | 8 +- NBT/TagEnd.h | 6 +- NBT/TagFloat.cpp | 8 +- NBT/TagFloat.h | 8 +- NBT/TagInt.cpp | 8 +- NBT/TagInt.h | 8 +- NBT/TagLong.cpp | 8 +- NBT/TagLong.h | 8 +- NBT/TagShort.cpp | 8 +- NBT/TagShort.h | 8 +- NBT/TagString.cpp | 10 +- NBT/TagString.h | 8 +- main.cpp | 2 +- 27 files changed, 572 insertions(+), 552 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 102f52d..c02ecc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,5 +30,7 @@ add_executable( NBT/TagLong.cpp NBT/TagLong.h NBT/TagFloat.cpp NBT/TagFloat.h NBT/TagDouble.cpp NBT/TagDouble.h - NBT/TagByteArray.cpp NBT/TagByteArray.h NBT/TagString.cpp NBT/TagString.h) + NBT/TagByteArray.cpp NBT/TagByteArray.h + NBT/TagString.cpp NBT/TagString.h +) target_link_libraries(NBTModifier Qt5::Widgets Qt5::Svg) \ No newline at end of file diff --git a/MainWindow/MainWindow.cpp b/MainWindow/MainWindow.cpp index 680b4c9..cd0d81d 100644 --- a/MainWindow/MainWindow.cpp +++ b/MainWindow/MainWindow.cpp @@ -4,16 +4,16 @@ #include #include -MainWindow::MainWindow(QWidget *parent) : +MainWindow::MainWindow (QWidget *parent) : QMainWindow(parent), m_ui(new Ui::MainWindow) { setupUi(); } -MainWindow::~MainWindow() { +MainWindow::~MainWindow () { delete m_ui; } -void MainWindow::setupUi() { +void MainWindow::setupUi () { m_ui->setupUi(this); //region Shortcuts @@ -49,22 +49,22 @@ void MainWindow::setupUi() { //endregion } -void MainWindow::on_actionFileOpenFile_triggered() { - /* const QString path = QFileDialog::getOpenFileName( - this, - tr("Choose a file to open"), - qApp->applicationDirPath(), - QString(tr("Data files (*.dat);;All files (*.*)")) - ); - if (path.isEmpty()) { - return; - } +void MainWindow::on_actionFileOpenFile_triggered () { + /* const QString path = QFileDialog::getOpenFileName( + this, + tr("Choose a file to open"), + qApp->applicationDirPath(), + QString(tr("Data files (*.dat);;All files (*.*)")) + ); + if (path.isEmpty()) { + return; + } - const QFile file(path, this); -*/ + const QFile file(path, this); + */ } -void MainWindow::on_actionHelpAboutNBTModifier_triggered() { +void MainWindow::on_actionHelpAboutNBTModifier_triggered () { QMessageBox info(this); info.setIcon(QMessageBox::Information); diff --git a/MainWindow/MainWindow.h b/MainWindow/MainWindow.h index f1343cf..e4dc91f 100644 --- a/MainWindow/MainWindow.h +++ b/MainWindow/MainWindow.h @@ -11,11 +11,11 @@ namespace Ui { * Main window of application */ class MainWindow : public QMainWindow { - Q_OBJECT +Q_OBJECT public: - explicit MainWindow(QWidget *parent = nullptr); - virtual ~MainWindow() override; + explicit MainWindow (QWidget *parent = nullptr); + virtual ~MainWindow () override; private: /** @@ -26,18 +26,18 @@ private: /** * Build the internal window design */ - void setupUi(); + void setupUi (); private slots: /** * Open a file */ - void on_actionFileOpenFile_triggered(); + void on_actionFileOpenFile_triggered (); /** * Display the "about" dialog */ - void on_actionHelpAboutNBTModifier_triggered(); + void on_actionHelpAboutNBTModifier_triggered (); }; #endif //NBTMODIFIER_MAINWINDOW_H diff --git a/MainWindow/MainWindow.ui b/MainWindow/MainWindow.ui index 9f4d639..0b4e511 100644 --- a/MainWindow/MainWindow.ui +++ b/MainWindow/MainWindow.ui @@ -1,429 +1,448 @@ - MainWindow - - - - 0 - 0 - 800 - 600 - - - - MainWindow - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QMdiArea::StackingOrder - - - QMdiArea::TabbedView - - - true - - - true - - - true - - - - - - - - - 0 - 0 - 800 - 21 - - - - - &File - - - - - - - - - - - - - - - - - &Edit - - - - Insert - - - - - - - - - - - - - - - - - + MainWindow + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QMdiArea::StackingOrder + + + QMdiArea::TabbedView + + + true + + + true + + + true + + + + + + + + + 0 + 0 + 800 + 21 + + + + + &File + + + + + + + + + + + + + + + + + &Edit + + + + Insert + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Search + + + + + + + + + + ? + + + + + + + + + + + + + toolBar + + + TopToolBarArea + + + false + + + + + + .. + + + + &New + + + + + + .. + + + + &Open file + + + + + + .. + + + + &Save + + + + + + .. + + + + Save as + + + + + + .. + + + + &Quit + + + Ctrl+Q + + + + + + .. + + + + Undo + + + + + + .. + + + + Redo + + + + + + .. + + + + Copy + + + + + + .. + + + + Cut + + + + + + .. + + + + Paste + + + + + Byte + + + + + Short + + + + + Int + + + + + Long + + + + + Float + + + + + Double + + + + + String + + + + + Compound + + + + + List + + + + + Byte Array + + + + + Int Array + + + + + Long Array + + + + + + .. + + + + Modify name/value + + + + + + .. + + + + Delete + + + + + + .. + + + + Move Up + + + + + + .. + + + + Move Down + + + + + Reload + + + + + + .. + + + + &Find + + + + + Find next + + + + + Find Previous + + + + + + .. + + + + &Replace + + + + + + .. + + + + &About NBTModifier + + + + + About Qt + + + + + + .. + + + + Close + + + + + + .. + + + + Settings + + + + + Open directory + + - - - - - - - - - - - - - - - - - Search - - - - - - - - - - ? - - - - - - - - - - - - - toolBar - - - TopToolBarArea - - - false - - - - - - .. - - - &New - - - - - - .. - - - &Open file - - - - - - .. - - - &Save - - - - - - .. - - - Save as - - - - - - .. - - - &Quit - - - Ctrl+Q - - - - - - .. - - - Undo - - - - - - .. - - - Redo - - - - - - .. - - - Copy - - - - - - .. - - - Cut - - - - - - .. - - - Paste - - - - - Byte - - - - - Short - - - - - Int - - - - - Long - - - - - Float - - - - - Double - - - - - String - - - - - Compound - - - - - List - - - - - Byte Array - - - - - Int Array - - - - - Long Array - - - - - - .. - - - Modify name/value - - - - - - .. - - - Delete - - - - - - .. - - - Move Up - - - - - - .. - - - Move Down - - - - - Reload - - - - - - .. - - - &Find - - - - - Find next - - - - - Find Previous - - - - - - .. - - - &Replace - - - - - - .. - - - &About NBTModifier - - - - - About Qt - - - - - - .. - - - Close - - - - - - .. - - - Settings - - - - - Open directory - - - - - - - actionFileQuit - triggered() - MainWindow - close() - - - -1 - -1 - - - 399 - 299 - - - - + + + + actionFileQuit + triggered() + MainWindow + close() + + + -1 + -1 + + + 399 + 299 + + + + diff --git a/NBT/AbstractNamedTag.cpp b/NBT/AbstractNamedTag.cpp index 15daea9..a252881 100644 --- a/NBT/AbstractNamedTag.cpp +++ b/NBT/AbstractNamedTag.cpp @@ -3,9 +3,9 @@ #include #include -AbstractNamedTag::AbstractNamedTag(const quint8 id) : AbstractTag(id) {} +AbstractNamedTag::AbstractNamedTag (const quint8 id) : AbstractTag(id) {} -void AbstractNamedTag::readFromData(QDataStream &data) { +void AbstractNamedTag::readFromData (QDataStream &data) { quint16 size; data >> size; @@ -19,16 +19,16 @@ void AbstractNamedTag::readFromData(QDataStream &data) { m_name = QString::fromUtf8(rawName); readPayloadFromData(data); } -void AbstractNamedTag::writeToData(QDataStream &data) const { +void AbstractNamedTag::writeToData (QDataStream &data) const { const QByteArray rawName = m_name.toUtf8(); data << qToBigEndian(rawName.size()) << rawName.constData(); writePayloadToData(data); } -const QString &AbstractNamedTag::name() const { +const QString &AbstractNamedTag::name () const { return m_name; } -void AbstractNamedTag::setName(const QString &name) { +void AbstractNamedTag::setName (const QString &name) { m_name = name; } \ No newline at end of file diff --git a/NBT/AbstractNamedTag.h b/NBT/AbstractNamedTag.h index a03c4e7..eea3b2f 100644 --- a/NBT/AbstractNamedTag.h +++ b/NBT/AbstractNamedTag.h @@ -12,7 +12,7 @@ public: * * @return The tag name */ - const QString& name() const; + const QString &name () const; /** * Set the tag name * @@ -21,10 +21,10 @@ public: void setName (const QString &name); protected: - explicit AbstractNamedTag(const quint8 id); + explicit AbstractNamedTag (const quint8 id); - virtual void readFromData(QDataStream &data) override; - virtual void writeToData(QDataStream &data) const override; + virtual void readFromData (QDataStream &data) override; + virtual void writeToData (QDataStream &data) const override; /** * Read a tag payload from a data stream @@ -33,7 +33,7 @@ protected: * * @return True if read is success, otherwise false */ - virtual void readPayloadFromData(QDataStream &data) = 0; + virtual void readPayloadFromData (QDataStream &data) = 0; /** * Write a tag payload to a data stream * @@ -41,7 +41,7 @@ protected: * * @return True if write is success, otherwise false */ - virtual void writePayloadToData(QDataStream &data) const = 0; + virtual void writePayloadToData (QDataStream &data) const = 0; private: /** diff --git a/NBT/AbstractTag.cpp b/NBT/AbstractTag.cpp index f8fdfcd..e6e187d 100644 --- a/NBT/AbstractTag.cpp +++ b/NBT/AbstractTag.cpp @@ -12,13 +12,13 @@ #include -AbstractTag::AbstractTag(const quint8 id) : m_id(id) {} +AbstractTag::AbstractTag (const quint8 id) : m_id(id) {} -const quint8 AbstractTag::id() const { +const quint8 AbstractTag::id () const { return m_id; } -const quint8 AbstractTag::extractId(const QByteArray &data) { +const quint8 AbstractTag::extractId (const QByteArray &data) { QDataStream stream(data); quint8 id; @@ -26,7 +26,7 @@ const quint8 AbstractTag::extractId(const QByteArray &data) { return id; } -AbstractTag *AbstractTag::extractEmptyTag(const QByteArray &data) { +AbstractTag *AbstractTag::extractEmptyTag (const QByteArray &data) { switch (extractId(data)) { case TagEnd::ID: return new TagEnd(); @@ -59,13 +59,13 @@ AbstractTag *AbstractTag::extractEmptyTag(const QByteArray &data) { return nullptr; } -QDataStream &operator<<(QDataStream &data, const AbstractTag &tag) { +QDataStream &operator << (QDataStream &data, const AbstractTag &tag) { data << tag.id(); tag.writeToData(data); return data; } -QDataStream &operator>>(QDataStream &data, AbstractTag &tag) { +QDataStream &operator >> (QDataStream &data, AbstractTag &tag) { quint8 id; data >> id; diff --git a/NBT/AbstractTag.h b/NBT/AbstractTag.h index e57d1d8..2b041d2 100644 --- a/NBT/AbstractTag.h +++ b/NBT/AbstractTag.h @@ -10,13 +10,15 @@ class QDataStream; */ class AbstractTag { public: - const quint8 id() const; + virtual inline ~AbstractTag () {}; - static const quint8 extractId(const QByteArray &data); - static AbstractTag *extractEmptyTag(const QByteArray &data); + const quint8 id () const; - friend QDataStream &operator<<(QDataStream &data, const AbstractTag &tag); - friend QDataStream &operator>>(QDataStream &data, AbstractTag &tag); + static const quint8 extractId (const QByteArray &data); + static AbstractTag *extractEmptyTag (const QByteArray &data); + + friend QDataStream &operator << (QDataStream &data, const AbstractTag &tag); + friend QDataStream &operator >> (QDataStream &data, AbstractTag &tag); protected: /** @@ -24,7 +26,7 @@ protected: * * @param id */ - explicit AbstractTag(const quint8 id); + explicit AbstractTag (const quint8 id); /** * Read a tag from a data stream @@ -33,7 +35,7 @@ protected: * * @return True if read is success, otherwise false */ - virtual void readFromData(QDataStream &data) = 0; + virtual void readFromData (QDataStream &data) = 0; /** * Write a tag to a data stream * @@ -41,7 +43,7 @@ protected: * * @return True if write is success, otherwise false */ - virtual void writeToData(QDataStream &data) const = 0; + virtual void writeToData (QDataStream &data) const = 0; private: /** diff --git a/NBT/TagByte.cpp b/NBT/TagByte.cpp index e804475..59eb06d 100644 --- a/NBT/TagByte.cpp +++ b/NBT/TagByte.cpp @@ -2,16 +2,15 @@ #include -TagByte::TagByte(const qint8 value) : AbstractNamedTag(ID), m_value(value) {} +TagByte::TagByte (const qint8 value) : AbstractNamedTag(ID), m_value(value) {} -const qint8 TagByte::value() const { +const qint8 TagByte::value () const { return m_value; } - -void TagByte::readPayloadFromData(QDataStream &data) { +void TagByte::readPayloadFromData (QDataStream &data) { data >> m_value; } -void TagByte::writePayloadToData(QDataStream &data) const { +void TagByte::writePayloadToData (QDataStream &data) const { data << m_value; } diff --git a/NBT/TagByte.h b/NBT/TagByte.h index 397cdf4..46c09eb 100644 --- a/NBT/TagByte.h +++ b/NBT/TagByte.h @@ -7,13 +7,13 @@ class TagByte : public AbstractNamedTag { public: static constexpr quint8 ID = 1; - TagByte(const qint8 value = 0); + TagByte (const qint8 value = 0); - const qint8 value() const; + const qint8 value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: qint8 m_value; diff --git a/NBT/TagByteArray.cpp b/NBT/TagByteArray.cpp index 487a58b..5be924b 100644 --- a/NBT/TagByteArray.cpp +++ b/NBT/TagByteArray.cpp @@ -4,29 +4,29 @@ #include -TagByteArray::TagByteArray(const QList value) : AbstractNamedTag(ID), m_value(value) {} +TagByteArray::TagByteArray (const QList value) : AbstractNamedTag(ID), m_value(value) {} -const QList &TagByteArray::value() const { +const QList &TagByteArray::value () const { return m_value; } -void TagByteArray::readPayloadFromData(QDataStream &data) { +void TagByteArray::readPayloadFromData (QDataStream &data) { TagInt size; data >> size; m_value.clear(); - for(qint32 elem = 0; elem < size.value(); elem++) { + for (qint32 elem = 0; elem < size.value(); elem++) { TagByte tag; data >> tag; m_value << tag; } } -void TagByteArray::writePayloadToData(QDataStream &data) const { +void TagByteArray::writePayloadToData (QDataStream &data) const { TagInt size(m_value.size()); data << size; - foreach(const TagByte tag, m_value) { - data << tag; - } + foreach(const TagByte tag, m_value) { + data << tag; + } } \ No newline at end of file diff --git a/NBT/TagByteArray.h b/NBT/TagByteArray.h index 035d2cc..01f10d6 100644 --- a/NBT/TagByteArray.h +++ b/NBT/TagByteArray.h @@ -10,13 +10,13 @@ class TagByteArray : public AbstractNamedTag { public: static constexpr quint8 ID = 7; - TagByteArray(const QList value = QList()); + TagByteArray (const QList value = QList()); - const QList &value() const; + const QList &value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: QList m_value; diff --git a/NBT/TagDouble.cpp b/NBT/TagDouble.cpp index 3d64e7b..ecbc037 100644 --- a/NBT/TagDouble.cpp +++ b/NBT/TagDouble.cpp @@ -3,16 +3,16 @@ #include #include -TagDouble::TagDouble(const double value) : AbstractNamedTag(ID), m_value(value) {} +TagDouble::TagDouble (const double value) : AbstractNamedTag(ID), m_value(value) {} -const double TagDouble::value() const { +const double TagDouble::value () const { return m_value; } -void TagDouble::readPayloadFromData(QDataStream &data) { +void TagDouble::readPayloadFromData (QDataStream &data) { data >> m_value; m_value = qFromBigEndian(m_value); } -void TagDouble::writePayloadToData(QDataStream &data) const { +void TagDouble::writePayloadToData (QDataStream &data) const { data << qToBigEndian(m_value); } \ No newline at end of file diff --git a/NBT/TagDouble.h b/NBT/TagDouble.h index 8084663..5f3f27a 100644 --- a/NBT/TagDouble.h +++ b/NBT/TagDouble.h @@ -7,13 +7,13 @@ class TagDouble : public AbstractNamedTag { public: static constexpr quint8 ID = 6; - TagDouble(const double value = 0); + TagDouble (const double value = 0); - const double value() const; + const double value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: double m_value; diff --git a/NBT/TagEnd.cpp b/NBT/TagEnd.cpp index 1136a0a..fff76ae 100644 --- a/NBT/TagEnd.cpp +++ b/NBT/TagEnd.cpp @@ -1,11 +1,9 @@ #include "TagEnd.h" -TagEnd::TagEnd() : AbstractTag(ID) { +TagEnd::TagEnd () : AbstractTag(ID) { } -void TagEnd::readFromData(QDataStream &data) { - +void TagEnd::readFromData (QDataStream &data) { } -void TagEnd::writeToData(QDataStream &data) const { - +void TagEnd::writeToData (QDataStream &data) const { } diff --git a/NBT/TagEnd.h b/NBT/TagEnd.h index 6803549..0a75a98 100644 --- a/NBT/TagEnd.h +++ b/NBT/TagEnd.h @@ -7,11 +7,11 @@ class TagEnd : public AbstractTag { public: static constexpr quint8 ID = 0; - explicit TagEnd(); + explicit TagEnd (); protected: - virtual void readFromData(QDataStream &data) override; - virtual void writeToData(QDataStream &data) const override; + virtual void readFromData (QDataStream &data) override; + virtual void writeToData (QDataStream &data) const override; }; #endif //NBTMODIFIER_TAGEND_H diff --git a/NBT/TagFloat.cpp b/NBT/TagFloat.cpp index 6bf2651..92ff537 100644 --- a/NBT/TagFloat.cpp +++ b/NBT/TagFloat.cpp @@ -3,16 +3,16 @@ #include #include -TagFloat::TagFloat(const float value) : AbstractNamedTag(ID), m_value(value) {} +TagFloat::TagFloat (const float value) : AbstractNamedTag(ID), m_value(value) {} -const float TagFloat::value() const { +const float TagFloat::value () const { return m_value; } -void TagFloat::readPayloadFromData(QDataStream &data) { +void TagFloat::readPayloadFromData (QDataStream &data) { data >> m_value; m_value = qFromBigEndian(m_value); } -void TagFloat::writePayloadToData(QDataStream &data) const { +void TagFloat::writePayloadToData (QDataStream &data) const { data << qToBigEndian(m_value); } \ No newline at end of file diff --git a/NBT/TagFloat.h b/NBT/TagFloat.h index 62827c6..11cd0a0 100644 --- a/NBT/TagFloat.h +++ b/NBT/TagFloat.h @@ -8,13 +8,13 @@ class TagFloat : public AbstractNamedTag { public: static constexpr quint8 ID = 5; - TagFloat(const float value = 0); + TagFloat (const float value = 0); - const float value() const; + const float value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: float m_value; diff --git a/NBT/TagInt.cpp b/NBT/TagInt.cpp index cfc689f..7d75612 100644 --- a/NBT/TagInt.cpp +++ b/NBT/TagInt.cpp @@ -3,16 +3,16 @@ #include #include -TagInt::TagInt(const qint32 value) : AbstractNamedTag(ID), m_value(value) {} +TagInt::TagInt (const qint32 value) : AbstractNamedTag(ID), m_value(value) {} -const qint32 TagInt::value() const { +const qint32 TagInt::value () const { return m_value; } -void TagInt::readPayloadFromData(QDataStream &data) { +void TagInt::readPayloadFromData (QDataStream &data) { data >> m_value; m_value = qFromBigEndian(m_value); } -void TagInt::writePayloadToData(QDataStream &data) const { +void TagInt::writePayloadToData (QDataStream &data) const { data << qToBigEndian(m_value); } \ No newline at end of file diff --git a/NBT/TagInt.h b/NBT/TagInt.h index c204d4b..16e7e23 100644 --- a/NBT/TagInt.h +++ b/NBT/TagInt.h @@ -7,13 +7,13 @@ class TagInt : public AbstractNamedTag { public: static constexpr quint8 ID = 3; - TagInt(const qint32 value = 0); + TagInt (const qint32 value = 0); - const qint32 value() const; + const qint32 value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: qint32 m_value; diff --git a/NBT/TagLong.cpp b/NBT/TagLong.cpp index 083e1d3..406c480 100644 --- a/NBT/TagLong.cpp +++ b/NBT/TagLong.cpp @@ -3,16 +3,16 @@ #include #include -TagLong::TagLong(const qint64 value) : AbstractNamedTag(ID), m_value(value) {} +TagLong::TagLong (const qint64 value) : AbstractNamedTag(ID), m_value(value) {} -const qint64 TagLong::value() const { +const qint64 TagLong::value () const { return m_value; } -void TagLong::readPayloadFromData(QDataStream &data) { +void TagLong::readPayloadFromData (QDataStream &data) { data >> m_value; m_value = qFromBigEndian(m_value); } -void TagLong::writePayloadToData(QDataStream &data) const { +void TagLong::writePayloadToData (QDataStream &data) const { data << qToBigEndian(m_value); } \ No newline at end of file diff --git a/NBT/TagLong.h b/NBT/TagLong.h index 48e50cc..3b5791b 100644 --- a/NBT/TagLong.h +++ b/NBT/TagLong.h @@ -7,13 +7,13 @@ class TagLong : public AbstractNamedTag { public: static constexpr quint8 ID = 4; - TagLong(const qint64 value = 0); + TagLong (const qint64 value = 0); - const qint64 value() const; + const qint64 value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: qint64 m_value; diff --git a/NBT/TagShort.cpp b/NBT/TagShort.cpp index c4bb9e3..64eaf33 100644 --- a/NBT/TagShort.cpp +++ b/NBT/TagShort.cpp @@ -3,16 +3,16 @@ #include #include -TagShort::TagShort(const qint16 value) : AbstractNamedTag(ID), m_value(value) {} +TagShort::TagShort (const qint16 value) : AbstractNamedTag(ID), m_value(value) {} -const qint16 TagShort::value() const { +const qint16 TagShort::value () const { return m_value; } -void TagShort::readPayloadFromData(QDataStream &data) { +void TagShort::readPayloadFromData (QDataStream &data) { data >> m_value; m_value = qFromBigEndian(m_value); } -void TagShort::writePayloadToData(QDataStream &data) const { +void TagShort::writePayloadToData (QDataStream &data) const { data << qToBigEndian(m_value); } \ No newline at end of file diff --git a/NBT/TagShort.h b/NBT/TagShort.h index 54b89d4..c7b46f9 100644 --- a/NBT/TagShort.h +++ b/NBT/TagShort.h @@ -7,13 +7,13 @@ class TagShort : public AbstractNamedTag { public: static constexpr quint8 ID = 2; - TagShort(const qint16 value = 0); + TagShort (const qint16 value = 0); - const qint16 value() const; + const qint16 value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: qint16 m_value; diff --git a/NBT/TagString.cpp b/NBT/TagString.cpp index e2595a2..b3c9820 100644 --- a/NBT/TagString.cpp +++ b/NBT/TagString.cpp @@ -4,13 +4,13 @@ #include -TagString::TagString(const QString &value) : AbstractNamedTag(ID), m_value(value) {} +TagString::TagString (const QString &value) : AbstractNamedTag(ID), m_value(value) {} -const QString &TagString::value() const { +const QString &TagString::value () const { return m_value; } -void TagString::readPayloadFromData(QDataStream &data) { +void TagString::readPayloadFromData (QDataStream &data) { TagShort size; data >> size; @@ -24,12 +24,12 @@ void TagString::readPayloadFromData(QDataStream &data) { m_value = QString::fromUtf8(string); } -void TagString::writePayloadToData(QDataStream &data) const { +void TagString::writePayloadToData (QDataStream &data) const { const QByteArray string(m_value.toUtf8()); const TagShort size(string.size()); data << size; - for(qint16 elem = 0; elem < size.value(); elem++) { + for (qint16 elem = 0; elem < size.value(); elem++) { data << string.at(elem); } } \ No newline at end of file diff --git a/NBT/TagString.h b/NBT/TagString.h index b96ef4f..98e72a4 100644 --- a/NBT/TagString.h +++ b/NBT/TagString.h @@ -9,13 +9,13 @@ class TagString : public AbstractNamedTag { public: static constexpr quint8 ID = 8; - TagString(const QString &value = 0); + TagString (const QString &value = 0); - const QString &value() const; + const QString &value () const; protected: - virtual void readPayloadFromData(QDataStream &data) override; - virtual void writePayloadToData(QDataStream &data) const override; + virtual void readPayloadFromData (QDataStream &data) override; + virtual void writePayloadToData (QDataStream &data) const override; private: QString m_value; diff --git a/main.cpp b/main.cpp index af2048b..47f2607 100644 --- a/main.cpp +++ b/main.cpp @@ -3,7 +3,7 @@ #include "MainWindow/MainWindow.h" -int main (int argc, char* argv[]) { +int main (int argc, char *argv[]) { QApplication app(argc, argv); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication::setOrganizationName("JRosset");