Let paragraph::requestSpellcheck() consider contained insets

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

diff --git a/src/support/FileMonitor.cpp b/src/support/FileMonitor.cpp
index a3b17ad012f3f9a86e6505790ee16a400532b446..0af322d9eeabe2b4144fa568894a687c7e2b8a86 100644 (file)
--- a/src/support/FileMonitor.cpp
+++ b/src/support/FileMonitor.cpp
@@ -59,7 +59,7 @@ FileSystemWatcher::getGuard(FileName const & filename)
 //static
 FileMonitorPtr FileSystemWatcher::monitor(FileName const & filename)
 {
-       return make_unique<FileMonitor>(instance().getGuard(filename));
+       return lyx::make_unique<FileMonitor>(instance().getGuard(filename));
 }
 
 
@@ -67,7 +67,7 @@ FileMonitorPtr FileSystemWatcher::monitor(FileName const & filename)
 ActiveFileMonitorPtr FileSystemWatcher::activeMonitor(FileName const & filename,
                                                       int interval)
 {
-       return make_unique<ActiveFileMonitor>(instance().getGuard(filename),
+       return lyx::make_unique<ActiveFileMonitor>(instance().getGuard(filename),
                                              filename, interval);
 }
 
@@ -188,7 +188,7 @@ void FileMonitor::connectToFileMonitorGuard()
 }
 
 
-signals2::connection FileMonitor::connect(slot const & slot)
+connection FileMonitor::connect(slot const & slot)
 {
        return fileChanged_.connect(slot);
 }