X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTimeout.C;h=4005c83884b8f6b0cc5ed4957818a4001b5ce167;hb=35cf7dcb2bdfdcda465b69c58465f657c77fd9d7;hp=fc0a8c50454fd57194fb57b62e63352ef6c9d7aa;hpb=a0911c75d0ab937fe16ed6bef21c2b4fd744f4ec;p=lyx.git

diff --git a/src/Timeout.C b/src/Timeout.C
index fc0a8c5045..4005c83884 100644
--- a/src/Timeout.C
+++ b/src/Timeout.C
@@ -12,19 +12,19 @@ extern "C" {
 	void C_intern_timeout_cb(int, void * data) 
 	{
 		Timeout * to = static_cast<Timeout*>(data);
-		to->callback();
+		to->emit();
 	}
 }
 
 
 Timeout::Timeout()
-	: type(ONETIME), timeout(0), timeout_id(-1),
-	 callback_(0), data_(0) {}
+	: type(ONETIME), timeout_ms(0), timeout_id(-1)
+{}
 
 
 Timeout::Timeout(int msec, Type t)
-	: type(t), timeout(msec), timeout_id(-1),
-	  callback_(0), data_(0) {}
+	: type(t), timeout_ms(msec), timeout_id(-1)
+{}
 
 
 Timeout::~Timeout() 
@@ -44,7 +44,7 @@ void Timeout::start()
 {
 	if (timeout_id != -1)
 		lyxerr << "Timeout::start: already running!" << endl;
-	timeout_id = fl_add_timeout(timeout,
+	timeout_id = fl_add_timeout(timeout_ms,
 				    C_intern_timeout_cb, this);
 }
 	
@@ -58,18 +58,10 @@ void Timeout::stop()
 }
 
 
-void Timeout::callback(TimeoutCallback cb, void * data)
-{
-	callback_ = cb;
-	data_ = data;
-}
-
-
-void Timeout::callback()
+void Timeout::emit()
 {
 	timeout_id = -1;
-	if (callback_)
-		callback_(data_);
+	timeout.emit();
 	if (type == CONTINOUS)
 		start();
 }
@@ -83,5 +75,5 @@ void Timeout::setType(Type t)
 
 void Timeout::setTimeout(int msec)
 {
-	timeout = msec;
+	timeout_ms = msec;
 }