GUI: Replace empty constructor with root constructor

Meaning we can remove the setData function which was only used for this purpose.
xoreos · Dec 29, 2017 · 8a9e734 · 8a9e734
1 parent dcd220a
commit 8a9e734
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/src/gui/resourcetree.cpp b/src/gui/resourcetree.cpp
@@ -52,8 +52,7 @@ ResourceTree::ResourceTree(MainWindow *mainWindow, QObject *parent)
     : QAbstractItemModel(parent)
     , _mainWindow(mainWindow)
     , _iconProvider(new QFileIconProvider()) {
-    _root = new ResourceTreeItem();
-    _root->setData("Filename");
+    _root = new ResourceTreeItem("Filename");
 }
 
 void ResourceTree::populate(const Common::FileTree::Entry &rootEntry) {

diff --git a/src/gui/resourcetreeitem.cpp b/src/gui/resourcetreeitem.cpp
@@ -78,20 +78,15 @@ ResourceTreeItem::ResourceTreeItem(Aurora::Archive *archive, const Aurora::Archi
     _duration = Sound::RewindableAudioStream::kInvalidLength;
 }
 
-
-ResourceTreeItem::ResourceTreeItem() {
-    _parent = nullptr;
+ResourceTreeItem::ResourceTreeItem(const QString &data) {
+    _name = data;
 }
 
 ResourceTreeItem::~ResourceTreeItem() {
     qDeleteAll(_children);
     _children.clear();
 }
 
-void ResourceTreeItem::setData(QString data) {
-    _name = data;
-}
-
 void ResourceTreeItem::addChild(ResourceTreeItem *child) {
     _children << child;
     child->setParent(this);

diff --git a/src/gui/resourcetreeitem.h b/src/gui/resourcetreeitem.h
@@ -81,7 +81,8 @@ class ResourceTreeItem {
     /** Archive item. */
     ResourceTreeItem(Aurora::Archive *archive, const Aurora::Archive::Resource &resource);
     /** Root item. */
-    ResourceTreeItem();
+    ResourceTreeItem(const QString &data);
+
     ~ResourceTreeItem();
 
     inline bool isArchive() {
@@ -94,9 +95,6 @@ class ResourceTreeItem {
                _fileType == Aurora::kFileTypeRIM ||
                _fileType == Aurora::kFileTypeKEY;
     }
-
-    void setData(QString data);
-    void addChild(ResourceTreeItem *child);
 
     /** Model structure. **/
     bool hasChildren() const;
@@ -105,7 +103,7 @@ class ResourceTreeItem {
     int row() const;
     ResourceTreeItem *childAt(int row) const;
     ResourceTreeItem *getParent() const;
-    void appendChild(ResourceTreeItem *child);
+    void addChild(ResourceTreeItem *child);
     void setParent(ResourceTreeItem *parent);
 
     /** Both. **/