Use nullptr instead of 0 for pointers

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

diff --git a/source/fs/filemonitor.cpp b/source/fs/filemonitor.cpp
index 5cc990d2d52d6df1b6f3237db6c68b92c1879e20..5ab3f49197a0169c18b0df5a786be1064df8f94f 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"
 
@@ -7,8 +8,7 @@ namespace Msp {
 namespace FS {
 
 FileMonitor::FileMonitor():
-       priv(new Private(*this)),
-       event_disp(0)
+       priv(new Private(*this))
 { }
 
 FileMonitor::~FileMonitor()
@@ -19,7 +19,7 @@ FileMonitor::~FileMonitor()
 void FileMonitor::use_event_dispatcher(IO::EventDispatcher &ed)
 {
        if(event_disp)
-               throw logic_error("event_disp!=0");
+               throw logic_error("event_disp!=nullptr");
 
        event_disp = &ed;
        platform_use_event_dispatcher();
@@ -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