OSDN Git Service

remove leftovers from QML debugger
authorIvailo Monev <xakepa10@gmail.com>
Wed, 8 Jun 2016 07:31:27 +0000 (07:31 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 8 Jun 2016 07:31:27 +0000 (07:31 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativewatcher.cpp [deleted file]
src/declarative/qml/qdeclarativewatcher_p.h [deleted file]
src/declarative/qml/qml.cmake

index 999cdce..b654479 100644 (file)
@@ -636,7 +636,6 @@ QDeclarativeEngine::QDeclarativeEngine(QObject *parent)
 */
 QDeclarativeEngine::~QDeclarativeEngine()
 {
-    Q_D(QDeclarativeEngine);
 }
 
 /*! \fn void QDeclarativeEngine::quit()
diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp
deleted file mode 100644 (file)
index d533922..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativewatcher_p.h"
-
-#include "qdeclarativeexpression.h"
-#include "qdeclarativecontext.h"
-#include "qdeclarative.h"
-
-#include "qdeclarativeproperty_p.h"
-#include "qdeclarativevaluetype_p.h"
-
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QDeclarativeWatchProxy : public QObject
-{
-    Q_OBJECT
-public:
-    QDeclarativeWatchProxy(int id,
-                  QObject *object,
-                  int debugId,
-                  const QMetaProperty &prop,
-                  QDeclarativeWatcher *parent = 0);
-
-    QDeclarativeWatchProxy(int id,
-                  QDeclarativeExpression *exp,
-                  int debugId,
-                  QDeclarativeWatcher *parent = 0);
-
-public slots:
-    void notifyValueChanged();
-
-private:
-    friend class QDeclarativeWatcher;
-    int m_id;
-    QDeclarativeWatcher *m_watch;
-    QObject *m_object;
-    int m_debugId;
-    QMetaProperty m_property;
-
-    QDeclarativeExpression *m_expr;
-};
-
-QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id,
-                             QDeclarativeExpression *exp,
-                             int debugId,
-                             QDeclarativeWatcher *parent)
-: QObject(parent), m_id(id), m_watch(parent), m_object(0), m_debugId(debugId), m_expr(exp)
-{
-    QObject::connect(m_expr, SIGNAL(valueChanged()), this, SLOT(notifyValueChanged()));
-}
-
-QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id,
-                             QObject *object,
-                             int debugId,
-                             const QMetaProperty &prop,
-                             QDeclarativeWatcher *parent)
-: QObject(parent), m_id(id), m_watch(parent), m_object(object), m_debugId(debugId), m_property(prop), m_expr(0)
-{
-    static int refreshIdx = -1;
-    if(refreshIdx == -1)
-        refreshIdx = QDeclarativeWatchProxy::staticMetaObject.indexOfMethod("notifyValueChanged()");
-
-    if (prop.hasNotifySignal())
-        QDeclarativePropertyPrivate::connect(m_object, prop.notifySignalIndex(), this, refreshIdx);
-}
-
-void QDeclarativeWatchProxy::notifyValueChanged()
-{
-    QVariant v;
-    if (m_expr)
-        v = m_expr->evaluate();
-    else if (QDeclarativeValueTypeFactory::isValueType(m_property.userType()))
-        v = m_property.read(m_object);
-
-    emit m_watch->propertyChanged(m_id, m_debugId, m_property, v);
-}
-
-
-QDeclarativeWatcher::QDeclarativeWatcher(QObject *parent)
-    : QObject(parent)
-{
-}
-
-bool QDeclarativeWatcher::addWatch(int id, quint32 debugId)
-{
-#pragma stub
-    return false;
-}
-
-bool QDeclarativeWatcher::addWatch(int id, quint32 debugId, const QByteArray &property)
-{
-#pragma stub
-    return false;
-}
-
-bool QDeclarativeWatcher::addWatch(int id, quint32 objectId, const QString &expr)
-{
-#pragma stub
-    return false;
-}
-
-void QDeclarativeWatcher::removeWatch(int id)
-{
-    if (!m_proxies.contains(id))
-        return;
-
-    QList<QPointer<QDeclarativeWatchProxy> > proxies = m_proxies.take(id);
-    qDeleteAll(proxies);
-}
-
-void QDeclarativeWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, const QMetaProperty &property)
-{
-    QDeclarativeWatchProxy *proxy = new QDeclarativeWatchProxy(id, object, debugId, property, this);
-    m_proxies[id].append(proxy);
-
-    proxy->notifyValueChanged();
-}
-
-QT_END_NAMESPACE
-
-#include <moc_qdeclarativewatcher.cpp>
-#include <moc_qdeclarativewatcher_p.h>
diff --git a/src/declarative/qml/qdeclarativewatcher_p.h b/src/declarative/qml/qdeclarativewatcher_p.h
deleted file mode 100644 (file)
index bb2bac6..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEWATCHER_P_H
-#define QDECLARATIVEWATCHER_P_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 <QtCore/qobject.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qpair.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qset.h>
-#include <QtCore/qpointer.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeWatchProxy;
-class QDeclarativeExpression;
-class QDeclarativeContext;
-class QMetaProperty;
-
-class QDeclarativeWatcher : public QObject
-{
-    Q_OBJECT
-public:
-    QDeclarativeWatcher(QObject * = 0);
-
-    bool addWatch(int id, quint32 objectId);
-    bool addWatch(int id, quint32 objectId, const QByteArray &property);
-    bool addWatch(int id, quint32 objectId, const QString &expr);
-
-    void removeWatch(int id);
-
-Q_SIGNALS:
-    void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
-
-private:
-    friend class QDeclarativeWatchProxy;
-    void addPropertyWatch(int id, QObject *object, quint32 objectId, const QMetaProperty &property);
-
-    QHash<int, QList<QPointer<QDeclarativeWatchProxy> > > m_proxies;
-};
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVEWATCHER_P_H
index 82b76b9..13bce15 100644 (file)
@@ -49,7 +49,6 @@ set(DECLARATIVE_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativexmlhttprequest_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativesqldatabase_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qmetaobjectbuilder_p.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativewatcher_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativecleanup_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativepropertycache_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativenotifier_p.h
@@ -121,7 +120,6 @@ set(DECLARATIVE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativexmlhttprequest.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativesqldatabase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qmetaobjectbuilder.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativewatcher.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativecleanup.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativepropertycache.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/qml/qdeclarativenotifier.cpp