timeout.h: move from D-Bus server to syncevo

The helper class is also useful outside of the D-Bus server,
for example in the glib-based SoupTransportAgent.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

8 files changed, 7 insertions, 6 deletions

diff --git a/src/dbus/server/auto-sync-manager.h b/src/dbus/server/auto-sync-manager.h
index 37db2016..5df72e84 100644
--- a/src/dbus/server/auto-sync-manager.h
+++ b/src/dbus/server/auto-sync-manager.h
@@ -29,9 +29,9 @@
 #include <syncevo/SyncContext.h>
 #include <syncevo/SmartPtr.h>
 #include <syncevo/util.h>
+#include <syncevo/timeout.h>
 
 #include "notification-manager-factory.h"
-#include "timeout.h"
 
 SE_BEGIN_CXX
 
diff --git a/src/dbus/server/info-req.h b/src/dbus/server/info-req.h
index b2e6a1fc..a5d4ce67 100644
--- a/src/dbus/server/info-req.h
+++ b/src/dbus/server/info-req.h
@@ -20,10 +20,11 @@
 #ifndef INFO_REQ_H
 #define INFO_REQ_H
 
+#include <syncevo/timeout.h>
+
 #include <string>
 
 #include "gdbus-cxx-bridge.h"
-#include "timeout.h"
 
 #include <boost/signals2.hpp>
 
diff --git a/src/dbus/server/server.am b/src/dbus/server/server.am
index 18c631fe..aab2d806 100644
--- a/src/dbus/server/server.am
+++ b/src/dbus/server/server.am
@@ -46,7 +46,6 @@ src_dbus_server_server_h_files = \
   src/dbus/server/session-common.h \
   src/dbus/server/source-progress.h \
   src/dbus/server/source-status.h \
-  src/dbus/server/timeout.h \
   src/dbus/server/timer.h
 
 src_dbus_server_libsyncevodbusserver_la_SOURCES = \
diff --git a/src/dbus/server/server.cpp b/src/dbus/server/server.cpp
index 8bcc6b4e..543cd7f1 100644
--- a/src/dbus/server/server.cpp
+++ b/src/dbus/server/server.cpp
@@ -23,13 +23,13 @@
 #include <boost/bind.hpp>
 
 #include <syncevo/GLibSupport.h>
+#include <syncevo/timeout.h>
 
 #include "server.h"
 #include "info-req.h"
 #include "connection.h"
 #include "bluez-manager.h"
 #include "session.h"
-#include "timeout.h"
 #include "restart.h"
 #include "client.h"
 #include "auto-sync-manager.h"
diff --git a/src/dbus/server/server.h b/src/dbus/server/server.h
index 0b225912..8bda3e9b 100644
--- a/src/dbus/server/server.h
+++ b/src/dbus/server/server.h
@@ -27,10 +27,10 @@
 #include <boost/signals2.hpp>
 
 #include <syncevo/SyncConfig.h>
+#include <syncevo/timeout.h>
 
 #include "exceptions.h"
 #include "auto-term.h"
-#include "timeout.h"
 #include "dbus-callbacks.h"
 #include "read-operations.h"
 
diff --git a/src/dbus/server/session.h b/src/dbus/server/session.h
index f3bb2ce9..f9dae3d4 100644
--- a/src/dbus/server/session.h
+++ b/src/dbus/server/session.h
@@ -27,6 +27,7 @@
 #include <gdbus-cxx-bridge.h>
 
 #include <syncevo/SuspendFlags.h>
+#include <syncevo/timeout.h>
 
 #include "session-common.h"
 #include "read-operations.h"
@@ -34,7 +35,6 @@
 #include "source-progress.h"
 #include "source-status.h"
 #include "timer.h"
-#include "timeout.h"
 #include "resource.h"
 #include "dbus-callbacks.h"
 
diff --git a/src/syncevo/syncevo.am b/src/syncevo/syncevo.am
index 7720dc64..099d5ea5 100644
--- a/src/syncevo/syncevo.am
+++ b/src/syncevo/syncevo.am
@@ -210,6 +210,7 @@ src_syncevo_libsyncevolution_include_HEADERS = \
   src/syncevo/IdentityProvider.h \
   src/syncevo/GuardFD.h \
   src/syncevo/util.h \
+  src/syncevo/timeout.h \
   src/syncevo/BoostHelper.h \
   src/syncevo/SuspendFlags.h \
   src/syncevo/SyncContext.h \
diff --git a/src/dbus/server/timeout.h b/src/syncevo/timeout.h
index 0cb10f84..0cb10f84 100644
--- a/src/dbus/server/timeout.h
+++ b/src/syncevo/timeout.h