diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-21 16:11:16 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:35:25 +0000 |
commit | 5652c4163f94aaf4bd9cef994be2ae8e7f4096c5 (patch) | |
tree | a42e882963b3e7b328dfd23da275c4e825bfb544 /src/qml/debugger/qdebugmessageservice.cpp | |
parent | f8e5cfcfc26499eef30fc222e24957a753651cbc (diff) |
Move debugger-specific services into a common plugin
Change-Id: Icd4e6a6c57bc3ac65cb43d2329d236012b988678
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qdebugmessageservice.cpp')
-rw-r--r-- | src/qml/debugger/qdebugmessageservice.cpp | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/src/qml/debugger/qdebugmessageservice.cpp b/src/qml/debugger/qdebugmessageservice.cpp deleted file mode 100644 index 6b0f184951..0000000000 --- a/src/qml/debugger/qdebugmessageservice.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qdebugmessageservice_p.h" -#include <private/qqmldebugconnector_p.h> - -#include <QDataStream> - -QT_BEGIN_NAMESPACE - -Q_GLOBAL_STATIC(QDebugMessageService, qmlDebugMessageService) - -const QString QDebugMessageService::s_key = QStringLiteral("DebugMessages"); - -void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, - const QString &buf) -{ - QQmlDebugConnector::service<QDebugMessageService>()->sendDebugMessage(type, ctxt, buf); -} - -QDebugMessageService::QDebugMessageService(QObject *parent) : - QQmlDebugService(s_key, 2, parent), oldMsgHandler(0), - prevState(QQmlDebugService::NotConnected) -{ - // don't execute stateChanged() in parallel - QMutexLocker lock(&initMutex); - if (state() == Enabled) { - oldMsgHandler = qInstallMessageHandler(DebugMessageHandler); - prevState = Enabled; - } -} - -QDebugMessageService *QDebugMessageService::instance() -{ - return qmlDebugMessageService(); -} - -void QDebugMessageService::sendDebugMessage(QtMsgType type, - const QMessageLogContext &ctxt, - const QString &buf) -{ - //We do not want to alter the message handling mechanism - //We just eavesdrop and forward the messages to a port - //only if a client is connected to it. - QByteArray message; - QQmlDebugStream ws(&message, QIODevice::WriteOnly); - ws << QByteArray("MESSAGE") << type << buf.toUtf8(); - ws << QString::fromLatin1(ctxt.file).toUtf8(); - ws << ctxt.line << QString::fromLatin1(ctxt.function).toUtf8(); - - emit messageToClient(name(), message); - if (oldMsgHandler) - (*oldMsgHandler)(type, ctxt, buf); -} - -void QDebugMessageService::stateChanged(State state) -{ - QMutexLocker lock(&initMutex); - - if (state != Enabled && prevState == Enabled) { - QtMessageHandler handler = qInstallMessageHandler(oldMsgHandler); - // has our handler been overwritten in between? - if (handler != DebugMessageHandler) - qInstallMessageHandler(handler); - - } else if (state == Enabled && prevState != Enabled) { - oldMsgHandler = qInstallMessageHandler(DebugMessageHandler); - } - - prevState = state; -} - -QT_END_NAMESPACE |