From bd8267993d1ed0292200f3052e3c30d4fc9c84f7 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sun, 4 Jan 2015 10:13:12 +0100
Subject: - fixes after merge

---
 src/organizerproxy.cpp | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'src/organizerproxy.cpp')

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 367ae001..2ce5b3ee 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -100,11 +100,6 @@ HANDLE OrganizerProxy::startApplication(const QString &executable, const QString
   return m_Proxied->startApplication(executable, args, cwd, profile);
 }
 
-bool OrganizerProxy::waitForApplication(HANDLE handle, LPDWORD exitCode) const
-{
-  return m_Proxied->waitForProcessOrJob(handle, exitCode);
-}
-
 bool OrganizerProxy::waitForApplication(HANDLE handle, LPDWORD exitCode) const
 {
   return m_Proxied->waitForApplication(handle, exitCode);
@@ -125,16 +120,14 @@ bool OrganizerProxy::onModInstalled(const std::function<void (const QString &)>
   return m_Proxied->onModInstalled(func);
 }
 
-
 void OrganizerProxy::refreshModList(bool saveChanges)
 {
   m_Proxied->refreshModList(saveChanges);
 }
 
-
 IModInterface *OrganizerProxy::installMod(const QString &fileName)
 {
-  return m_Proxied->installMod(fileName);
+  return m_Proxied->installMod(fileName, QString());
 }
 
 QString OrganizerProxy::resolvePath(const QString &fileName) const
@@ -157,22 +150,6 @@ QStringList OrganizerProxy::getFileOrigins(const QString &fileName) const
   return m_Proxied->getFileOrigins(fileName);
 }
 
-QStringList OrganizerProxy::getFileOrigins(const QString &fileName) const
-{
-  QStringList result;
-  const FileEntry::Ptr file = m_Proxied->m_DirectoryStructure->searchFile(ToWString(QFileInfo(fileName).fileName()), NULL);
-
-  if (file.get() != NULL) {
-    result.append(ToQString(m_Proxied->m_DirectoryStructure->getOriginByID(file->getOrigin()).getName()));
-    foreach (int i, file->getAlternatives()) {
-      result.append(ToQString(m_Proxied->m_DirectoryStructure->getOriginByID(i).getName()));
-    }
-  } else {
-    qDebug("%s not found", qPrintable(fileName));
-  }
-  return result;
-}
-
 QList<MOBase::IOrganizer::FileInfo> OrganizerProxy::findFileInfos(const QString &path, const std::function<bool (const MOBase::IOrganizer::FileInfo &)> &filter) const
 {
   return m_Proxied->findFileInfos(path, filter);
-- 
cgit v1.3.1