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/TagLong.cpp NBT/TagLong.h
NBT/TagFloat.cpp NBT/TagFloat.h NBT/TagFloat.cpp NBT/TagFloat.h
NBT/TagDouble.cpp NBT/TagDouble.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) target_link_libraries(NBTModifier Qt5::Widgets Qt5::Svg)

@ -4,16 +4,16 @@
#include <QtWidgets/QFileDialog> #include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox> #include <QtWidgets/QMessageBox>
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow (QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
m_ui(new Ui::MainWindow) { m_ui(new Ui::MainWindow) {
setupUi(); setupUi();
} }
MainWindow::~MainWindow() { MainWindow::~MainWindow () {
delete m_ui; delete m_ui;
} }
void MainWindow::setupUi() { void MainWindow::setupUi () {
m_ui->setupUi(this); m_ui->setupUi(this);
//region Shortcuts //region Shortcuts
@ -49,22 +49,22 @@ void MainWindow::setupUi() {
//endregion //endregion
} }
void MainWindow::on_actionFileOpenFile_triggered() { void MainWindow::on_actionFileOpenFile_triggered () {
/* const QString path = QFileDialog::getOpenFileName( /* const QString path = QFileDialog::getOpenFileName(
this, this,
tr("Choose a file to open"), tr("Choose a file to open"),
qApp->applicationDirPath(), qApp->applicationDirPath(),
QString(tr("Data files (*.dat);;All files (*.*)")) QString(tr("Data files (*.dat);;All files (*.*)"))
); );
if (path.isEmpty()) { if (path.isEmpty()) {
return; return;
} }
const QFile file(path, this); const QFile file(path, this);
*/ */
} }
void MainWindow::on_actionHelpAboutNBTModifier_triggered() { void MainWindow::on_actionHelpAboutNBTModifier_triggered () {
QMessageBox info(this); QMessageBox info(this);
info.setIcon(QMessageBox::Information); info.setIcon(QMessageBox::Information);

@ -11,11 +11,11 @@ namespace Ui {
* Main window of application * Main window of application
*/ */
class MainWindow : public QMainWindow { class MainWindow : public QMainWindow {
Q_OBJECT Q_OBJECT
public: public:
explicit MainWindow(QWidget *parent = nullptr); explicit MainWindow (QWidget *parent = nullptr);
virtual ~MainWindow() override; virtual ~MainWindow () override;
private: private:
/** /**
@ -26,18 +26,18 @@ private:
/** /**
* Build the internal window design * Build the internal window design
*/ */
void setupUi(); void setupUi ();
private slots: private slots:
/** /**
* Open a file * Open a file
*/ */
void on_actionFileOpenFile_triggered(); void on_actionFileOpenFile_triggered ();
/** /**
* Display the "about" dialog * Display the "about" dialog
*/ */
void on_actionHelpAboutNBTModifier_triggered(); void on_actionHelpAboutNBTModifier_triggered ();
}; };
#endif //NBTMODIFIER_MAINWINDOW_H #endif //NBTMODIFIER_MAINWINDOW_H

@ -1,429 +1,448 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>600</height> <height>600</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QMdiArea" name="mdiArea"> <widget class="QMdiArea" name="mdiArea">
<property name="activationOrder"> <property name="activationOrder">
<enum>QMdiArea::StackingOrder</enum> <enum>QMdiArea::StackingOrder</enum>
</property> </property>
<property name="viewMode"> <property name="viewMode">
<enum>QMdiArea::TabbedView</enum> <enum>QMdiArea::TabbedView</enum>
</property> </property>
<property name="documentMode"> <property name="documentMode">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tabsClosable"> <property name="tabsClosable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="tabsMovable"> <property name="tabsMovable">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
<property name="title"> <property name="title">
<string>&amp;File</string> <string>&amp;File</string>
</property> </property>
<addaction name="actionFileNew"/> <addaction name="actionFileNew"/>
<addaction name="actionFileOpenFile"/> <addaction name="actionFileOpenFile"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionFileSave"/> <addaction name="actionFileSave"/>
<addaction name="actionFileSaveAs"/> <addaction name="actionFileSaveAs"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionFileReload"/> <addaction name="actionFileReload"/>
<addaction name="actionFileClose"/> <addaction name="actionFileClose"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionFileSettings"/> <addaction name="actionFileSettings"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionFileQuit"/> <addaction name="actionFileQuit"/>
</widget> </widget>
<widget class="QMenu" name="menuEdit"> <widget class="QMenu" name="menuEdit">
<property name="title"> <property name="title">
<string>&amp;Edit</string> <string>&amp;Edit</string>
</property> </property>
<widget class="QMenu" name="menuEditInsert"> <widget class="QMenu" name="menuEditInsert">
<property name="title"> <property name="title">
<string>Insert</string> <string>Insert</string>
</property> </property>
<addaction name="actionEditInsertCompound"/> <addaction name="actionEditInsertCompound"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionEditInsertString"/> <addaction name="actionEditInsertString"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionEditInsertByte"/> <addaction name="actionEditInsertByte"/>
<addaction name="actionEditInsertShort"/> <addaction name="actionEditInsertShort"/>
<addaction name="actionEditInsertInt"/> <addaction name="actionEditInsertInt"/>
<addaction name="actionEditInsertLong"/> <addaction name="actionEditInsertLong"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionEditInsertFloat"/> <addaction name="actionEditInsertFloat"/>
<addaction name="actionEditInsertDouble"/> <addaction name="actionEditInsertDouble"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionEditInsertList"/> <addaction name="actionEditInsertList"/>
<addaction name="actionEditInsertArrayByte"/> <addaction name="actionEditInsertArrayByte"/>
<addaction name="actionIEditInsertArrayInt"/> <addaction name="actionIEditInsertArrayInt"/>
<addaction name="actionEditInsertArrayLong"/> <addaction name="actionEditInsertArrayLong"/>
</widget>
<addaction name="actionEditUndo"/>
<addaction name="actionEditRedo"/>
<addaction name="separator"/>
<addaction name="actionEditCopy"/>
<addaction name="actionEditCut"/>
<addaction name="actionEditPaste"/>
<addaction name="separator"/>
<addaction name="menuEditInsert"/>
<addaction name="actionEditModify"/>
<addaction name="actionEditDelete"/>
<addaction name="separator"/>
<addaction name="actionEditMoveUp"/>
<addaction name="actionEditMoveDown"/>
</widget>
<widget class="QMenu" name="menuSearch">
<property name="title">
<string>Search</string>
</property>
<addaction name="actionSearchFind"/>
<addaction name="actionSearchFindNext"/>
<addaction name="actionSearchFindPrevious"/>
<addaction name="separator"/>
<addaction name="actionSearchReplace"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>?</string>
</property>
<addaction name="actionHelpAboutNBTModifier"/>
<addaction name="actionHelpAboutQt"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
<addaction name="menuSearch"/>
<addaction name="menuHelp"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
<action name="actionFileNew">
<property name="icon">
<iconset theme="document-new">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;New</string>
</property>
</action>
<action name="actionFileOpenFile">
<property name="icon">
<iconset theme="document-open">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Open file</string>
</property>
</action>
<action name="actionFileSave">
<property name="icon">
<iconset theme="document-save">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Save</string>
</property>
</action>
<action name="actionFileSaveAs">
<property name="icon">
<iconset theme="document-save-as">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Save as</string>
</property>
</action>
<action name="actionFileQuit">
<property name="icon">
<iconset theme="application-exit">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
</property>
<property name="shortcut">
<string>Ctrl+Q</string>
</property>
</action>
<action name="actionEditUndo">
<property name="icon">
<iconset theme="edit-undo">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Undo</string>
</property>
</action>
<action name="actionEditRedo">
<property name="icon">
<iconset theme="edit-redo">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Redo</string>
</property>
</action>
<action name="actionEditCopy">
<property name="icon">
<iconset theme="edit-copy">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Copy</string>
</property>
</action>
<action name="actionEditCut">
<property name="icon">
<iconset theme="edit-cut">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Cut</string>
</property>
</action>
<action name="actionEditPaste">
<property name="icon">
<iconset theme="edit-paste">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Paste</string>
</property>
</action>
<action name="actionEditInsertByte">
<property name="text">
<string>Byte</string>
</property>
</action>
<action name="actionEditInsertShort">
<property name="text">
<string>Short</string>
</property>
</action>
<action name="actionEditInsertInt">
<property name="text">
<string>Int</string>
</property>
</action>
<action name="actionEditInsertLong">
<property name="text">
<string>Long</string>
</property>
</action>
<action name="actionEditInsertFloat">
<property name="text">
<string>Float</string>
</property>
</action>
<action name="actionEditInsertDouble">
<property name="text">
<string>Double</string>
</property>
</action>
<action name="actionEditInsertString">
<property name="text">
<string>String</string>
</property>
</action>
<action name="actionEditInsertCompound">
<property name="text">
<string>Compound</string>
</property>
</action>
<action name="actionEditInsertList">
<property name="text">
<string>List</string>
</property>
</action>
<action name="actionEditInsertArrayByte">
<property name="text">
<string>Byte Array</string>
</property>
</action>
<action name="actionIEditInsertArrayInt">
<property name="text">
<string>Int Array</string>
</property>
</action>
<action name="actionEditInsertArrayLong">
<property name="text">
<string>Long Array</string>
</property>
</action>
<action name="actionEditModify">
<property name="icon">
<iconset theme="document-edit">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Modify name/value</string>
</property>
</action>
<action name="actionEditDelete">
<property name="icon">
<iconset theme="edit-delete">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Delete</string>
</property>
</action>
<action name="actionEditMoveUp">
<property name="icon">
<iconset theme="arrow-up">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Move Up</string>
</property>
</action>
<action name="actionEditMoveDown">
<property name="icon">
<iconset theme="arrow-down">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Move Down</string>
</property>
</action>
<action name="actionFileReload">
<property name="text">
<string>Reload</string>
</property>
</action>
<action name="actionSearchFind">
<property name="icon">
<iconset theme="edit-find">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Find</string>
</property>
</action>
<action name="actionSearchFindNext">
<property name="text">
<string>Find next</string>
</property>
</action>
<action name="actionSearchFindPrevious">
<property name="text">
<string>Find Previous</string>
</property>
</action>
<action name="actionSearchReplace">
<property name="icon">
<iconset theme="edit-find-replace">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;Replace</string>
</property>
</action>
<action name="actionHelpAboutNBTModifier">
<property name="icon">
<iconset theme="help-about">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>&amp;About NBTModifier</string>
</property>
</action>
<action name="actionHelpAboutQt">
<property name="text">
<string>About Qt</string>
</property>
</action>
<action name="actionFileClose">
<property name="icon">
<iconset theme="document-close">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Close</string>
</property>
</action>
<action name="actionFileSettings">
<property name="icon">
<iconset theme="settings-configure">
<normaloff>.</normaloff>.
</iconset>
</property>
<property name="text">
<string>Settings</string>
</property>
</action>
<action name="actionOpen_directory">
<property name="text">
<string>Open directory</string>
</property>
</action>
</widget> </widget>
<addaction name="actionEditUndo"/> <resources/>
<addaction name="actionEditRedo"/> <connections>
<addaction name="separator"/> <connection>
<addaction name="actionEditCopy"/> <sender>actionFileQuit</sender>
<addaction name="actionEditCut"/> <signal>triggered()</signal>
<addaction name="actionEditPaste"/> <receiver>MainWindow</receiver>
<addaction name="separator"/> <slot>close()</slot>
<addaction name="menuEditInsert"/> <hints>
<addaction name="actionEditModify"/> <hint type="sourcelabel">
<addaction name="actionEditDelete"/> <x>-1</x>
<addaction name="separator"/> <y>-1</y>
<addaction name="actionEditMoveUp"/> </hint>
<addaction name="actionEditMoveDown"/> <hint type="destinationlabel">
</widget> <x>399</x>
<widget class="QMenu" name="menuSearch"> <y>299</y>
<property name="title"> </hint>
<string>Search</string> </hints>
</property> </connection>
<addaction name="actionSearchFind"/> </connections>
<addaction name="actionSearchFindNext"/>
<addaction name="actionSearchFindPrevious"/>
<addaction name="separator"/>
<addaction name="actionSearchReplace"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>?</string>
</property>
<addaction name="actionHelpAboutNBTModifier"/>
<addaction name="actionHelpAboutQt"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
<addaction name="menuSearch"/>
<addaction name="menuHelp"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
<action name="actionFileNew">
<property name="icon">
<iconset theme="document-new">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;New</string>
</property>
</action>
<action name="actionFileOpenFile">
<property name="icon">
<iconset theme="document-open">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Open file</string>
</property>
</action>
<action name="actionFileSave">
<property name="icon">
<iconset theme="document-save">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Save</string>
</property>
</action>
<action name="actionFileSaveAs">
<property name="icon">
<iconset theme="document-save-as">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Save as</string>
</property>
</action>
<action name="actionFileQuit">
<property name="icon">
<iconset theme="application-exit">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
</property>
<property name="shortcut">
<string>Ctrl+Q</string>
</property>
</action>
<action name="actionEditUndo">
<property name="icon">
<iconset theme="edit-undo">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Undo</string>
</property>
</action>
<action name="actionEditRedo">
<property name="icon">
<iconset theme="edit-redo">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Redo</string>
</property>
</action>
<action name="actionEditCopy">
<property name="icon">
<iconset theme="edit-copy">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Copy</string>
</property>
</action>
<action name="actionEditCut">
<property name="icon">
<iconset theme="edit-cut">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Cut</string>
</property>
</action>
<action name="actionEditPaste">
<property name="icon">
<iconset theme="edit-paste">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Paste</string>
</property>
</action>
<action name="actionEditInsertByte">
<property name="text">
<string>Byte</string>
</property>
</action>
<action name="actionEditInsertShort">
<property name="text">
<string>Short</string>
</property>
</action>
<action name="actionEditInsertInt">
<property name="text">
<string>Int</string>
</property>
</action>
<action name="actionEditInsertLong">
<property name="text">
<string>Long</string>
</property>
</action>
<action name="actionEditInsertFloat">
<property name="text">
<string>Float</string>
</property>
</action>
<action name="actionEditInsertDouble">
<property name="text">
<string>Double</string>
</property>
</action>
<action name="actionEditInsertString">
<property name="text">
<string>String</string>
</property>
</action>
<action name="actionEditInsertCompound">
<property name="text">
<string>Compound</string>
</property>
</action>
<action name="actionEditInsertList">
<property name="text">
<string>List</string>
</property>
</action>
<action name="actionEditInsertArrayByte">
<property name="text">
<string>Byte Array</string>
</property>
</action>
<action name="actionIEditInsertArrayInt">
<property name="text">
<string>Int Array</string>
</property>
</action>
<action name="actionEditInsertArrayLong">
<property name="text">
<string>Long Array</string>
</property>
</action>
<action name="actionEditModify">
<property name="icon">
<iconset theme="document-edit">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Modify name/value</string>
</property>
</action>
<action name="actionEditDelete">
<property name="icon">
<iconset theme="edit-delete">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Delete</string>
</property>
</action>
<action name="actionEditMoveUp">
<property name="icon">
<iconset theme="arrow-up">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Move Up</string>
</property>
</action>
<action name="actionEditMoveDown">
<property name="icon">
<iconset theme="arrow-down">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Move Down</string>
</property>
</action>
<action name="actionFileReload">
<property name="text">
<string>Reload</string>
</property>
</action>
<action name="actionSearchFind">
<property name="icon">
<iconset theme="edit-find">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Find</string>
</property>
</action>
<action name="actionSearchFindNext">
<property name="text">
<string>Find next</string>
</property>
</action>
<action name="actionSearchFindPrevious">
<property name="text">
<string>Find Previous</string>
</property>
</action>
<action name="actionSearchReplace">
<property name="icon">
<iconset theme="edit-find-replace">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Replace</string>
</property>
</action>
<action name="actionHelpAboutNBTModifier">
<property name="icon">
<iconset theme="help-about">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;About NBTModifier</string>
</property>
</action>
<action name="actionHelpAboutQt">
<property name="text">
<string>About Qt</string>
</property>
</action>
<action name="actionFileClose">
<property name="icon">
<iconset theme="document-close">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Close</string>
</property>
</action>
<action name="actionFileSettings">
<property name="icon">
<iconset theme="settings-configure">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Settings</string>
</property>
</action>
<action name="actionOpen_directory">
<property name="text">
<string>Open directory</string>
</property>
</action>
</widget>
<resources/>
<connections>
<connection>
<sender>actionFileQuit</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
<y>299</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>

@ -3,9 +3,9 @@
#include <QtEndian> #include <QtEndian>
#include <QtCore/QDataStream> #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; quint16 size;
data >> size; data >> size;
@ -19,16 +19,16 @@ void AbstractNamedTag::readFromData(QDataStream &data) {
m_name = QString::fromUtf8(rawName); m_name = QString::fromUtf8(rawName);
readPayloadFromData(data); readPayloadFromData(data);
} }
void AbstractNamedTag::writeToData(QDataStream &data) const { void AbstractNamedTag::writeToData (QDataStream &data) const {
const QByteArray rawName = m_name.toUtf8(); const QByteArray rawName = m_name.toUtf8();
data << qToBigEndian(rawName.size()) << rawName.constData(); data << qToBigEndian(rawName.size()) << rawName.constData();
writePayloadToData(data); writePayloadToData(data);
} }
const QString &AbstractNamedTag::name() const { const QString &AbstractNamedTag::name () const {
return m_name; return m_name;
} }
void AbstractNamedTag::setName(const QString &name) { void AbstractNamedTag::setName (const QString &name) {
m_name = name; m_name = name;
} }

@ -12,7 +12,7 @@ public:
* *
* @return The tag name * @return The tag name
*/ */
const QString& name() const; const QString &name () const;
/** /**
* Set the tag name * Set the tag name
* *
@ -21,10 +21,10 @@ public:
void setName (const QString &name); void setName (const QString &name);
protected: protected:
explicit AbstractNamedTag(const quint8 id); explicit AbstractNamedTag (const quint8 id);
virtual void readFromData(QDataStream &data) override; virtual void readFromData (QDataStream &data) override;
virtual void writeToData(QDataStream &data) const override; virtual void writeToData (QDataStream &data) const override;
/** /**
* Read a tag payload from a data stream * Read a tag payload from a data stream
@ -33,7 +33,7 @@ protected:
* *
* @return True if read is success, otherwise false * @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 * Write a tag payload to a data stream
* *
@ -41,7 +41,7 @@ protected:
* *
* @return True if write is success, otherwise false * @return True if write is success, otherwise false
*/ */
virtual void writePayloadToData(QDataStream &data) const = 0; virtual void writePayloadToData (QDataStream &data) const = 0;
private: private:
/** /**

@ -12,13 +12,13 @@
#include <QtCore/QDataStream> #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; return m_id;
} }
const quint8 AbstractTag::extractId(const QByteArray &data) { const quint8 AbstractTag::extractId (const QByteArray &data) {
QDataStream stream(data); QDataStream stream(data);
quint8 id; quint8 id;
@ -26,7 +26,7 @@ const quint8 AbstractTag::extractId(const QByteArray &data) {
return id; return id;
} }
AbstractTag *AbstractTag::extractEmptyTag(const QByteArray &data) { AbstractTag *AbstractTag::extractEmptyTag (const QByteArray &data) {
switch (extractId(data)) { switch (extractId(data)) {
case TagEnd::ID: case TagEnd::ID:
return new TagEnd(); return new TagEnd();
@ -59,13 +59,13 @@ AbstractTag *AbstractTag::extractEmptyTag(const QByteArray &data) {
return nullptr; return nullptr;
} }
QDataStream &operator<<(QDataStream &data, const AbstractTag &tag) { QDataStream &operator << (QDataStream &data, const AbstractTag &tag) {
data << tag.id(); data << tag.id();
tag.writeToData(data); tag.writeToData(data);
return data; return data;
} }
QDataStream &operator>>(QDataStream &data, AbstractTag &tag) { QDataStream &operator >> (QDataStream &data, AbstractTag &tag) {
quint8 id; quint8 id;
data >> id; data >> id;

@ -10,13 +10,15 @@ class QDataStream;
*/ */
class AbstractTag { class AbstractTag {
public: public:
const quint8 id() const; virtual inline ~AbstractTag () {};
static const quint8 extractId(const QByteArray &data); const quint8 id () const;
static AbstractTag *extractEmptyTag(const QByteArray &data);
friend QDataStream &operator<<(QDataStream &data, const AbstractTag &tag); static const quint8 extractId (const QByteArray &data);
friend QDataStream &operator>>(QDataStream &data, AbstractTag &tag); static AbstractTag *extractEmptyTag (const QByteArray &data);
friend QDataStream &operator << (QDataStream &data, const AbstractTag &tag);
friend QDataStream &operator >> (QDataStream &data, AbstractTag &tag);
protected: protected:
/** /**
@ -24,7 +26,7 @@ protected:
* *
* @param id * @param id
*/ */
explicit AbstractTag(const quint8 id); explicit AbstractTag (const quint8 id);
/** /**
* Read a tag from a data stream * Read a tag from a data stream
@ -33,7 +35,7 @@ protected:
* *
* @return True if read is success, otherwise false * @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 * Write a tag to a data stream
* *
@ -41,7 +43,7 @@ protected:
* *
* @return True if write is success, otherwise false * @return True if write is success, otherwise false
*/ */
virtual void writeToData(QDataStream &data) const = 0; virtual void writeToData (QDataStream &data) const = 0;
private: private:
/** /**

@ -2,16 +2,15 @@
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagByte::readPayloadFromData (QDataStream &data) {
void TagByte::readPayloadFromData(QDataStream &data) {
data >> m_value; data >> m_value;
} }
void TagByte::writePayloadToData(QDataStream &data) const { void TagByte::writePayloadToData (QDataStream &data) const {
data << m_value; data << m_value;
} }

@ -7,13 +7,13 @@ class TagByte : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 1; static constexpr quint8 ID = 1;
TagByte(const qint8 value = 0); TagByte (const qint8 value = 0);
const qint8 value() const; const qint8 value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
qint8 m_value; qint8 m_value;

@ -4,29 +4,29 @@
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagByteArray::readPayloadFromData(QDataStream &data) { void TagByteArray::readPayloadFromData (QDataStream &data) {
TagInt size; TagInt size;
data >> size; data >> size;
m_value.clear(); m_value.clear();
for(qint32 elem = 0; elem < size.value(); elem++) { for (qint32 elem = 0; elem < size.value(); elem++) {
TagByte tag; TagByte tag;
data >> tag; data >> tag;
m_value << tag; m_value << tag;
} }
} }
void TagByteArray::writePayloadToData(QDataStream &data) const { void TagByteArray::writePayloadToData (QDataStream &data) const {
TagInt size(m_value.size()); TagInt size(m_value.size());
data << size; data << size;
foreach(const TagByte tag, m_value) { foreach(const TagByte tag, m_value) {
data << tag; data << tag;
} }
} }

@ -10,13 +10,13 @@ class TagByteArray : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 7; 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: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
QList<TagByte> m_value; QList<TagByte> m_value;

@ -3,16 +3,16 @@
#include <QtEndian> #include <QtEndian>
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagDouble::readPayloadFromData(QDataStream &data) { void TagDouble::readPayloadFromData (QDataStream &data) {
data >> m_value; data >> m_value;
m_value = qFromBigEndian(m_value); m_value = qFromBigEndian(m_value);
} }
void TagDouble::writePayloadToData(QDataStream &data) const { void TagDouble::writePayloadToData (QDataStream &data) const {
data << qToBigEndian(m_value); data << qToBigEndian(m_value);
} }

@ -7,13 +7,13 @@ class TagDouble : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 6; static constexpr quint8 ID = 6;
TagDouble(const double value = 0); TagDouble (const double value = 0);
const double value() const; const double value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
double m_value; double m_value;

@ -1,11 +1,9 @@
#include "TagEnd.h" #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: public:
static constexpr quint8 ID = 0; static constexpr quint8 ID = 0;
explicit TagEnd(); explicit TagEnd ();
protected: protected:
virtual void readFromData(QDataStream &data) override; virtual void readFromData (QDataStream &data) override;
virtual void writeToData(QDataStream &data) const override; virtual void writeToData (QDataStream &data) const override;
}; };
#endif //NBTMODIFIER_TAGEND_H #endif //NBTMODIFIER_TAGEND_H

@ -3,16 +3,16 @@
#include <QtEndian> #include <QtEndian>
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagFloat::readPayloadFromData(QDataStream &data) { void TagFloat::readPayloadFromData (QDataStream &data) {
data >> m_value; data >> m_value;
m_value = qFromBigEndian(m_value); m_value = qFromBigEndian(m_value);
} }
void TagFloat::writePayloadToData(QDataStream &data) const { void TagFloat::writePayloadToData (QDataStream &data) const {
data << qToBigEndian(m_value); data << qToBigEndian(m_value);
} }

@ -8,13 +8,13 @@ class TagFloat : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 5; static constexpr quint8 ID = 5;
TagFloat(const float value = 0); TagFloat (const float value = 0);
const float value() const; const float value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
float m_value; float m_value;

@ -3,16 +3,16 @@
#include <QtEndian> #include <QtEndian>
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagInt::readPayloadFromData(QDataStream &data) { void TagInt::readPayloadFromData (QDataStream &data) {
data >> m_value; data >> m_value;
m_value = qFromBigEndian(m_value); m_value = qFromBigEndian(m_value);
} }
void TagInt::writePayloadToData(QDataStream &data) const { void TagInt::writePayloadToData (QDataStream &data) const {
data << qToBigEndian(m_value); data << qToBigEndian(m_value);
} }

@ -7,13 +7,13 @@ class TagInt : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 3; static constexpr quint8 ID = 3;
TagInt(const qint32 value = 0); TagInt (const qint32 value = 0);
const qint32 value() const; const qint32 value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
qint32 m_value; qint32 m_value;

@ -3,16 +3,16 @@
#include <QtEndian> #include <QtEndian>
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagLong::readPayloadFromData(QDataStream &data) { void TagLong::readPayloadFromData (QDataStream &data) {
data >> m_value; data >> m_value;
m_value = qFromBigEndian(m_value); m_value = qFromBigEndian(m_value);
} }
void TagLong::writePayloadToData(QDataStream &data) const { void TagLong::writePayloadToData (QDataStream &data) const {
data << qToBigEndian(m_value); data << qToBigEndian(m_value);
} }

@ -7,13 +7,13 @@ class TagLong : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 4; static constexpr quint8 ID = 4;
TagLong(const qint64 value = 0); TagLong (const qint64 value = 0);
const qint64 value() const; const qint64 value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
qint64 m_value; qint64 m_value;

@ -3,16 +3,16 @@
#include <QtEndian> #include <QtEndian>
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagShort::readPayloadFromData(QDataStream &data) { void TagShort::readPayloadFromData (QDataStream &data) {
data >> m_value; data >> m_value;
m_value = qFromBigEndian(m_value); m_value = qFromBigEndian(m_value);
} }
void TagShort::writePayloadToData(QDataStream &data) const { void TagShort::writePayloadToData (QDataStream &data) const {
data << qToBigEndian(m_value); data << qToBigEndian(m_value);
} }

@ -7,13 +7,13 @@ class TagShort : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 2; static constexpr quint8 ID = 2;
TagShort(const qint16 value = 0); TagShort (const qint16 value = 0);
const qint16 value() const; const qint16 value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
qint16 m_value; qint16 m_value;

@ -4,13 +4,13 @@
#include <QtCore/QDataStream> #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; return m_value;
} }
void TagString::readPayloadFromData(QDataStream &data) { void TagString::readPayloadFromData (QDataStream &data) {
TagShort size; TagShort size;
data >> size; data >> size;
@ -24,12 +24,12 @@ void TagString::readPayloadFromData(QDataStream &data) {
m_value = QString::fromUtf8(string); m_value = QString::fromUtf8(string);
} }
void TagString::writePayloadToData(QDataStream &data) const { void TagString::writePayloadToData (QDataStream &data) const {
const QByteArray string(m_value.toUtf8()); const QByteArray string(m_value.toUtf8());
const TagShort size(string.size()); const TagShort size(string.size());
data << size; data << size;
for(qint16 elem = 0; elem < size.value(); elem++) { for (qint16 elem = 0; elem < size.value(); elem++) {
data << string.at(elem); data << string.at(elem);
} }
} }

@ -9,13 +9,13 @@ class TagString : public AbstractNamedTag {
public: public:
static constexpr quint8 ID = 8; static constexpr quint8 ID = 8;
TagString(const QString &value = 0); TagString (const QString &value = 0);
const QString &value() const; const QString &value () const;
protected: protected:
virtual void readPayloadFromData(QDataStream &data) override; virtual void readPayloadFromData (QDataStream &data) override;
virtual void writePayloadToData(QDataStream &data) const override; virtual void writePayloadToData (QDataStream &data) const override;
private: private:
QString m_value; QString m_value;

@ -3,7 +3,7 @@
#include "MainWindow/MainWindow.h" #include "MainWindow/MainWindow.h"
int main (int argc, char* argv[]) { int main (int argc, char *argv[]) {
QApplication app(argc, argv); QApplication app(argc, argv);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication::setOrganizationName("JRosset"); QApplication::setOrganizationName("JRosset");

Loading…
Cancel
Save