Merge pull request #252 from LePresidente/new_vfs_library

Update master to latest stable code.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index 2d32450a..8dbedaf4 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -72,7 +72,7 @@ public:
 

   // gets the list of alternative origins (origins with lower priority than the primary one).

   // if sortOrigins has been called, it is sorted by priority (ascending)

-  const std::vector<int> &getAlternatives() const { return m_Alternatives; }

+  const std::vector<std::pair<int, std::wstring>> &getAlternatives() const { return m_Alternatives; }

 

   const std::wstring &getName() const { return m_Name; }

   int getOrigin() const { return m_Origin; }

@@ -96,9 +96,9 @@ private:
 

   Index m_Index;

   std::wstring m_Name;

-  int m_Origin;

+  int m_Origin = -1;

   std::wstring m_Archive;

-  std::vector<int> m_Alternatives;

+  std::vector<std::pair<int, std::wstring>> m_Alternatives;

   DirectoryEntry *m_Parent;

   mutable FILETIME m_FileTime;

 

@@ -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: