summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikaël Capelle <capelle.mikael@gmail.com>2021-01-21 21:02:10 +0100
committerMikaël Capelle <capelle.mikael@gmail.com>2021-01-21 21:02:10 +0100
commit569ce219594e5bf3246a97237d26db150c60e8fa (patch)
tree55c90b882e9d349588444e12df6e9c4a95ec6773
parent0a069709900fe37c265d8645554ae19e25bea06a (diff)
Remove unused mapping.
-rw-r--r--src/shared/filesorigin.cpp2
-rw-r--r--src/shared/filesorigin.h4
-rw-r--r--src/shared/originconnection.cpp14
-rw-r--r--src/shared/originconnection.h1
4 files changed, 2 insertions, 19 deletions
diff --git a/src/shared/filesorigin.cpp b/src/shared/filesorigin.cpp
index 7476b6c5..049e4258 100644
--- a/src/shared/filesorigin.cpp
+++ b/src/shared/filesorigin.cpp
@@ -33,8 +33,6 @@ FilesOrigin::FilesOrigin(
void FilesOrigin::setPriority(int priority)
{
- m_OriginConnection.lock()->changePriorityLookup(m_Priority, priority);
-
m_Priority = priority;
}
diff --git a/src/shared/filesorigin.h b/src/shared/filesorigin.h
index 222a834f..1aa4c645 100644
--- a/src/shared/filesorigin.h
+++ b/src/shared/filesorigin.h
@@ -22,8 +22,8 @@ public:
FilesOrigin(const FilesOrigin&) = delete;
FilesOrigin& operator=(const FilesOrigin&) = delete;
- // sets priority for this origin, but it will overwrite the existing mapping
- // for this priority, the previous origin will no longer be referenced
+ // sets priority for this origin (does not automatically refresh
+ // the structure)
void setPriority(int priority);
int getPriority() const
diff --git a/src/shared/originconnection.cpp b/src/shared/originconnection.cpp
index c1c096f0..2830e8e3 100644
--- a/src/shared/originconnection.cpp
+++ b/src/shared/originconnection.cpp
@@ -88,19 +88,6 @@ FilesOrigin& OriginConnection::getByName(const std::wstring &name)
}
}
-void OriginConnection::changePriorityLookup(int oldPriority, int newPriority)
-{
- std::scoped_lock lock(m_Mutex);
-
- auto iter = m_OriginsPriorityMap.find(oldPriority);
-
- if (iter != m_OriginsPriorityMap.end()) {
- OriginID idx = iter->second;
- m_OriginsPriorityMap.erase(iter);
- m_OriginsPriorityMap[newPriority] = idx;
- }
-}
-
void OriginConnection::changeNameLookup(const std::wstring &oldName, const std::wstring &newName)
{
std::scoped_lock lock(m_Mutex);
@@ -137,7 +124,6 @@ FilesOrigin& OriginConnection::createOriginNoLock(
.first;
m_OriginsNameMap.insert({originName, newID});
- m_OriginsPriorityMap.insert({priority, newID});
return itor->second;
}
diff --git a/src/shared/originconnection.h b/src/shared/originconnection.h
index 5fecd63a..ef8692bb 100644
--- a/src/shared/originconnection.h
+++ b/src/shared/originconnection.h
@@ -40,7 +40,6 @@ private:
std::atomic<OriginID> m_NextID;
std::map<OriginID, FilesOrigin> m_Origins;
std::map<std::wstring, OriginID> m_OriginsNameMap;
- std::map<int, OriginID> m_OriginsPriorityMap;
mutable std::mutex m_Mutex;
OriginID createID();