1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup TSLib plugin

Browse Source 
This patch cleans up the coding style and includes

Change-Id: I710d4a60795e9975d4f8ee79599018e05d85debe
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Samuel Gaist 2014-02-10 11:00:00 +01:00 committed by The Qt Project
parent 2a68cffa84
commit be51772d02
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/generic/tslib/qtslib.cpp
View File

@ -48,8 +48,6 @@
#include <QPoint> #include <QPoint>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <Qt>
#include <errno.h> #include <errno.h>
#include <tslib.h> #include <tslib.h>
@ -65,21 +63,21 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
setObjectName(QLatin1String("TSLib Mouse Handler")); setObjectName(QLatin1String("TSLib Mouse Handler"));
QByteArray device = qgetenv("TSLIB_TSDEVICE"); QByteArray device = qgetenv("TSLIB_TSDEVICE");
if (device.isEmpty())
device = QByteArrayLiteral("/dev/input/event1");
if (specification.startsWith("/dev/")) if (specification.startsWith("/dev/"))
device = specification.toLocal8Bit(); device = specification.toLocal8Bit();
if (device.isEmpty())
device = QByteArrayLiteral("/dev/input/event1");
m_dev = ts_open(device.constData(), 1); m_dev = ts_open(device.constData(), 1);
if (!m_dev) { if (!m_dev) {
qErrnoWarning(errno, "ts_open() failed"); qErrnoWarning(errno, "ts_open() failed");
return; return;
} }
if (ts_config(m_dev)) { if (ts_config(m_dev))
perror("Error configuring\n"); perror("Error configuring\n");
}
m_rawMode = !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive); m_rawMode = !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive);
@ -89,7 +87,6 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData())); connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData()));
} else { } else {
qWarning("Cannot open mouse input device '%s': %s", device.constData(), strerror(errno)); qWarning("Cannot open mouse input device '%s': %s", device.constData(), strerror(errno));
return;
} }
} }
@ -103,12 +100,10 @@ QTsLibMouseHandler::~QTsLibMouseHandler()
static bool get_sample(struct tsdev *dev, struct ts_sample *sample, bool rawMode) static bool get_sample(struct tsdev *dev, struct ts_sample *sample, bool rawMode)
{ {
if (rawMode) { if (rawMode)
return (ts_read_raw(dev, sample, 1) == 1); return (ts_read_raw(dev, sample, 1) == 1);
} else { else
int ret = ts_read(dev, sample, 1); return (ts_read(dev, sample, 1) == 1);
return ( ret == 1);
}
} }