Fixing overwrite problems

Changes the organizerproxy to pull from the settings rather than try and
figure it out on its own.

4 files changed, 21 insertions, 2 deletions

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 55d3f494..d9ed6ab6 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -703,6 +703,16 @@ QString OrganizerCore::downloadsPath() const
   return QDir::fromNativeSeparators(m_Settings.getDownloadDirectory());

 }

 

+QString OrganizerCore::overwritePath() const

+{

+  return QDir::fromNativeSeparators(m_Settings.getOverwriteDirectory());

+}

+

+QString OrganizerCore::basePath() const

+{

+  return QDir::fromNativeSeparators(m_Settings.getBaseDirectory());

+}

+

 MOBase::VersionInfo OrganizerCore::appVersion() const

 {

   return m_Updater.getVersion();

diff --git a/src/organizercore.h b/src/organizercore.h
index e994d9b1..297b94f6 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -165,6 +165,8 @@ public:
   QString profileName() const;

   QString profilePath() const;

   QString downloadsPath() const;

+  QString overwritePath() const;

+  QString basePath() const;

   MOBase::VersionInfo appVersion() const;

   MOBase::IModInterface *getMod(const QString &name) const;

   MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index b6dbd242..cf2e29e3 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -37,9 +37,15 @@ QString OrganizerProxy::downloadsPath() const
 

 QString OrganizerProxy::overwritePath() const

 {

-  return QDir::fromNativeSeparators(qApp->property("dataPath").toString())

+  /*return QDir::fromNativeSeparators(qApp->property("dataPath").toString())

          + "/"

-         + ToQString(AppConfig::overwritePath());

+	 + ToQString(AppConfig::overwritePath());*/

+  return m_Proxied->overwritePath();

+}

+

+QString OrganizerProxy::basePath() const

+{

+  return m_Proxied->basePath();

 }

 

 VersionInfo OrganizerProxy::appVersion() const

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index 7d925482..7004db14 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -18,6 +18,7 @@ public:
   virtual QString profilePath() const;

   virtual QString downloadsPath() const;

   virtual QString overwritePath() const;

+  virtual QString basePath() const;

   virtual MOBase::VersionInfo appVersion() const;

   virtual MOBase::IModInterface *getMod(const QString &name) const;

   virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);