aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugin/cursornavigation.cpp21
-rw-r--r--plugin/cursornavigation.h4
-rw-r--r--plugin/cursornavigationalgorithm.h3
-rw-r--r--plugin/cursornavigationattached.cpp12
-rw-r--r--plugin/plugin.pro2
-rw-r--r--plugin/spatialnavigation360.cpp4
-rw-r--r--plugin/spatialnavigation4dir.cpp4
7 files changed, 29 insertions, 21 deletions
diff --git a/plugin/cursornavigation.cpp b/plugin/cursornavigation.cpp
index e52d028..ebcd064 100644
--- a/plugin/cursornavigation.cpp
+++ b/plugin/cursornavigation.cpp
@@ -44,6 +44,8 @@
#include <QQuickItem>
#include <QtMath>
+Q_LOGGING_CATEGORY(cursorNavigationLog, "cursor.navigation")
+
const char CursorNavigation::windowPropertyName[] = "cursor_navigation";
CursorNavigation::CursorNavigation(QQuickWindow *parent)
@@ -86,7 +88,7 @@ QQuickItem *CursorNavigation::find(qreal angle, qreal tolerance, bool discrete)
for (auto redirect : m_currentItem->m_redirects) {
if (redirect->angleIsIncluded(angle)) {
if (!redirect->target())
- qWarning() << "Redirect target is null";
+ qCWarning(cursorNavigationLog) << "Redirect target is null";
return redirect->target();
}
}
@@ -122,7 +124,7 @@ QQuickItem *CursorNavigation::find(qreal angle, qreal tolerance, bool discrete)
bool CursorNavigation::action(Action action)
{
- qWarning() << "handleActionCommand, action= " << action;
+ qCWarning(cursorNavigationLog) << "handleActionCommand, action= " << action;
switch (action) {
case Forward:
break;
@@ -147,7 +149,7 @@ bool CursorNavigation::action(Action action)
}
escapeTarget = m_currentItem->m_parentNavigable->m_parentNavigable->item();
}
- qWarning() << "escaping, target = " << escapeTarget;
+ qCWarning(cursorNavigationLog) << "escaping, target = " << escapeTarget;
setCursorOnItem(nullptr);
escapeTarget->forceActiveFocus();
onActiveFocusItemChanged();
@@ -169,7 +171,7 @@ CursorNavigationAttached *CursorNavigation::qmlAttachedProperties(QObject *objec
}
if (!qobject_cast<QQuickItem *>(object)) {
- qWarning("Cannot manage cursor for a non-Item!");
+ qCWarning(cursorNavigationLog) << "Cannot manage cursor for a non-Item!";
return nullptr;
}
@@ -187,7 +189,7 @@ CursorNavigation *CursorNavigation::cursorNavigationForWindow(QQuickWindow *wind
if (!oldCursorNavigation.isNull())
return oldCursorNavigation.value<CursorNavigation *>();
- qWarning() << "Created a new CN engine";
+ qCWarning(cursorNavigationLog) << "Created a new CN engine";
CursorNavigation *cursorNavigation = new CursorNavigation(window);
window->setProperty(windowPropertyName, QVariant::fromValue(cursorNavigation));
@@ -195,7 +197,7 @@ CursorNavigation *CursorNavigation::cursorNavigationForWindow(QQuickWindow *wind
/*if (QQmlEngine *engine = cn->qmlEngine(window)) {
engine->rootContext()->setContextProperty("_cursorNavigation", cn);
} else {
- qDebug() << "Couldn't find QQmlEngine";
+ qCDebug(cursorNavigationLog) << "Couldn't find QQmlEngine";
}*/
return cursorNavigation;
@@ -225,7 +227,8 @@ void CursorNavigation::setCursorOnItem(CursorNavigationAttached *item)
void CursorNavigation::onActiveFocusItemChanged()
{
- qWarning() << "onActiveFocusItemChanged, item:" << m_window->activeFocusItem();
+ qCWarning(cursorNavigationLog) << "onActiveFocusItemChanged, item:"
+ << m_window->activeFocusItem();
QQuickItem *item = m_window->activeFocusItem();
while (item) {
@@ -241,7 +244,7 @@ void CursorNavigation::onActiveFocusItemChanged()
void CursorNavigation::registerItem(CursorNavigationAttached* item)
{
- //qWarning() << "register item " << item;
+ //qCWarning(cursorNavigationLog) << "register item " << item;
if (!item)
return;
@@ -283,7 +286,7 @@ void CursorNavigation::registerItem(CursorNavigationAttached* item)
void CursorNavigation::unregisterItem(CursorNavigationAttached* item)
{
- //qWarning() << "unregister item " << item;
+ //qCWarning(cursorNavigationLog) << "unregister item " << item;
if (item == m_currentItem)
setCursorOnItem(nullptr);
diff --git a/plugin/cursornavigation.h b/plugin/cursornavigation.h
index 86f9b58..c73684e 100644
--- a/plugin/cursornavigation.h
+++ b/plugin/cursornavigation.h
@@ -49,8 +49,10 @@
#include <QObject>
#include <qqml.h>
#include <QStack>
+#include <QtCore/QLoggingCategory>
-//TODO remove useless debug prints and change over to categorized logging
+
+Q_DECLARE_LOGGING_CATEGORY(cursorNavigationLog)
class QQuickItem;
diff --git a/plugin/cursornavigationalgorithm.h b/plugin/cursornavigationalgorithm.h
index b0c1efd..06dbb21 100644
--- a/plugin/cursornavigationalgorithm.h
+++ b/plugin/cursornavigationalgorithm.h
@@ -42,6 +42,9 @@
#include <QList>
#include "inputtypes.h"
+#include <QtCore/QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(cursorNavigationLog)
class CursorNavigationAttached;
diff --git a/plugin/cursornavigationattached.cpp b/plugin/cursornavigationattached.cpp
index cabab73..61ac5bd 100644
--- a/plugin/cursornavigationattached.cpp
+++ b/plugin/cursornavigationattached.cpp
@@ -59,14 +59,14 @@ m_escapeTarget(nullptr)
if (parent && item() && item()->window())
{
- qDebug() << "Item has a window already";
+ qCDebug(cursorNavigationLog) << "Item has a window already";
onWindowChanged(item()->window());
}
}
CursorNavigationAttached::~CursorNavigationAttached()
{
- qWarning() << "~CursorNavigationAttached";
+ qCWarning(cursorNavigationLog) << "~CursorNavigationAttached";
if (m_cursorNavigation)
m_cursorNavigation->unregisterItem(this);
}
@@ -81,7 +81,7 @@ void CursorNavigationAttached::setAngleOffset(double angleOffset)
if (angleOffset != m_angleOffset) {
m_angleOffset = angleOffset;
emit angleOffsetChanged(m_angleOffset);
- qWarning() << "rotation changed " << m_angleOffset;
+ qCWarning(cursorNavigationLog) << "rotation changed " << m_angleOffset;
}
}
bool CursorNavigationAttached::acceptsCursor() const
@@ -147,7 +147,7 @@ void CursorNavigationAttached::setMagnitude(const QVector2D &vector)
void CursorNavigationAttached::move(qreal angle, qreal tolerance)
{
if (m_cursorNavigation) {
- qWarning() << "move";
+ qCWarning(cursorNavigationLog) << "move";
qreal a = qDegreesToRadians(angle);
qreal t = qDegreesToRadians(qFabs(std::fmod(tolerance, 180)));
CursorNavigationAttached *item = m_cursorNavigation->m_currentItem;
@@ -160,7 +160,7 @@ void CursorNavigationAttached::move(qreal angle, qreal tolerance)
void CursorNavigationAttached::move(const QVector2D &vector, qreal tolerance)
{
if (m_cursorNavigation) {
- qWarning() << "move (vector)";
+ qCWarning(cursorNavigationLog) << "move (vector)";
qreal a = qAtan2(vector.y(), vector.x());
qreal t = qDegreesToRadians(qFabs(std::fmod(tolerance, 180)));
CursorNavigationAttached *item = m_cursorNavigation->m_currentItem;
@@ -273,7 +273,7 @@ QQuickItem *CursorNavigationAttached::currentItem()
void CursorNavigationAttached::onWindowChanged(QQuickWindow *window)
{
- qDebug() << "window changed, window = " << window;
+ qCDebug(cursorNavigationLog) << "window changed, window = " << window;
if (m_cursorNavigation && m_acceptsCursor)
m_cursorNavigation->unregisterItem(this);
diff --git a/plugin/plugin.pro b/plugin/plugin.pro
index b5cdee7..952b52a 100644
--- a/plugin/plugin.pro
+++ b/plugin/plugin.pro
@@ -2,7 +2,7 @@ TARGET = cursornavigationplugin
TEMPLATE = lib
QT -= gui
-QT += qml quick
+QT += qml quick core
CONFIG += plugin
diff --git a/plugin/spatialnavigation360.cpp b/plugin/spatialnavigation360.cpp
index 12f19ee..cc1f73e 100644
--- a/plugin/spatialnavigation360.cpp
+++ b/plugin/spatialnavigation360.cpp
@@ -154,7 +154,7 @@ CursorNavigationAttached* SpatialNavigation360::getNextCandidate(
* -remember to use current item's coord system as the reference!!!
*/
- //qWarning() << "##### navigation360: start, angle = " << cmd.angle << " tolerance = " << cmd.angleTolerance;
+ //qCWarning(cursorNavigationLog) << "##### navigation360: start, angle = " << cmd.angle << " tolerance = " << cmd.angleTolerance;
if (candidates.isEmpty())
return nullptr;
@@ -218,7 +218,7 @@ CursorNavigationAttached* SpatialNavigation360::getNextCandidate(
}
}
- //qWarning() << "##### end, directHit = " <<
+ //qCWarning(cursorNavigationLog) << "##### end, directHit = " <<
// directHitItem << " withinTolerances = " << withinToleranceItem;
if (directHitItem)
diff --git a/plugin/spatialnavigation4dir.cpp b/plugin/spatialnavigation4dir.cpp
index 5bd5b52..89b4a3a 100644
--- a/plugin/spatialnavigation4dir.cpp
+++ b/plugin/spatialnavigation4dir.cpp
@@ -69,10 +69,10 @@ CursorNavigationAttached* SpatialNavigation4Dir::getNextCandidate(
if (candidates.isEmpty())
return nullptr;
- qDebug() << "4-way algortihm called, no of candidates=" << candidates.count();
+ qCDebug(cursorNavigationLog) << "4-way algortihm called, no of candidates=" << candidates.count();
if (!currentItem && candidates.size()) {
- qDebug() << "the spatial chooser falling back to first child" << candidates.first();
+ qCDebug(cursorNavigationLog) << "the spatial chooser falling back to first child" << candidates.first();
return candidates.first();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 01:18:34 +0000