From 229852304e4ea9622aa18f05e2f0ad88f305836f Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 15 Jul 2015 18:09:54 +0200 Subject: Hide QQmlInspectorServiceImpl in .cpp file Nobody needs to access it anymore. Change-Id: Ib782037ac0a8721997f6d36995d03f42c060602b Reviewed-by: Simon Hausmann --- .../qmldbg_inspector/qmldbg_inspector.pro | 2 +- .../qmldbg_inspector/qqmlinspectorservice.cpp | 29 ++++++- .../qmldbg_inspector/qqmlinspectorservice.h | 93 ---------------------- .../qmldbg_inspector/qqmlinspectorservicefactory.h | 66 +++++++++++++++ 4 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h create mode 100644 src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservicefactory.h (limited to 'src/plugins') diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 2a058d0e68..1c3e5f387b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -18,7 +18,7 @@ SOURCES += \ HEADERS += \ $$PWD/highlight.h \ $$PWD/qquickviewinspector.h \ - $$PWD/qqmlinspectorservice.h \ + $$PWD/qqmlinspectorservicefactory.h \ $$PWD/abstracttool.h \ $$PWD/abstractviewinspector.h \ $$PWD/inspecttool.h diff --git a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp index 0b085cc960..1707091df3 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include "qqmlinspectorservice.h" +#include "qqmlinspectorservicefactory.h" #include "qquickviewinspector.h" #include @@ -43,6 +43,31 @@ QT_BEGIN_NAMESPACE +class QQmlInspectorServiceImpl : public QQmlInspectorService +{ + Q_OBJECT + +public: + QQmlInspectorServiceImpl(QObject *parent = 0); + + void addView(QObject *); + void removeView(QObject *); + +protected: + virtual void stateChanged(State state); + virtual void messageReceived(const QByteArray &); + +private Q_SLOTS: + void processMessage(const QByteArray &message); + void updateState(); + +private: + friend class QQmlInspectorServiceFactory; + + QList m_views; + QmlJSDebugger::AbstractViewInspector *m_currentInspector; +}; + QQmlInspectorServiceImpl::QQmlInspectorServiceImpl(QObject *parent): QQmlInspectorService(1, parent), m_currentInspector(0) { @@ -98,3 +123,5 @@ QQmlDebugService *QQmlInspectorServiceFactory::create(const QString &key) } QT_END_NAMESPACE + +#include "qqmlinspectorservice.moc" diff --git a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h deleted file mode 100644 index 3197951612..0000000000 --- a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.h +++ /dev/null @@ -1,93 +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$ -** -****************************************************************************/ - -#ifndef QQMLINSPECTORSERVICE_H -#define QQMLINSPECTORSERVICE_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace QmlJSDebugger { class AbstractViewInspector; } - -class QQmlInspectorServiceImpl : public QQmlInspectorService -{ - Q_OBJECT - -public: - QQmlInspectorServiceImpl(QObject *parent = 0); - - void addView(QObject *); - void removeView(QObject *); - -protected: - virtual void stateChanged(State state); - virtual void messageReceived(const QByteArray &); - -private Q_SLOTS: - void processMessage(const QByteArray &message); - void updateState(); - -private: - friend class QQmlInspectorServiceFactory; - - QList m_views; - QmlJSDebugger::AbstractViewInspector *m_currentInspector; -}; - -class QQmlInspectorServiceFactory : public QQmlDebugServiceFactory -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlDebugServiceFactory_iid FILE "qqmlinspectorservice.json") -public: - QQmlDebugService *create(const QString &key); -}; - -QT_END_NAMESPACE - -#endif // QQMLINSPECTORSERVICE_H diff --git a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservicefactory.h b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservicefactory.h new file mode 100644 index 0000000000..52f84a362d --- /dev/null +++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservicefactory.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef QQMLINSPECTORSERVICE_H +#define QQMLINSPECTORSERVICE_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +#include +#include + +QT_BEGIN_NAMESPACE + +class QQmlInspectorServiceFactory : public QQmlDebugServiceFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlDebugServiceFactory_iid FILE "qqmlinspectorservice.json") +public: + QQmlDebugService *create(const QString &key); +}; + +QT_END_NAMESPACE + +#endif // QQMLINSPECTORSERVICE_H -- cgit v1.2.3