GUI: Replace repeated check with inline function

xoreos · Dec 29, 2017 · 10e3554 · 10e3554
1 parent b3376f6
commit 10e3554
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/src/gui/resourcetree.cpp b/src/gui/resourcetree.cpp
@@ -180,17 +180,7 @@ QVariant ResourceTree::headerData(int UNUSED(section), Qt::Orientation orientati
 }
 
 bool ResourceTree::canFetchMore(const QModelIndex &index) const {
-    auto type = itemFromIndex(index)->getFileType();
-    if (type == Aurora::kFileTypeZIP ||
-        type == Aurora::kFileTypeERF ||
-        type == Aurora::kFileTypeMOD ||
-        type == Aurora::kFileTypeNWM ||
-        type == Aurora::kFileTypeSAV ||
-        type == Aurora::kFileTypeHAK ||
-        type == Aurora::kFileTypeRIM ||
-        type == Aurora::kFileTypeKEY)
-        return true;
-    return false;
+    return itemFromIndex(index)->isArchive();
 }
 
 void ResourceTree::fetchMore(const QModelIndex &index) {
@@ -232,15 +222,7 @@ bool ResourceTree::hasChildren(const QModelIndex &index) const {
     if (!index.isValid())
         return true;
 
-    auto type = itemFromIndex(index)->getFileType();
-    if (type == Aurora::kFileTypeZIP ||
-        type == Aurora::kFileTypeERF ||
-        type == Aurora::kFileTypeMOD ||
-        type == Aurora::kFileTypeNWM ||
-        type == Aurora::kFileTypeSAV ||
-        type == Aurora::kFileTypeHAK ||
-        type == Aurora::kFileTypeRIM ||
-        type == Aurora::kFileTypeKEY)
+    if (itemFromIndex(index)->isArchive())
         return true;
 
     return itemFromIndex(index)->hasChildren();

diff --git a/src/gui/resourcetreeitem.h b/src/gui/resourcetreeitem.h
@@ -91,6 +91,17 @@ class ResourceTreeItem {
     ResourceTreeItem(QString fullPath, ResourceTreeItem *parent);
     ~ResourceTreeItem();
 
+    inline bool isArchive() {
+        return _fileType == Aurora::kFileTypeZIP ||
+               _fileType == Aurora::kFileTypeERF ||
+               _fileType == Aurora::kFileTypeMOD ||
+               _fileType == Aurora::kFileTypeNWM ||
+               _fileType == Aurora::kFileTypeSAV ||
+               _fileType == Aurora::kFileTypeHAK ||
+               _fileType == Aurora::kFileTypeRIM ||
+               _fileType == Aurora::kFileTypeKEY;
+    }
+
     /** Model structure. **/
     bool hasChildren() const;
     bool insertChild(int position, ResourceTreeItem *child);