X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffs%2Ffilemonitor.cpp;h=a1b713b4c0cc1359ad0700efc523718bc745dc2b;hb=99b9121e2158603372c7313400283b622e6754d8;hp=5cc990d2d52d6df1b6f3237db6c68b92c1879e20;hpb=ffab0509a65f6f32851e64d66a5f7eeb453ab29f;p=libs%2Fcore.git

diff --git a/source/fs/filemonitor.cpp b/source/fs/filemonitor.cpp
index 5cc990d..a1b713b 100644
--- 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"
 
@@ -7,8 +8,7 @@ namespace Msp {
 namespace FS {
 
 FileMonitor::FileMonitor():
-	priv(new Private(*this)),
-	event_disp(0)
+	priv(new Private(*this))
 { }
 
 FileMonitor::~FileMonitor()
@@ -29,22 +29,20 @@ void FileMonitor::add_file(const FS::Path &path)
 {
 	MonitoredFile file;
 	file.path = path;
-	file.modified = false;
 	prepare_file(file);
 	files.push_back(file);
 }
 
 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