From 56cfd5d83f4108c8f470d8776d323321592e8255 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 30 May 2012 22:20:04 -0700 Subject: [PATCH] Add QObject parent parameter to constructors Also drop the explicit keyword in constructors with multiple args since it has no effect on multi-arg constructors. Change-Id: I48af6ede6cc968c52720c6107cadf3aa4dbfc7f7 Reviewed-by: Laszlo Agocs --- src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp | 3 ++- src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h | 2 +- src/plugins/generic/evdevmouse/qevdevmousemanager.cpp | 4 ++-- src/plugins/generic/evdevmouse/qevdevmousemanager.h | 2 +- src/plugins/generic/evdevtouch/qevdevtouch.cpp | 4 ++-- src/plugins/generic/evdevtouch/qevdevtouch.h | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp index 8a1adfd..43d20e5 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.cpp @@ -52,7 +52,8 @@ QT_BEGIN_NAMESPACE -QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &specification) +QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &specification, QObject *parent) + : QObject(parent) { Q_UNUSED(key); diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h index e768142..3cd576d 100644 --- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h +++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h @@ -58,7 +58,7 @@ class QEvdevKeyboardManager : public QObject { Q_OBJECT public: - explicit QEvdevKeyboardManager(const QString &key, const QString &specification); + QEvdevKeyboardManager(const QString &key, const QString &specification, QObject *parent = 0); ~QEvdevKeyboardManager(); private slots: diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp b/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp index 459164b..132161c 100644 --- a/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp +++ b/src/plugins/generic/evdevmouse/qevdevmousemanager.cpp @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE -QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specification) - : m_x(0), m_y(0), m_xoffset(0), m_yoffset(0) +QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent) + : QObject(parent), m_x(0), m_y(0), m_xoffset(0), m_yoffset(0) { Q_UNUSED(key); diff --git a/src/plugins/generic/evdevmouse/qevdevmousemanager.h b/src/plugins/generic/evdevmouse/qevdevmousemanager.h index b903479..ee528de 100644 --- a/src/plugins/generic/evdevmouse/qevdevmousemanager.h +++ b/src/plugins/generic/evdevmouse/qevdevmousemanager.h @@ -58,7 +58,7 @@ class QEvdevMouseManager : public QObject { Q_OBJECT public: - explicit QEvdevMouseManager(const QString &key, const QString &specification); + QEvdevMouseManager(const QString &key, const QString &specification, QObject *parent = 0); ~QEvdevMouseManager(); public slots: diff --git a/src/plugins/generic/evdevtouch/qevdevtouch.cpp b/src/plugins/generic/evdevtouch/qevdevtouch.cpp index c372b0d..aa43b6a 100644 --- a/src/plugins/generic/evdevtouch/qevdevtouch.cpp +++ b/src/plugins/generic/evdevtouch/qevdevtouch.cpp @@ -138,8 +138,8 @@ static inline bool testBit(long bit, const long *array) return (array[bit / LONG_BITS] >> bit % LONG_BITS) & 1; } -QTouchScreenHandler::QTouchScreenHandler(const QString &spec) - : m_notify(0), m_fd(-1), d(0) +QTouchScreenHandler::QTouchScreenHandler(const QString &spec, QObject *parent) + : QObject(parent), m_notify(0), m_fd(-1), d(0) #ifdef USE_MTDEV , m_mtdev(0) #endif diff --git a/src/plugins/generic/evdevtouch/qevdevtouch.h b/src/plugins/generic/evdevtouch/qevdevtouch.h index 28a3b21..40ed9b2 100644 --- a/src/plugins/generic/evdevtouch/qevdevtouch.h +++ b/src/plugins/generic/evdevtouch/qevdevtouch.h @@ -63,7 +63,7 @@ class QTouchScreenHandler : public QObject Q_OBJECT public: - QTouchScreenHandler(const QString &spec = QString()); + QTouchScreenHandler(const QString &spec = QString(), QObject *parent = 0); ~QTouchScreenHandler(); private slots: -- 2.7.4