diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-04-02 14:46:35 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-04-02 16:21:46 +0200 |
commit | fccd8f910e77c4698b108912dc3874158717a92f (patch) | |
tree | 002428b392d070e3040f975f45af87cd607b5e88 | |
parent | 221dabf5439d89c95ca74689934658ddfa887733 (diff) | |
download | qt-creator-fccd8f910e77c4698b108912dc3874158717a92f.tar.gz |
QmlDesigner: remove ViewLogger
We now have the DebugView
Change-Id: I3b1cc313a9158469b51c1fd9926c29369471503e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
7 files changed, 0 insertions, 412 deletions
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h index 9689c9872d..69ede61ee4 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.h +++ b/src/plugins/qmldesigner/components/integration/designdocument.h @@ -35,7 +35,6 @@ #include <basetexteditmodifier.h> #include <componenttextmodifier.h> #include <subcomponentmanager.h> -#include <model/viewlogger.h> #include <QObject> #include <QString> diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri index edd64602c1..41f7d00982 100644 --- a/src/plugins/qmldesigner/designercore/designercore-lib.pri +++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri @@ -44,7 +44,6 @@ SOURCES += $$PWD/model/abstractview.cpp \ $$PWD/exceptions/invalidslideindexexception.cpp \ $$PWD/model/import.cpp \ $$PWD/exceptions/invalidqmlsourceexception.cpp \ - $$PWD/model/viewlogger.cpp \ $$PWD/model/internalvariantproperty.cpp \ $$PWD/model/internalnodelistproperty.cpp \ $$PWD/model/variantproperty.cpp \ @@ -114,7 +113,6 @@ HEADERS += $$PWD/include/qmldesignercorelib_global.h \ $$PWD/include/invalidslideindexexception.h \ $$PWD/include/import.h \ $$PWD/include/invalidqmlsourceexception.h \ - $$PWD/model/viewlogger.h \ $$PWD/model/internalvariantproperty.h \ $$PWD/model/internalnodelistproperty.h \ $$PWD/include/variantproperty.h \ diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h index 47c6edbb7c..a238692594 100644 --- a/src/plugins/qmldesigner/designercore/include/viewmanager.h +++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h @@ -41,7 +41,6 @@ #include <propertyeditor.h> #include <componentview.h> #include <debugview.h> -#include <model/viewlogger.h> namespace QmlDesigner { @@ -105,7 +104,6 @@ private: // functions private: // variables QmlModelState m_savedState; - Internal::ViewLogger m_viewLogger; Internal::DebugView m_debugView; ComponentView m_componentView; FormEditorView m_formEditorView; diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp deleted file mode 100644 index 95c76f7417..0000000000 --- a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp +++ /dev/null @@ -1,295 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "viewlogger.h" -#include <QDebug> -#include <QTemporaryFile> -#include <QDir> -#include <QUrl> -#include <variantproperty.h> -#include <bindingproperty.h> -#include <nodeabstractproperty.h> -#include <nodelistproperty.h> - -namespace QmlDesigner { -namespace Internal { - -static QString serialize(AbstractView::PropertyChangeFlags change) -{ - QStringList tokenList; - - if (change.testFlag(AbstractView::PropertiesAdded)) - tokenList.append(QLatin1String("PropertiesAdded")); - - if (change.testFlag(AbstractView::EmptyPropertiesRemoved)) - tokenList.append(QLatin1String("EmptyPropertiesRemoved")); - - return tokenList.join(" "); -} - -static QString indent(const QString &name = QString()) { - return name.leftJustified(30, ' '); -} - -QString ViewLogger::time() const -{ - return QString::number(m_timer.elapsed()).leftJustified(7, ' '); -} - -ViewLogger::ViewLogger(QObject *parent) - : AbstractView(parent) -{ - m_timer.start(); -} - -void ViewLogger::modelAttached(Model *model) -{ - static const QString path = QDir::tempPath() + QString("/qmldesigner-logger-%1-XXXXXX.txt"). - arg(QDateTime::currentDateTime().toString(Qt::ISODate). - replace(':', '-')); - static QTemporaryFile *temporaryFile = new QTemporaryFile(path, this); - temporaryFile->setAutoRemove(false); - static bool fileOpen = temporaryFile->open(); - if (fileOpen) { - qDebug() << "QmlDesigner: Log file is:" << temporaryFile->fileName(); - m_output.setDevice(temporaryFile); - } else { - qDebug() << "QmlDesigner: failed to open:" << temporaryFile->fileName(); - } - - m_output << time() << indent("modelAttached:") << model << endl; - AbstractView::modelAttached(model); -} - -void ViewLogger::modelAboutToBeDetached(Model *model) -{ - m_output << time() << indent("modelAboutToBeDetached:") << model << endl; - AbstractView::modelAboutToBeDetached(model); -} - -void ViewLogger::nodeCreated(const ModelNode &createdNode) -{ - m_output << time() << indent("nodeCreated:") << createdNode << endl; -} - -void ViewLogger::nodeAboutToBeRemoved(const ModelNode &removedNode) -{ - m_output << time() << indent("nodeAboutToBeRemoved:") << removedNode << endl; -} - -void ViewLogger::nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) -{ - m_output << time() << indent("nodeRemoved:") << removedNode << parentProperty << serialize(propertyChange) << endl; -} - -void ViewLogger::nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) -{ - m_output << time() << indent("nodeAboutToBeReparented:") << node << "\t" << newPropertyParent << "\t" << oldPropertyParent << "\t" << serialize(propertyChange) << endl; -} - - -void ViewLogger::nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) -{ - m_output << time() << indent("nodeReparented:") << node << "\t" << newPropertyParent << "\t" << oldPropertyParent << "\t" << serialize(propertyChange) << endl; -} - -void ViewLogger::nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) -{ - m_output << time() << indent("nodeIdChanged:") << node << "\t" << newId << "\t" << oldId << endl; -} - -void ViewLogger::propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) -{ - m_output << time() << indent("propertiesAboutToBeRemoved:") << endl; - foreach (const AbstractProperty &property, propertyList) - m_output << time() << indent() << property << endl; -} - -void ViewLogger::propertiesRemoved(const QList<AbstractProperty> &propertyList) -{ - m_output << time() << indent("propertiesRemoved:") << endl; - foreach (const AbstractProperty &property, propertyList) - m_output << time() << indent() << property << endl; -} - -void ViewLogger::variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) -{ - m_output << time() << indent("variantPropertiesChanged:") << serialize(propertyChange) << endl; - foreach (const VariantProperty &property, propertyList) - m_output << time() << indent() << property << endl; -} - -void ViewLogger::bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) -{ - m_output << time() << indent("bindingPropertiesChanged:") << serialize(propertyChange) << endl; - foreach (const BindingProperty &property, propertyList) - m_output << time() << indent() << property << endl; -} - -void ViewLogger::signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> & /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) -{ -} - -void ViewLogger::rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) -{ - m_output << time() << indent("rootNodeTypeChanged:") << rootModelNode() << type << majorVersion << minorVersion << endl; -} - -void ViewLogger::selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList) -{ - m_output << time() << indent("selectedNodesChanged:") << endl; - foreach (const ModelNode &node, selectedNodeList) - m_output << time() << indent("new: ") << node << endl; - foreach (const ModelNode &node, lastSelectedNodeList) - m_output << time() << indent("old: ") << node << endl; -} - -void ViewLogger::fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) -{ - m_output << time() << indent("fileUrlChanged:") << oldUrl.toString() << "\t" << newUrl.toString() << endl; -} - -void ViewLogger::nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) -{ - m_output << time() << indent("nodeOrderChanged:") << listProperty << movedNode << oldIndex << endl; -} - -void ViewLogger::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) -{ - m_output << time() << indent("auxiliaryDataChanged:") << node << "\t" << name << "\t" << data.toString() << endl; -} - -void ViewLogger::importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) -{ - m_output << time() << indent("importsChanged:") << endl; - foreach (const Import &import, addedImports) - m_output << time() << indent("import added: ") << import.toString() << endl; - foreach (const Import &import, removedImports) - m_output << time() << indent("import removed: ") << import.toString() << endl; -} - -void ViewLogger::customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) -{ - m_output << time() << indent("customNotification:") << view << identifier << endl; - foreach (const ModelNode &node, nodeList) - m_output << time() << indent("node: ") << node << endl; - foreach (const QVariant &variant, data) - m_output << time() << indent("data: ") << variant.toString() << endl; -} - -void ViewLogger::scriptFunctionsChanged(const ModelNode &node, const QStringList &/*scriptFunctionList*/) -{ - m_output << time() << indent("function scripts changed:") << node << endl; -} - -void ViewLogger::instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) -{ - typedef QPair<ModelNode, PropertyName> PropertyPair; - m_output << time() << indent("instancePropertyChange:") << endl; - - foreach (const PropertyPair &propertyPair, propertyList) - m_output << time() << indent("property: ") << propertyPair.first << propertyPair.second << endl; -} - -void ViewLogger::instancesCompleted(const QVector<ModelNode> &completedNodeList) -{ - m_output << time() << indent("instancesCompleted:") << endl; - - foreach (const ModelNode &node, completedNodeList) - m_output << time() << indent("node: ") << node << endl; - -} - -void ViewLogger::instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) -{ - m_output << time() << indent("instanceInformationsChange:") << endl; - - QHashIterator<ModelNode, InformationName> informationChangeHashIterator(informationChangeHash); - - while (informationChangeHashIterator.hasNext()) { - informationChangeHashIterator.next(); - m_output << time() << indent("node: ") << informationChangeHashIterator.key() << "\tinformation: " << informationChangeHashIterator.value() << endl; - } -} - -void ViewLogger::instancesRenderImageChanged(const QVector<ModelNode> &nodeList) -{ - m_output << time() << indent("instancesRenderImageChanged:") << endl; - - foreach (const ModelNode &node, nodeList) - m_output << time() << indent("node: ") << node << endl; -} - -void ViewLogger::instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) -{ - m_output << time() << indent("instancesPreviewImageChanged:") << endl; - - foreach (const ModelNode &node, nodeList) - m_output << time() << indent("node: ") << node << endl; -} - -void ViewLogger::instancesChildrenChanged(const QVector<ModelNode> &nodeList) -{ - m_output << time() << indent("instancesChildrenChanged:") << endl; - - foreach (const ModelNode &node, nodeList) - m_output << time() << indent("node: ") << node << endl; -} - -void ViewLogger::instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) -{ - m_output << time() << indent("instancesToken:") << tokenName << tokenNumber << endl; - foreach (const ModelNode &node, nodeVector) - m_output << time() << indent("node: ") << node << endl; -} - -void ViewLogger::nodeSourceChanged(const ModelNode &node, const QString & /*newNodeSource*/) -{ - m_output << time() << indent("nodeSourceChanged:") << endl; - m_output << time() << indent("node: ") << node << endl; -} - -void ViewLogger::rewriterBeginTransaction() -{ - m_output << time() << indent("rewriterBeginTransaction:") << endl; -} - -void ViewLogger::rewriterEndTransaction() -{ - m_output << time() << indent("rewriterEndTransaction:") << endl; -} - -void ViewLogger::actualStateChanged(const ModelNode &node) -{ - m_output << time() << indent("actualStateChanged:") << node << endl; -} - -} // namespace Internal -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.h b/src/plugins/qmldesigner/designercore/model/viewlogger.h deleted file mode 100644 index baa94550ac..0000000000 --- a/src/plugins/qmldesigner/designercore/model/viewlogger.h +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef VIEWLOGGER_H -#define VIEWLOGGER_H - -#include "abstractview.h" - -#include <QTextStream> -#include <QTime> - -namespace QmlDesigner { -namespace Internal { - -class ViewLogger : public QmlDesigner::AbstractView -{ - Q_OBJECT -public: - ViewLogger(QObject *parent = 0); - - void modelAttached(Model *model); - void modelAboutToBeDetached(Model *model); - - void nodeCreated(const ModelNode &createdNode); - void nodeAboutToBeRemoved(const ModelNode &removedNode); - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId); - void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList); - void propertiesRemoved(const QList<AbstractProperty>& propertyList); - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); - void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange); - void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange); - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); - - void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, - const QList<ModelNode> &lastSelectedNodeList); - - void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl); - - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); - - void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports); - - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); - - void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data); - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList); - void instancesCompleted(const QVector<ModelNode> &completedNodeList); - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash); - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList); - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList); - void instancesChildrenChanged(const QVector<ModelNode> &nodeList); - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector); - - void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource); - - void rewriterBeginTransaction(); - void rewriterEndTransaction(); - - void actualStateChanged(const ModelNode &node); - -protected: - QString time() const; - -private: - QTextStream m_output; - QTime m_timer; -}; - -} // namespace Internal -} // namespace QmlDesigner - -#endif // VIEWLOGGER_H diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index fd70c264bf..a5dcc37d58 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -112,10 +112,6 @@ void ViewManager::detachViewsExceptRewriterAndComponetView() if (m_debugView.isAttached()) currentModel()->detachView(&m_debugView); currentModel()->setNodeInstanceView(0); - - static bool enableViewLogger = !qgetenv("QTC_ENABLE_QMLDESIGNER_LOGGER").isEmpty(); - if (enableViewLogger) - currentModel()->detachView(&m_viewLogger); } void ViewManager::attachItemLibraryView() @@ -150,10 +146,6 @@ void ViewManager::detachComponentView() void ViewManager::attachViewsExceptRewriterAndComponetView() { - static bool enableViewLogger = !qgetenv("QTC_ENABLE_QMLDESIGNER_LOGGER").isEmpty(); - if (enableViewLogger) - currentModel()->attachView(&m_viewLogger); - if (QmlDesignerPlugin::instance()->settings().enableDebugView) currentModel()->attachView(&m_debugView); attachNodeInstanceView(); diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs index 7d709d37a5..21000dade9 100644 --- a/src/plugins/qmldesigner/qmldesigner.qbs +++ b/src/plugins/qmldesigner/qmldesigner.qbs @@ -280,8 +280,6 @@ QtcPlugin { "model/texttomodelmerger.cpp", "model/texttomodelmerger.h", "model/variantproperty.cpp", - "model/viewlogger.cpp", - "model/viewlogger.h", "pluginmanager/widgetpluginmanager.cpp", "pluginmanager/widgetpluginmanager.h", "pluginmanager/widgetpluginpath.cpp", |