Rename QActionHandler to QAxisActionhandler

No need to have two classes for the handlers.

Change-Id: Ia174502f21b5392179774ce8e0d8f2cd228a7ea6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 28 insertions, 28 deletions

diff --git a/src/input/frontend/frontend.pri b/src/input/frontend/frontend.pri
index 8c9a249d6..ee06b732b 100644
--- a/src/input/frontend/frontend.pri
+++ b/src/input/frontend/frontend.pri
@@ -22,8 +22,8 @@ HEADERS += \
     $$PWD/qinputdeviceintegrationfactory_p.h \
     $$PWD/qaxissetting.h \
     $$PWD/qabstractphysicaldevice_p.h \
-    $$PWD/qactionhandler.h \
-    $$PWD/qactionhandler_p.h
+    $$PWD/qaxisactionhandler_p.h \
+    $$PWD/qaxisactionhandler.h
 
 SOURCES += \
     $$PWD/qinputaspect.cpp \
@@ -43,6 +43,6 @@ SOURCES += \
     $$PWD/qabstractphysicaldevice.cpp \
     $$PWD/qinputdeviceintegrationfactory.cpp \
     $$PWD/qaxissetting.cpp \
-    $$PWD/qactionhandler.cpp
+    $$PWD/qaxisactionhandler.cpp
 
 INCLUDEPATH += $$PWD
diff --git a/src/input/frontend/qactionhandler.cpp b/src/input/frontend/qaxisactionhandler.cpp
index a99d1eff3..8f493cf9e 100644
--- a/src/input/frontend/qactionhandler.cpp
+++ b/src/input/frontend/qaxisactionhandler.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qactionhandler.h"
-#include "qactionhandler_p.h"
+#include "qaxisactionhandler.h"
+#include "qaxisactionhandler_p.h"
 
 #include <Qt3DInput/qlogicaldevice.h>
 
@@ -43,37 +43,37 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-QActionHandlerPrivate::QActionHandlerPrivate()
+QAxisActionHandlerPrivate::QAxisActionHandlerPrivate()
     : Qt3DCore::QComponentPrivate()
     , m_logicalDevice(Q_NULLPTR)
 {
 }
 
-QActionHandler::QActionHandler(Qt3DCore::QNode *parent)
-    : Qt3DCore::QComponent(*new QActionHandlerPrivate, parent)
+QAxisActionHandler::QAxisActionHandler(Qt3DCore::QNode *parent)
+    : Qt3DCore::QComponent(*new QAxisActionHandlerPrivate, parent)
 {
 }
 
-QActionHandler::QActionHandler(QActionHandlerPrivate &dd, Qt3DCore::QNode *parent)
+QAxisActionHandler::QAxisActionHandler(QAxisActionHandlerPrivate &dd, Qt3DCore::QNode *parent)
     : Qt3DCore::QComponent(dd, parent)
 {
 
 }
 
-QActionHandler::~QActionHandler()
+QAxisActionHandler::~QAxisActionHandler()
 {
     QNode::cleanup();
 }
 
-Qt3DInput::QLogicalDevice *QActionHandler::logicalDevice() const
+Qt3DInput::QLogicalDevice *QAxisActionHandler::logicalDevice() const
 {
-    Q_D(const QActionHandler);
+    Q_D(const QAxisActionHandler);
     return d->m_logicalDevice;
 }
 
-void QActionHandler::setLogicalDevice(Qt3DInput::QLogicalDevice *logicalDevice)
+void QAxisActionHandler::setLogicalDevice(Qt3DInput::QLogicalDevice *logicalDevice)
 {
-    Q_D(QActionHandler);
+    Q_D(QAxisActionHandler);
     if (d->m_logicalDevice == logicalDevice)
         return;
 
@@ -81,10 +81,10 @@ void QActionHandler::setLogicalDevice(Qt3DInput::QLogicalDevice *logicalDevice)
     emit logicalDeviceChanged(logicalDevice);
 }
 
-void QActionHandler::copy(const QNode *ref)
+void QAxisActionHandler::copy(const QNode *ref)
 {
     QComponent::copy(ref);
-    const QActionHandler *component = static_cast<const QActionHandler *>(ref);
+    const QAxisActionHandler *component = static_cast<const QAxisActionHandler *>(ref);
     d_func()->m_logicalDevice = qobject_cast<QLogicalDevice *>(QNode::clone(component->d_func()->m_logicalDevice));
 }
 
diff --git a/src/input/frontend/qactionhandler.h b/src/input/frontend/qaxisactionhandler.h
index 6034b6eae..e77e088b2 100644
--- a/src/input/frontend/qactionhandler.h
+++ b/src/input/frontend/qaxisactionhandler.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DINPUT_QACTIONHANDLER_H
-#define QT3DINPUT_QACTIONHANDLER_H
+#ifndef QT3DINPUT_QAXISACTIONHANDLER_H
+#define QT3DINPUT_QAXISACTIONHANDLER_H
 
 #include <Qt3DInput/qt3dinput_global.h>
 #include <Qt3DCore/qcomponent.h>
@@ -44,17 +44,17 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DInput {
 
-class QActionHandlerPrivate;
+class QAxisActionHandlerPrivate;
 class QLogicalDevice;
 
-class QT3DINPUTSHARED_EXPORT QActionHandler : public Qt3DCore::QComponent
+class QT3DINPUTSHARED_EXPORT QAxisActionHandler : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QLogicalDevice* logicalDevice READ logicalDevice WRITE setLogicalDevice NOTIFY logicalDeviceChanged)
 
 public:
-    QActionHandler(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QActionHandler();
+    QAxisActionHandler(Qt3DCore::QNode *parent = Q_NULLPTR);
+    ~QAxisActionHandler();
 
     Qt3DInput::QLogicalDevice *logicalDevice() const;
 
@@ -68,16 +68,16 @@ Q_SIGNALS:
     void actionFinished(const QString &name);
 
 protected:
-    Q_DECLARE_PRIVATE(QActionHandler)
-    QActionHandler(QActionHandlerPrivate &dd, Qt3DCore::QNode *parent = 0);
+    Q_DECLARE_PRIVATE(QAxisActionHandler)
+    QAxisActionHandler(QAxisActionHandlerPrivate &dd, Qt3DCore::QNode *parent = 0);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
-    QT3D_CLONEABLE(QActionHandler)
+    QT3D_CLONEABLE(QAxisActionHandler)
 };
 
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
 
-#endif // QT3DINPUT_QACTIONHANDLER_H
+#endif // QT3DINPUT_QAXISACTIONHANDLER_H
diff --git a/src/input/frontend/qactionhandler_p.h b/src/input/frontend/qaxisactionhandler_p.h
index 27ac1177e..9b97a51df 100644
--- a/src/input/frontend/qactionhandler_p.h
+++ b/src/input/frontend/qaxisactionhandler_p.h
@@ -56,10 +56,10 @@ namespace Qt3DInput {
 
 class QLogicalDevice;
 
-class QActionHandlerPrivate : public Qt3DCore::QComponentPrivate
+class QAxisActionHandlerPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
-    QActionHandlerPrivate();
+    QAxisActionHandlerPrivate();
 
     QLogicalDevice *m_logicalDevice;
 };