From 4a29e0d0e1544e3fb35366851ae5d541efebcc33 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 6 May 2023 17:53:01 +0200 Subject: [PATCH] Add categorized logging to MessageEventModel --- CMakeLists.txt | 1 + src/CMakeLists.txt | 7 +++++++ src/models/messageeventmodel.cpp | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e13be9ca..2ba8871c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(KDEGitCommitHooks) include(ECMCheckOutboundLicense) +include(ECMQtDeclareLoggingCategory) if (NOT ANDROID) include(KDEClangFormat) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 95dc3b39d..ef504b383 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,6 +54,13 @@ add_library(neochat STATIC events/stickerevent.cpp ) +ecm_qt_declare_logging_category(neochat + HEADER "messageeventmodel_logging.h" + IDENTIFIER "MessageEvent" + CATEGORY_NAME "org.kde.neochat.messageeventmodel" + DEFAULT_SEVERITY Info +) + add_executable(neochat-app main.cpp res.qrc diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp index fcc6d5d94..d9934e266 100644 --- a/src/models/messageeventmodel.cpp +++ b/src/models/messageeventmodel.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only #include "messageeventmodel.h" +#include "messageeventmodel_logging.h" #include "neochatconfig.h" #include @@ -242,7 +243,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room) beginResetModel(); endResetModel(); }); - qDebug() << "Connected to room" << room->id() << "as" << room->localUser()->id(); + qCDebug(MessageEvent) << "Connected to room" << room->id() << "as" << room->localUser()->id(); } else { lastReadEventId.clear(); } @@ -357,7 +358,7 @@ QDateTime MessageEventModel::makeMessageTimestamp(const Quotient::Room::rev_iter }; // What kind of room is that?.. - qCritical() << "No valid timestamps in the room timeline!"; + qCCritical(MessageEvent) << "No valid timestamps in the room timeline!"; return {}; } @@ -459,6 +460,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const const auto row = idx.row(); if (!m_currentRoom || row < 0 || row >= int(m_currentRoom->pendingEvents().size()) + m_currentRoom->timelineSize()) { + qCWarning(MessageEvent) << "Accessing index out of bounds"; return {}; }; @@ -951,6 +953,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const return row < static_cast(m_currentRoom->pendingEvents().size()); } + qCWarning(MessageEvent) << "Unknown role" << role; return {}; }