diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2009-10-01 12:08:11 (GMT) |
|---|---|---|
| committer | Jeremy Katz <jeremy.katz@nokia.com> | 2009-10-01 12:12:28 (GMT) |
| commit | 072e748adbdab1d51b240b9983ce82b213b66f18 (patch) | |
| tree | 67d170ab4e0bba06adc3479ea6af3214e24636e4 /tools/qvfb/qvfbprotocol.cpp | |
| parent | 938ba08e7bf90063127b298da25a124441659e89 (diff) | |
| download | Qt-072e748adbdab1d51b240b9983ce82b213b66f18.zip Qt-072e748adbdab1d51b240b9983ce82b213b66f18.tar.gz Qt-072e748adbdab1d51b240b9983ce82b213b66f18.tar.bz2 | |
Enable qws/qvfb use for multiple users on one machine
Task-number: QTBUG-1711
Reviewed-by: Paul
Diffstat (limited to 'tools/qvfb/qvfbprotocol.cpp')
| -rw-r--r-- | tools/qvfb/qvfbprotocol.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qvfb/qvfbprotocol.cpp b/tools/qvfb/qvfbprotocol.cpp index b09ed0e..df6c110 100644 --- a/tools/qvfb/qvfbprotocol.cpp +++ b/tools/qvfb/qvfbprotocol.cpp @@ -56,6 +56,8 @@ #include <unistd.h> #endif +#include "qvfbshmem.h" + QT_BEGIN_NAMESPACE QVFbViewProtocol::QVFbViewProtocol(int display_id, QObject *parent) : @@ -90,7 +92,7 @@ static int openPipe(const char *fileName) QVFbKeyPipeProtocol::QVFbKeyPipeProtocol(int display_id) : QVFbKeyProtocol(display_id) { - fileName = QString(QT_VFB_KEYBOARD_PIPE).arg(display_id); + fileName = QT_VFB_KEYBOARD_PIPE(display_id); fd = openPipe(fileName.toLocal8Bit().constData()); if (fd == -1) @@ -119,7 +121,7 @@ void QVFbKeyPipeProtocol::sendKeyboardData(QString unicode, int keycode, QVFbMousePipe::QVFbMousePipe(int display_id) : QVFbMouseProtocol(display_id) { - fileName = QString(QT_VFB_MOUSE_PIPE).arg(display_id); + fileName = QT_VFB_MOUSE_PIPE(display_id); fd = openPipe(fileName.toLocal8Bit().constData()); if (fd == -1) |