From 356d17b2ea70d9bfdc36d8199e12eb21cd3d4669 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:08:05 -0400
Subject: fixes after rebasing

---
 src/organizerproxy.h | 91 +++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 47 deletions(-)

(limited to 'src/organizerproxy.h')

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index 3bd70113..144a7732 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -85,57 +85,54 @@ private:
 class DummyOrganizerProxy : public MOBase::IOrganizer
 {
 public:
-  DummyOrganizerProxy(const QString &pluginName);
+  DummyOrganizerProxy(MOBase::IPlugin* plugin);
   ~DummyOrganizerProxy();
 
-  virtual MOBase::IModRepositoryBridge *createNexusBridge() const;
-  virtual QString profileName() const;
-  virtual QString profilePath() const;
-  virtual QString downloadsPath() const;
-  virtual QString overwritePath() const;
-  virtual QString basePath() const;
-  virtual QString modsPath() const;
-  virtual MOBase::VersionInfo appVersion() const;
-  virtual MOBase::IModInterface *getMod(const QString &name) const;
-  virtual MOBase::IPluginGame *getGame(const QString &gameName) const;
-  virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);
-  virtual bool removeMod(MOBase::IModInterface *mod);
-  virtual void modDataChanged(MOBase::IModInterface *mod);
-  virtual QVariant pluginSetting(const QString &pluginName, const QString &key) const;
-  virtual void setPluginSetting(const QString &pluginName, const QString &key, const QVariant &value);
-  virtual QVariant persistent(const QString &pluginName, const QString &key, const QVariant &def = QVariant()) const;
-  virtual void setPersistent(const QString &pluginName, const QString &key, const QVariant &value, bool sync = true);
-  virtual QString pluginDataPath() const;
-  virtual MOBase::IModInterface *installMod(const QString &fileName, const QString &nameSuggestion = QString());
-  virtual QString resolvePath(const QString &fileName) const;
-  virtual QStringList listDirectories(const QString &directoryName) const;
-  virtual QStringList findFiles(const QString &path, const std::function<bool(const QString &)> &filter) const override;
-  virtual QStringList findFiles(const QString &path, const QStringList &globFilters) const override;
-  virtual QStringList getFileOrigins(const QString &fileName) const;
-  virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const;
-
-  virtual MOBase::IDownloadManager *downloadManager() const;
-  virtual MOBase::IPluginList *pluginList() const;
-  virtual MOBase::IModList *modList() const;
-  virtual MOBase::IProfile *profile() const override;
-  virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "",
-    const QString &profile = "", const QString &forcedCustomOverwrite = "", bool ignoreCustomOverwrite = false);
-  virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const;
-  virtual void refreshModList(bool saveChanges);
-
-  virtual bool onAboutToRun(const std::function<bool(const QString&)> &func);
-  virtual bool onFinishedRun(const std::function<void (const QString&, unsigned int)> &func);
-  virtual bool onModInstalled(const std::function<void (const QString&)> &func);
-  virtual bool onUserInterfaceInitialized(std::function<void(QMainWindow*)> const& func);
-  virtual bool onProfileChanged(std::function<void(MOBase::IProfile*, MOBase::IProfile*)> const& func);
-  virtual bool onPluginSettingChanged(std::function<void(QString const&, const QString& key, const QVariant&, const QVariant&)> const& func);
-
-  virtual MOBase::IPluginGame const *managedGame() const;
-
-  virtual QStringList modsSortedByProfilePriority() const;
+  MOBase::IModRepositoryBridge *createNexusBridge() const override;
+  QString profileName() const override;
+  QString profilePath() const override;
+  QString downloadsPath() const override;
+  QString overwritePath() const override;
+  QString basePath() const override;
+  QString modsPath() const override;
+  MOBase::VersionInfo appVersion() const override;
+  MOBase::IPluginGame *getGame(const QString &gameName) const override;
+  MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name) override;
+  void modDataChanged(MOBase::IModInterface *mod) override;
+  QVariant pluginSetting(const QString &pluginName, const QString &key) const override;
+  void setPluginSetting(const QString &pluginName, const QString &key, const QVariant &value) override;
+  QVariant persistent(const QString &pluginName, const QString &key, const QVariant &def = QVariant()) const override;
+  void setPersistent(const QString &pluginName, const QString &key, const QVariant &value, bool sync = true) override;
+  QString pluginDataPath() const override;
+  MOBase::IModInterface *installMod(const QString &fileName, const QString &nameSuggestion = QString()) override;
+  QString resolvePath(const QString &fileName) const override;
+  QStringList listDirectories(const QString &directoryName) const override;
+  QStringList findFiles(const QString &path, const std::function<bool(const QString &)> &filter) const override;
+  QStringList findFiles(const QString &path, const QStringList &globFilters) const override;
+  QStringList getFileOrigins(const QString &fileName) const override;
+  QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const override;
+
+  MOBase::IDownloadManager *downloadManager() const override;
+  MOBase::IPluginList *pluginList() const override;
+  MOBase::IModList *modList() const override;
+  MOBase::IProfile *profile() const override;
+  HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "",
+    const QString &profile = "", const QString &forcedCustomOverwrite = "", bool ignoreCustomOverwrite = false) override;
+  bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const override;
+  void refresh(bool saveChanges = true) override;
+
+  bool onAboutToRun(const std::function<bool(const QString&)> &func) override;
+  bool onFinishedRun(const std::function<void (const QString&, unsigned int)> &func) override;
+  bool onUserInterfaceInitialized(std::function<void(QMainWindow*)> const& func) override;
+  bool onProfileCreated(std::function<void(MOBase::IProfile*)> const& func) override;
+  bool onProfileRenamed(std::function<void(MOBase::IProfile*, QString const&, QString const&)> const& func) override;
+  bool onProfileRemoved(std::function<void(QString const&)> const& func) override;
+  bool onProfileChanged(std::function<void(MOBase::IProfile*, MOBase::IProfile*)> const& func) override;
+  bool onPluginSettingChanged(std::function<void(QString const&, const QString& key, const QVariant&, const QVariant&)> const& func) override;
+
+  MOBase::IPluginGame const *managedGame() const override;
 
 private:
-  const QString &m_PluginName;
   std::unique_ptr<MOBase::IPluginList> m_plugins;
   std::unique_ptr<MOBase::IModList> m_mods;
 };
-- 
cgit v1.3.1