From 1ee615394095a3367cc0d4544aab6b0de55877d9 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Mon, 2 Mar 2015 06:51:31 +1100
Subject: [PATCH] Remove unnecessary boolean passing between objects.

---
 apps/opencs/view/doc/filedialog.cpp                |  2 +-
 components/contentselector/model/contentmodel.cpp  | 14 ++++----------
 components/contentselector/model/contentmodel.hpp  |  3 +--
 .../contentselector/view/contentselector.cpp       |  8 ++++----
 .../contentselector/view/contentselector.hpp       |  4 ++--
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index c895a3399..8dd83f24a 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -24,7 +24,7 @@ CSVDoc::FileDialog::FileDialog(QWidget *parent) :
     resize(400, 400);
 
     setObjectName ("FileDialog");
-    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget, true);
+    mSelector = new ContentSelectorView::ContentSelector (ui.contentSelectorWidget);
     mAdjusterWidget = new AdjusterWidget (this);
 }
 
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 3e3536413..3dc02af21 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -9,14 +9,13 @@
 
 #include "components/esm/esmreader.hpp"
 
-ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon, bool showGameFiles) :
+ContentSelectorModel::ContentModel::ContentModel(QObject *parent, QIcon warningIcon) :
     QAbstractTableModel(parent),
     mWarningIcon(warningIcon),
     mMimeType ("application/omwcontent"),
     mMimeTypes (QStringList() << mMimeType),
     mColumnCount (1),
-    mDropActions (Qt::MoveAction),
-    mShowGameFiles(showGameFiles)
+    mDropActions (Qt::MoveAction)
 {
     setEncoding ("win1252");
     uncheckAll();
@@ -111,14 +110,9 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
     if (!file)
         return Qt::NoItemFlags;
 
-    //game files are not shown (unless OpenCS)
+    //game files can always be checked
     if (file->isGameFile())
-    {
-        if(mShowGameFiles)
-            return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
-        else
-            return Qt::NoItemFlags;
-    }
+        return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
 
     Qt::ItemFlags returnFlags;
 
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 887ad51b3..658555852 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -23,7 +23,7 @@ namespace ContentSelectorModel
     {
         Q_OBJECT
     public:
-        explicit ContentModel(QObject *parent, QIcon warningIcon, bool showGameFiles = false);
+        explicit ContentModel(QObject *parent, QIcon warningIcon);
         ~ContentModel();
 
         void setEncoding(const QString &encoding);
@@ -66,7 +66,6 @@ namespace ContentSelectorModel
         void addFile(EsmFile *file);
         const EsmFile *item(int row) const;
         EsmFile *item(int row);
-        bool mShowGameFiles;
 
         void sortFiles();
 
diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index 9d35de8f6..2363ae477 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -13,21 +13,21 @@
 #include <QDir>
 #include <assert.h>
 
-ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent, bool showGameFiles) :
+ContentSelectorView::ContentSelector::ContentSelector(QWidget *parent) :
     QObject(parent)
 {
     ui.setupUi(parent);
     ui.addonView->setDragDropMode(QAbstractItemView::InternalMove);
 
-    buildContentModel(showGameFiles);
+    buildContentModel();
     buildGameFileView();
     buildAddonView();
 }
 
-void ContentSelectorView::ContentSelector::buildContentModel(bool showGameFiles)
+void ContentSelectorView::ContentSelector::buildContentModel()
 {
     QIcon warningIcon(ui.addonView->style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 15)));
-    mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon, showGameFiles);
+    mContentModel = new ContentSelectorModel::ContentModel(this, warningIcon);
 }
 
 void ContentSelectorView::ContentSelector::buildGameFileView()
diff --git a/components/contentselector/view/contentselector.hpp b/components/contentselector/view/contentselector.hpp
index eb060f7a9..2507cf6ad 100644
--- a/components/contentselector/view/contentselector.hpp
+++ b/components/contentselector/view/contentselector.hpp
@@ -23,7 +23,7 @@ namespace ContentSelectorView
 
     public:
 
-        explicit ContentSelector(QWidget *parent = 0, bool showGameFiles = false);
+        explicit ContentSelector(QWidget *parent = 0);
 
         QString currentFile() const;
 
@@ -48,7 +48,7 @@ namespace ContentSelectorView
 
         Ui::ContentSelector ui;
 
-        void buildContentModel(bool showGameFiles);
+        void buildContentModel();
         void buildGameFileView();
         void buildAddonView();
         void setGameFileSelected(int index, bool selected);