Merge

1 files changed, 10 insertions, 1 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 4dfc5d76..3f2b92a6 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -94,6 +94,7 @@ public:
   void loadPlugins();
 
   virtual MOBase::IGameInfo &gameInfo() const;
+  virtual MOBase::IModRepositoryBridge *createNexusBridge() const;
   virtual QString profileName() const;
   virtual QString profilePath() const;
   virtual QString downloadsPath() const;
@@ -103,6 +104,7 @@ public:
   virtual bool removeMod(MOBase::IModInterface *mod);
   virtual void modDataChanged(MOBase::IModInterface *mod);
   virtual QVariant pluginSetting(const QString &pluginName, const QString &key) const;
+  virtual QString pluginDataPath() const;
 
   void addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu, ModInfo::Ptr info);
 
@@ -137,6 +139,10 @@ signals:
    */
   void styleChanged(const QString &styleFile);
 
+
+
+  void modListDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+
 protected:
 
   virtual void showEvent(QShowEvent *event);
@@ -201,7 +207,7 @@ private:
 
   bool extractProgress(QProgressDialog &extractProgress, int percentage, std::string fileName);
 
-  bool checkForProblems(QString &problemDescription);
+  bool checkForProblems();
 
   int getBinaryExecuteInfo(const QFileInfo &targetInfo, QFileInfo &binaryInfo, QString &arguments);
   QTreeWidgetItem *addFilterItem(QTreeWidgetItem *root, const QString &name, int categoryID);
@@ -310,6 +316,7 @@ private slots:
   void endorse_clicked();
   void dontendorse_clicked();
   void unendorse_clicked();
+  void ignoreMissingData_clicked();
   void visitOnNexus_clicked();
   void openExplorer_clicked();
   void information_clicked();
@@ -338,6 +345,8 @@ private slots:
 
   void syncOverwrite();
 
+  void createModFromOverwrite();
+
   void removeOrigin(const QString &name);
 
   void procError(QProcess::ProcessError error);