Use C++11 features with containers

[libs/core.git] / source / fs / filemonitor.cpp

diff --git a/source/fs/filemonitor.cpp b/source/fs/filemonitor.cpp
index 5cc990d2d52d6df1b6f3237db6c68b92c1879e20..5ff5b7818b59f5d6c16b4d5da042eb0ec3e197cc 100644 (file)
--- a/source/fs/filemonitor.cpp
+++ b/source/fs/filemonitor.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "filemonitor.h"
 #include "filemonitor_platform.h"
 
@@ -36,15 +37,14 @@ void FileMonitor::add_file(const FS::Path &path)
 
 void FileMonitor::remove_file(const FS::Path &path)
 {
-       for(vector<MonitoredFile>::iterator i=files.begin(); i!=files.end(); ++i)
-               if(i->path==path)
-               {
-                       cleanup_file(*i);
-                       if(&*i!=&files.back())
-                               *i = files.back();
-                       files.pop_back();
-                       break;
-               }
+       auto i = find_member(files, path, &MonitoredFile::path);
+       if(i!=files.end())
+       {
+               cleanup_file(*i);
+               if(&*i!=&files.back())
+                       *i = files.back();
+               files.pop_back();
+       }
 }
 
 } // namespace FS