From 7f4f4cafea5a196ddf824adf7c4e65cec5d44d88 Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Tue, 17 Nov 2015 18:58:00 +0100
Subject: first work on interfacing with usvfs

---
 src/shared/directoryentry.cpp | 4 ++--
 src/shared/directoryentry.h   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 54b6efff..e081c006 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -704,7 +704,7 @@ FilesOrigin &DirectoryEntry::getOriginByName(const std::wstring &name) const
   return m_OriginConnection->getByName(name);
 }
 
-
+/*
 int DirectoryEntry::getOrigin(const std::wstring &path, bool &archive)
 {
   const DirectoryEntry *directory = nullptr;
@@ -718,7 +718,7 @@ int DirectoryEntry::getOrigin(const std::wstring &path, bool &archive)
       return -1;
     }
   }
-}
+}*/
 
 std::vector<FileEntry::Ptr> DirectoryEntry::getFiles() const
 {
diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index 2d32450a..04b8782b 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -207,7 +207,8 @@ public:
   DirectoryEntry(const std::wstring &name, DirectoryEntry *parent, int originID);
 
   DirectoryEntry(const std::wstring &name, DirectoryEntry *parent, int originID,
-                 boost::shared_ptr<FileRegister> fileRegister, boost::shared_ptr<OriginConnection> originConnection);
+                 boost::shared_ptr<FileRegister> fileRegister,
+                 boost::shared_ptr<OriginConnection> originConnection);
 
   ~DirectoryEntry();
 
@@ -232,7 +233,9 @@ public:
   FilesOrigin &getOriginByID(int ID) const;
   FilesOrigin &getOriginByName(const std::wstring &name) const;
 
-  int getOrigin(const std::wstring &path, bool &archive);
+  int anyOrigin() const;
+
+  //int getOrigin(const std::wstring &path, bool &archive);
 
   std::vector<FileEntry::Ptr> getFiles() const;
 
@@ -316,8 +319,6 @@ private:
 
   DirectoryEntry *getSubDirectoryRecursive(const std::wstring &path, bool create, int originID = -1);
 
-  int anyOrigin() const;
-
   void removeDirRecursive();
 
 private:
-- 
cgit v1.3.1