GUI: Refactor for clarity

- Remove FileInfo and SoundInfo structs
- Add ItemData struct to contain all non tree structure data
- Rename getData -> getName
- Remove getFileInfo method

src/gui/mainwindow.cpp

@@ -219,7 +219,7 @@ void MainWindow::saveItem() {
     if (fileName.isEmpty())
         return;
 
-    _status->push(constructStatus("Saving", _currentItem->getData(), fileName));
+    _status->push(constructStatus("Saving", _currentItem->getName(), fileName));
     BOOST_SCOPE_EXIT((&_status)) {
         _status->pop();
     } BOOST_SCOPE_EXIT_END
@@ -250,7 +250,7 @@ void MainWindow::exportTGA() {
     if (fileName.isEmpty())
         return;
 
-    _status->push(constructStatus("Exporting", _currentItem->getData(), fileName));
+    _status->push(constructStatus("Exporting", _currentItem->getName(), fileName));
     BOOST_SCOPE_EXIT((&_status)) {
         _status->pop();
     } BOOST_SCOPE_EXIT_END
@@ -285,7 +285,7 @@ void MainWindow::exportBMUMP3() {
 
     const QString title = "Save MP3 file";
     const QString mask  = "MP3 file (*.mp3)|*.mp3";
-    const QString def   = TypeMan.setFileType(USTR(_currentItem->getData()), Aurora::kFileTypeMP3).toQString();
+    const QString def   = TypeMan.setFileType(USTR(_currentItem->getName()), Aurora::kFileTypeMP3).toQString();
 
     QString fileName = QFileDialog::getSaveFileName(this,
             title, def,
@@ -294,7 +294,7 @@ void MainWindow::exportBMUMP3() {
     if (fileName.isEmpty())
         return;
 
-    _status->push(constructStatus("Exporting", _currentItem->getData(), fileName));
+    _status->push(constructStatus("Exporting", _currentItem->getName(), fileName));
     BOOST_SCOPE_EXIT((&_status)) {
         _status->pop();
     } BOOST_SCOPE_EXIT_END
@@ -396,7 +396,7 @@ void MainWindow::exportWAV() {
 
     const QString title = "Save PCM WAV file";
     const QString mask  = "WAV file (*.wav)|*.wav";
-    const QString def   = TypeMan.setFileType(USTR(_currentItem->getData()), Aurora::kFileTypeWAV).toQString();
+    const QString def   = TypeMan.setFileType(USTR(_currentItem->getName()), Aurora::kFileTypeWAV).toQString();
 
     QString fileName = QFileDialog::getSaveFileName(this,
             title, def,
@@ -405,7 +405,7 @@ void MainWindow::exportWAV() {
     if (fileName.isEmpty())
         return;
 
-    _status->push(constructStatus("Exporting", _currentItem->getData(), fileName));
+    _status->push(constructStatus("Exporting", _currentItem->getName(), fileName));
     BOOST_SCOPE_EXIT((&_status)) {
         _status->pop();
     } BOOST_SCOPE_EXIT_END

src/gui/panelpreviewtext.cpp

@@ -30,7 +30,7 @@ void PanelPreviewText::setItem(const ResourceTreeItem *item) {
 
     _currentItem = item;
 
-    QFile file(item->getFileInfo().canonicalFilePath());
+    QFile file(item->getPath());
     file.open(QFile::ReadOnly | QFile::Text);
     QTextStream textStream(&file);
 

src/gui/panelresourceinfo.cpp

@@ -144,7 +144,7 @@ void PanelResourceInfo::setLabels(const ResourceTreeItem *item) {
     QString labelFileType = "File type: ";
     QString labelResType  = "Resource type: ";
 
-    labelName += item->getData();
+    labelName += item->getName();
 
     if (item->getSource() == Source::kSourceDirectory) {
 

src/gui/resourcetree.cpp

@@ -110,32 +110,32 @@ void ResourceTree::fetchMore(const QModelIndex &index) {
     ResourceTreeItem *item = getItem(index);
 
     // We already added the archive members. Nothing to do
-    ArchiveInfo &archiveInfo = item->getArchive();
-    if (archiveInfo.addedArchiveMembers)
+    Archive &archive = item->getArchive();
+    if (archive.addedMembers)
         return;
 
-    _mainWindow->status()->push(tr("Loading archive") + item->getData() + "...");
+    _mainWindow->status()->push(tr("Loading archive") + item->getName() + "...");
     BOOST_SCOPE_EXIT((&_mainWindow)) {
         _mainWindow->status()->pop();
     } BOOST_SCOPE_EXIT_END
 
     // Load the archive, if necessary
-    if (!archiveInfo.archive) {
+    if (!archive.data) {
         try {
-            archiveInfo.archive = getArchive(item->getPath());
+            archive.data = getArchive(item->getPath());
         } catch (Common::Exception &e) {
             // If that fails, print the error and treat this archive as empty
 
-            e.add("Failed to load archive \"%s\"", getItem(index)->getData().toStdString().c_str());
+            e.add("Failed to load archive \"%s\"", getItem(index)->getName().toStdString().c_str());
             Common::printException(e, "WARNING: ");
 
             return;
         }
     }
 
-    insertItemsFromArchive(archiveInfo, index);
+    insertItemsFromArchive(archive, index);
 
-    archiveInfo.addedArchiveMembers = true;
+    archive.addedMembers = true;
 }
 
 bool ResourceTree::hasChildren(const QModelIndex &index) const {
@@ -183,7 +183,7 @@ QModelIndex ResourceTree::index(int row, int column, const QModelIndex &parent)
 
 QVariant ResourceTree::headerData(int section, Qt::Orientation orientation, int role) const {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
-        return _root->getData();
+        return _root->getName();
 
     return QVariant();
 }
@@ -220,7 +220,7 @@ QVariant ResourceTree::data(const QModelIndex &index, int role) const {
     }
 
     if (role == Qt::DisplayRole)
-        return cur->getData();
+        return cur->getName();
 
     return QVariant();
 }
@@ -232,15 +232,15 @@ Qt::ItemFlags ResourceTree::flags(const QModelIndex &index) const {
     return QAbstractItemModel::flags(index);
 }
 
-void ResourceTree::insertItemsFromArchive(ArchiveInfo &data, const QModelIndex &parentIndex) {
+void ResourceTree::insertItemsFromArchive(Archive &archive, const QModelIndex &parentIndex) {
     QList<ResourceTreeItem*> items;
 
     ResourceTreeItem *parentItem = getItem(parentIndex);
 
-    auto resources = data.archive->getResources();
+    auto resources = archive.data->getResources();
     for (auto r = resources.begin(); r != resources.end(); ++r)
     {
-        items << new ResourceTreeItem(data.archive, *r, parentItem);
+        items << new ResourceTreeItem(archive.data, *r, parentItem);
     }
 
     insertItems(0, items, parentIndex);

src/gui/resourcetree.h

@@ -34,7 +34,7 @@ namespace Aurora {
 
 namespace GUI {
 
-struct ArchiveInfo;
+struct Archive;
 class MainWindow;
 class ResourceTreeItem;
 
@@ -69,7 +69,7 @@ class ResourceTree : public QAbstractItemModel {
     ResourceTreeItem *getItem(const QModelIndex &index) const;
     bool canFetchMore(const QModelIndex &index) const override;
     void fetchMore(const QModelIndex &index);
-    void insertItemsFromArchive(ArchiveInfo &data, const QModelIndex &parentIndex);
+    void insertItemsFromArchive(Archive &archive, const QModelIndex &parentIndex);
     void insertItems(int position, QList<ResourceTreeItem*> &items, const QModelIndex &parentIndex);
     bool hasChildren(const QModelIndex &index) const override;
     Qt::ItemFlags flags(const QModelIndex &index) const;