Merge pull request #695 from ModOrganizer2/Develop

Stage for Release 2.2.0

1 files changed, 16 insertions, 5 deletions

diff --git a/src/modinfooverwrite.h b/src/modinfooverwrite.h
index 4b98d715..c5f58c2e 100644
--- a/src/modinfooverwrite.h
+++ b/src/modinfooverwrite.h
@@ -1,11 +1,11 @@
 #ifndef MODINFOOVERWRITE_H
 #define MODINFOOVERWRITE_H
 
-#include "modinfo.h"
+#include "modinfowithconflictinfo.h"
 
 #include <QDateTime>
 
-class ModInfoOverwrite : public ModInfo
+class ModInfoOverwrite : public ModInfoWithConflictInfo
 {
 
   Q_OBJECT
@@ -22,7 +22,7 @@ public:
   virtual bool setName(const QString&) { return false; }
   virtual void setComments(const QString&) {}
   virtual void setNotes(const QString&) {}
-  virtual void setGameName(QString) {}
+  virtual void setGameName(const QString&) {}
   virtual void setNexusID(int) {}
   virtual void setNewestVersion(const MOBase::VersionInfo&) {}
   virtual void ignoreUpdate(bool) {}
@@ -31,8 +31,11 @@ public:
   virtual void addNexusCategory(int) {}
   virtual void setIsEndorsed(bool) {}
   virtual void setNeverEndorse() {}
+  virtual void setIsTracked(bool) {}
   virtual bool remove() { return false; }
   virtual void endorse(bool) {}
+  virtual void track(bool) {}
+  virtual void parseNexusInfo() {}
   virtual bool alwaysEnabled() const { return true; }
   virtual bool isEmpty() const;
   virtual QString name() const { return "Overwrite"; }
@@ -45,18 +48,26 @@ public:
   virtual int getFixedPriority() const { return INT_MAX; }
   virtual QString getGameName() const { return ""; }
   virtual int getNexusID() const { return -1; }
+  virtual QDateTime getExpires() const { return QDateTime(); }
   virtual std::vector<QString> getIniTweaks() const { return std::vector<QString>(); }
   virtual std::vector<ModInfo::EFlag> getFlags() const;
   virtual int getHighlight() const;
   virtual QString getDescription() const;
+  virtual int getNexusFileStatus() const { return 0; }
+  virtual void setNexusFileStatus(int) {}
+  virtual QDateTime getLastNexusUpdate() const { return QDateTime(); }
+  virtual void setLastNexusUpdate(QDateTime) {}
   virtual QDateTime getLastNexusQuery() const { return QDateTime(); }
+  virtual void setLastNexusQuery(QDateTime) {}
+  virtual QDateTime getNexusLastModified() const { return QDateTime(); }
+  virtual void setNexusLastModified(QDateTime) {}
   virtual QString getNexusDescription() const { return QString(); }
-  virtual QStringList archives() const;
+  virtual QStringList archives(bool checkOnDisk = false);
   virtual void addInstalledFile(int, int) {}
 
 private:
 
-  ModInfoOverwrite(PluginContainer *pluginContainer);
+  ModInfoOverwrite(PluginContainer *pluginContainer, MOShared::DirectoryEntry **directoryStructure );
 
 };