From 777d822f13fcd15fc5f5ac0bb45589460a1e16f1 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sat, 15 Feb 2020 13:44:34 -0500 Subject: cleanup, typedefs --- src/shared/filesorigin.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/shared/filesorigin.h') diff --git a/src/shared/filesorigin.h b/src/shared/filesorigin.h index 4ea21f57..222a834f 100644 --- a/src/shared/filesorigin.h +++ b/src/shared/filesorigin.h @@ -11,18 +11,16 @@ class FilesOrigin { public: FilesOrigin(); -// FilesOrigin(const FilesOrigin &reference); FilesOrigin( - int ID, const std::wstring &name, const std::wstring &path, int priority, + OriginID ID, const std::wstring &name, const std::wstring &path, + int priority, boost::shared_ptr fileRegister, boost::shared_ptr originConnection); // noncopyable FilesOrigin(const FilesOrigin&) = delete; FilesOrigin& operator=(const FilesOrigin&) = delete; - FilesOrigin(FilesOrigin&&) = default; - FilesOrigin& operator=(FilesOrigin&&) = default; // sets priority for this origin, but it will overwrite the existing mapping // for this priority, the previous origin will no longer be referenced @@ -39,7 +37,7 @@ public: return m_Name; } - int getID() const + OriginID getID() const { return m_ID; } @@ -71,7 +69,7 @@ public: bool containsArchive(std::wstring archiveName); private: - int m_ID; + OriginID m_ID; bool m_Disabled; std::set m_Files; std::wstring m_Name; -- cgit v1.3.1