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

tslib: initialize members in declaration

Browse Source 
Change-Id: I887d0c82a4819712ea3d908df745516186aa76f0
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Rolf Eike Beer 2019-03-25 12:47:14 +01:00
parent 79f17db879
commit a2fda801cc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platformsupport/input/tslib/qtslib.cpp
View File

@ -57,7 +57,7 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
const QString &specification, const QString &specification,
QObject *parent) QObject *parent)
: QObject(parent), : QObject(parent),
m_notify(0), m_x(0), m_y(0), m_pressed(0), m_rawMode(false) m_rawMode(!key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive))
{ {
qCDebug(qLcTsLib) << "Initializing tslib plugin" << key << specification; qCDebug(qLcTsLib) << "Initializing tslib plugin" << key << specification;
setObjectName(QLatin1String("TSLib Mouse Handler")); setObjectName(QLatin1String("TSLib Mouse Handler"));
@ -79,8 +79,6 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
if (ts_config(m_dev)) if (ts_config(m_dev))
qErrnoWarning(errno, "ts_config() failed"); qErrnoWarning(errno, "ts_config() failed");
m_rawMode = !key.compare(QLatin1String("TslibRaw"), Qt::CaseInsensitive);
int fd = ts_fd(m_dev); int fd = ts_fd(m_dev);
if (fd >= 0) { if (fd >= 0) {
qCDebug(qLcTsLib) << "tslib device is" << device; qCDebug(qLcTsLib) << "tslib device is" << device;

9
src/platformsupport/input/tslib/qtslib_p.h
View File

@ -71,11 +71,12 @@ private slots:
void readMouseData(); void readMouseData();
private: private:
QSocketNotifier * m_notify; QSocketNotifier * m_notify = nullptr;
tsdev *m_dev; tsdev *m_dev;
int m_x, m_y; int m_x = 0;
bool m_pressed; int m_y = 0;
bool m_rawMode; bool m_pressed = false;
const bool m_rawMode;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE