anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove_io_callback for Qt

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4813 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-07-31 04:33:03 +00:00
parent 18d401aab8
commit 1faca4e07e
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,9 @@
2002-07-31 John Levon <levon@movementarian.org>
* io_callback.h: make a more proper class
* lyx_gui.C: implement removal of I/O callbacks
2002-07-30 John Levon <levon@movementarian.org>
* qlkey.h:

11
src/frontends/qt2/io_callback.h
View File

@ -13,9 +13,12 @@
#include <config.h>
#include "lyxserver.h"
#include "debug.h"
#include <qsocketnotifier.h>
#include <boost/scoped_ptr.hpp>
/**
* io_callback - a simple wrapper for asynchronous pipe notification
*
@ -30,9 +33,8 @@ public:
/// connect a read ready notification for fd to the LyXComm
io_callback(int fd, LyXComm * comm)
: comm_(comm) {
QSocketNotifier * sn = new QSocketNotifier(fd,
QSocketNotifier::Read, this);
connect(sn, SIGNAL(activated(int)), this, SLOT(data_received()));
sn_.reset(new QSocketNotifier(fd, QSocketNotifier::Read, this));
connect(sn_.get(), SIGNAL(activated(int)), this, SLOT(data_received()));
}
public slots:
@ -41,6 +43,9 @@ public slots:
}
private:
/// our notifier
boost::scoped_ptr<QSocketNotifier> sn_;
LyXComm * comm_;
};

20
src/frontends/qt2/lyx_gui.C
View File

@ -47,7 +47,7 @@ using std::exit;
#endif
using std::vector;
using std::hex;
using std::map;
using std::endl;
extern BufferList bufferlist;
@ -148,8 +148,22 @@ bool lyx_gui::font_available(LyXFont const & font)
}
namespace {
map<int, io_callback *> io_callbacks;
}
void lyx_gui::set_read_callback(int fd, LyXComm * comm)
{
// FIXME: "leak"
new io_callback(fd, comm);
io_callbacks[fd] = new io_callback(fd, comm);
}
void lyx_gui::remove_read_callback(int fd)
{
map<int, io_callback *>::iterator it = io_callbacks.find(fd);
if (it != io_callbacks.end()) {
delete it->second;
io_callbacks.erase(it);
}
}