Reformating code

master
Julien Rosset 5 years ago
parent 502625a18c
commit 9850b9a3c4

@ -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)

@ -4,16 +4,16 @@
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox>
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,7 +49,7 @@ void MainWindow::setupUi() {
//endregion
}
void MainWindow::on_actionFileOpenFile_triggered() {
void MainWindow::on_actionFileOpenFile_triggered () {
/* const QString path = QFileDialog::getOpenFileName(
this,
tr("Choose a file to open"),
@ -61,10 +61,10 @@ void MainWindow::on_actionFileOpenFile_triggered() {
}
const QFile file(path, this);
*/
*/
}
void MainWindow::on_actionHelpAboutNBTModifier_triggered() {
void MainWindow::on_actionHelpAboutNBTModifier_triggered () {
QMessageBox info(this);
info.setIcon(QMessageBox::Information);

@ -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

@ -150,7 +150,8 @@
<action name="actionFileNew">
<property name="icon">
<iconset theme="document-new">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;New</string>
@ -159,7 +160,8 @@
<action name="actionFileOpenFile">
<property name="icon">
<iconset theme="document-open">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Open file</string>
@ -168,7 +170,8 @@
<action name="actionFileSave">
<property name="icon">
<iconset theme="document-save">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Save</string>
@ -177,7 +180,8 @@
<action name="actionFileSaveAs">
<property name="icon">
<iconset theme="document-save-as">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Save as</string>
@ -186,7 +190,8 @@
<action name="actionFileQuit">
<property name="icon">
<iconset theme="application-exit">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
@ -198,7 +203,8 @@
<action name="actionEditUndo">
<property name="icon">
<iconset theme="edit-undo">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Undo</string>
@ -207,7 +213,8 @@
<action name="actionEditRedo">
<property name="icon">
<iconset theme="edit-redo">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Redo</string>
@ -216,7 +223,8 @@
<action name="actionEditCopy">
<property name="icon">
<iconset theme="edit-copy">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Copy</string>
@ -225,7 +233,8 @@
<action name="actionEditCut">
<property name="icon">
<iconset theme="edit-cut">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Cut</string>
@ -234,7 +243,8 @@
<action name="actionEditPaste">
<property name="icon">
<iconset theme="edit-paste">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Paste</string>
@ -303,7 +313,8 @@
<action name="actionEditModify">
<property name="icon">
<iconset theme="document-edit">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Modify name/value</string>
@ -312,7 +323,8 @@
<action name="actionEditDelete">
<property name="icon">
<iconset theme="edit-delete">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Delete</string>
@ -321,7 +333,8 @@
<action name="actionEditMoveUp">
<property name="icon">
<iconset theme="arrow-up">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Move Up</string>
@ -330,7 +343,8 @@
<action name="actionEditMoveDown">
<property name="icon">
<iconset theme="arrow-down">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Move Down</string>
@ -344,7 +358,8 @@
<action name="actionSearchFind">
<property name="icon">
<iconset theme="edit-find">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Find</string>
@ -363,7 +378,8 @@
<action name="actionSearchReplace">
<property name="icon">
<iconset theme="edit-find-replace">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Replace</string>
@ -372,7 +388,8 @@
<action name="actionHelpAboutNBTModifier">
<property name="icon">
<iconset theme="help-about">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;About NBTModifier</string>
@ -386,7 +403,8 @@
<action name="actionFileClose">
<property name="icon">
<iconset theme="document-close">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Close</string>
@ -395,7 +413,8 @@
<action name="actionFileSettings">
<property name="icon">
<iconset theme="settings-configure">
<normaloff>.</normaloff>.</iconset>
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Settings</string>

@ -3,9 +3,9 @@
#include <QtEndian>
#include <QtCore/QDataStream>
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;
}

@ -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:
/**

@ -12,13 +12,13 @@
#include <QtCore/QDataStream>
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;

@ -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:
/**

@ -2,16 +2,15 @@
#include <QtCore/QDataStream>
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;
}

@ -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;

@ -4,25 +4,25 @@
#include <QtCore/QDataStream>
TagByteArray::TagByteArray(const QList<TagByte> value) : AbstractNamedTag(ID), m_value(value) {}
TagByteArray::TagByteArray (const QList<TagByte> value) : AbstractNamedTag(ID), m_value(value) {}
const QList<TagByte> &TagByteArray::value() const {
const QList<TagByte> &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;

@ -10,13 +10,13 @@ class TagByteArray : public AbstractNamedTag {
public:
static constexpr quint8 ID = 7;
TagByteArray(const QList<TagByte> value = QList<TagByte>());
TagByteArray (const QList<TagByte> value = QList<TagByte>());
const QList<TagByte> &value() const;
const QList<TagByte> &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<TagByte> m_value;

@ -3,16 +3,16 @@
#include <QtEndian>
#include <QtCore/QDataStream>
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);
}

@ -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;

@ -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 {
}

@ -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

@ -3,16 +3,16 @@
#include <QtEndian>
#include <QtCore/QDataStream>
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);
}

@ -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;

@ -3,16 +3,16 @@
#include <QtEndian>
#include <QtCore/QDataStream>
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);
}

@ -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;

@ -3,16 +3,16 @@
#include <QtEndian>
#include <QtCore/QDataStream>
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);
}

@ -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;

@ -3,16 +3,16 @@
#include <QtEndian>
#include <QtCore/QDataStream>
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);
}

@ -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;

@ -4,13 +4,13 @@
#include <QtCore/QDataStream>
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);
}
}

@ -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;

@ -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");

Loading…
Cancel
Save