RefChanger

[lyx.git] / src / support / FileMonitor.cpp

diff --git a/src/support/FileMonitor.cpp b/src/support/FileMonitor.cpp
index df887235096710140edbb42497fd4b5077907eb3..bdd6444ff677e6aa0f0f2759e7240e3d94e692d3 100644 (file)
--- a/src/support/FileMonitor.cpp
+++ b/src/support/FileMonitor.cpp
@@ -13,19 +13,17 @@
 #include "support/FileMonitor.h"
 
 #include "support/FileName.h"
-#include "support/lyxlib.h"
 #include "support/Timeout.h"
 
-#include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
+#include "support/bind.h"
+#include <boost/signals2/trackable.hpp>
 
-
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace support {
 
-class FileMonitor::Impl : public boost::signals::trackable {
+class FileMonitor::Impl : public boost::signals2::trackable {
 public:
 
        ///
@@ -58,7 +56,9 @@ FileMonitor::FileMonitor(FileName const & file_with_path, int interval)
 
 
 FileMonitor::~FileMonitor()
-{}
+{
+       delete pimpl_;
+}
 
 
 void FileMonitor::reset(FileName const & file_with_path) const
@@ -92,7 +92,7 @@ void FileMonitor::start() const
                return;
 
        pimpl_->timestamp_ = pimpl_->filename_.lastModified();
-       pimpl_->checksum_ = sum(pimpl_->filename_);
+       pimpl_->checksum_ = pimpl_->filename_.checksum();
 
        if (pimpl_->timestamp_ && pimpl_->checksum_) {
                pimpl_->timer_.start();
@@ -122,13 +122,13 @@ unsigned long FileMonitor::checksum() const
        // If we aren't actively monitoring the file, then recompute the
        // checksum explicitly.
        if (!pimpl_->timer_.running() && !pimpl_->filename_.empty())
-               return sum(pimpl_->filename_);
+               return pimpl_->filename_.checksum();
 
        return pimpl_->checksum_;
 }
 
 
-boost::signals::connection FileMonitor::connect(slot_type const & slot) const
+boost::signals2::connection FileMonitor::connect(slot_type const & slot) const
 {
        return pimpl_->fileChanged_.connect(slot);
 }
@@ -145,7 +145,7 @@ FileMonitor::Impl::Impl(FileName const & file_with_path, int interval)
          timestamp_(0),
          checksum_(0)
 {
-       timer_.timeout.connect(boost::bind(&Impl::monitorFile, this));
+       timer_.timeout.connect(bind(&Impl::monitorFile, this));
 }
 
 
@@ -164,7 +164,7 @@ void FileMonitor::Impl::monitorFile()
                if (new_timestamp != timestamp_) {
                        timestamp_ = new_timestamp;
 
-                       unsigned long const new_checksum = sum(filename_);
+                       unsigned long const new_checksum = filename_.checksum();
                        if (new_checksum != checksum_) {
                                checksum_ = new_checksum;
                                changed = true;