Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 53 insertions, 0 deletions

diff --git a/src/modinfooverwrite.cpp b/src/modinfooverwrite.cpp
new file mode 100644
index 00000000..4380a255
--- /dev/null
+++ b/src/modinfooverwrite.cpp
@@ -0,0 +1,53 @@
+#include "modinfooverwrite.h"
+
+#include "appconfig.h"
+
+#include <QApplication>
+#include <QDirIterator>
+
+ModInfoOverwrite::ModInfoOverwrite()
+{
+  testValid();
+}
+
+bool ModInfoOverwrite::isEmpty() const
+{
+  QDirIterator iter(absolutePath(), QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
+  if (!iter.hasNext()) return true;
+  iter.next();
+  if ((iter.fileName() == "meta.ini") && !iter.hasNext()) return true;
+  return false;
+}
+
+QString ModInfoOverwrite::absolutePath() const
+{
+  return QDir::fromNativeSeparators(qApp->property("dataPath").toString() + "/" + QString::fromStdWString(AppConfig::overwritePath()));
+}
+
+std::vector<ModInfo::EFlag> ModInfoOverwrite::getFlags() const
+{
+  std::vector<ModInfo::EFlag> result;
+  result.push_back(FLAG_OVERWRITE);
+  return result;
+}
+
+int ModInfoOverwrite::getHighlight() const
+{
+  return (isValid() ? HIGHLIGHT_IMPORTANT : HIGHLIGHT_INVALID) | HIGHLIGHT_CENTER;
+}
+
+QString ModInfoOverwrite::getDescription() const
+{
+  return tr("This pseudo mod contains files from the virtual data tree that got "
+            "modified (i.e. by the construction kit)");
+}
+
+QStringList ModInfoOverwrite::archives() const
+{
+  QStringList result;
+  QDir dir(this->absolutePath());
+  for (const QString &archive : dir.entryList(QStringList("*.bsa"))) {
+    result.append(this->absolutePath() + "/" + archive);
+  }
+  return result;
+}