forked from qt-creator/qt-creator
QmlDesigner.NodeInstances: Share NodeInstanceClientProxy between puppets
Change-Id: I49ffa49e45d12950150bedfa8452de4c89674ef8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
5
share/qtcreator/qml/qmlpuppet/instances/instances.pri
Normal file
5
share/qtcreator/qml/qmlpuppet/instances/instances.pri
Normal file
@@ -0,0 +1,5 @@
|
||||
INCLUDEPATH += $$PWD/
|
||||
|
||||
HEADERS += $$PWD/nodeinstanceclientproxy.h
|
||||
|
||||
SOURCES += $$PWD/nodeinstanceclientproxy.cpp
|
||||
@@ -11,7 +11,6 @@ HEADERS += $$PWD/dummycontextobject.h
|
||||
HEADERS += $$PWD/childrenchangeeventfilter.h
|
||||
HEADERS += $$PWD/componentnodeinstance.h
|
||||
HEADERS += $$PWD/dummynodeinstance.h
|
||||
HEADERS += $$PWD/nodeinstanceclientproxy.h
|
||||
HEADERS += $$PWD/nodeinstancemetaobject.h
|
||||
HEADERS += $$PWD/nodeinstanceserver.h
|
||||
HEADERS += $$PWD/nodeinstancesignalspy.h
|
||||
@@ -33,7 +32,6 @@ SOURCES += $$PWD/dummycontextobject.cpp
|
||||
SOURCES += $$PWD/childrenchangeeventfilter.cpp
|
||||
SOURCES += $$PWD/componentnodeinstance.cpp
|
||||
SOURCES += $$PWD/dummynodeinstance.cpp
|
||||
SOURCES += $$PWD/nodeinstanceclientproxy.cpp
|
||||
SOURCES += $$PWD/nodeinstancemetaobject.cpp
|
||||
SOURCES += $$PWD/nodeinstanceserver.cpp
|
||||
SOURCES += $$PWD/nodeinstancesignalspy.cpp
|
||||
|
||||
@@ -15,6 +15,7 @@ include(../../../../../qtcreator.pri)
|
||||
DESTDIR = $$[QT_INSTALL_BINS]
|
||||
include(../../../../../src/rpath.pri)
|
||||
|
||||
include (../instances/instances.pri)
|
||||
include (instances/instances.pri)
|
||||
include (../commands/commands.pri)
|
||||
include (../container/container.pri)
|
||||
|
||||
@@ -13,7 +13,6 @@ HEADERS += $$PWD/dummycontextobject.h
|
||||
HEADERS += $$PWD/childrenchangeeventfilter.h
|
||||
HEADERS += $$PWD/componentnodeinstance.h
|
||||
HEADERS += $$PWD/dummynodeinstance.h
|
||||
HEADERS += $$PWD/nodeinstanceclientproxy.h
|
||||
HEADERS += $$PWD/nodeinstancemetaobject.h
|
||||
HEADERS += $$PWD/nodeinstanceserver.h
|
||||
HEADERS += $$PWD/nodeinstancesignalspy.h
|
||||
@@ -37,7 +36,6 @@ SOURCES += $$PWD/dummycontextobject.cpp
|
||||
SOURCES += $$PWD/childrenchangeeventfilter.cpp
|
||||
SOURCES += $$PWD/componentnodeinstance.cpp
|
||||
SOURCES += $$PWD/dummynodeinstance.cpp
|
||||
SOURCES += $$PWD/nodeinstanceclientproxy.cpp
|
||||
SOURCES += $$PWD/nodeinstancemetaobject.cpp
|
||||
SOURCES += $$PWD/nodeinstanceserver.cpp
|
||||
SOURCES += $$PWD/nodeinstancesignalspy.cpp
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
||||
**
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
**
|
||||
** 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, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** Other Usage
|
||||
**
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef NODEINSTANCECLIENTPROXY_H
|
||||
#define NODEINSTANCECLIENTPROXY_H
|
||||
|
||||
#include "nodeinstanceclientinterface.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QWeakPointer>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QLocalSocket;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace QmlDesigner {
|
||||
|
||||
class NodeInstanceServerInterface;
|
||||
class CreateSceneCommand;
|
||||
class CreateInstancesCommand;
|
||||
class ClearSceneCommand;
|
||||
class ReparentInstancesCommand;
|
||||
class ChangeFileUrlCommand;
|
||||
class ChangeValuesCommand;
|
||||
class ChangeAuxiliaryCommand;
|
||||
class ChangeBindingsCommand;
|
||||
class ChangeIdsCommand;
|
||||
class RemoveInstancesCommand;
|
||||
class RemovePropertiesCommand;
|
||||
class CompleteComponentCommand;
|
||||
class ChangeStateCommand;
|
||||
class ChangeNodeSourceCommand;
|
||||
|
||||
|
||||
class NodeInstanceClientProxy : public QObject, public NodeInstanceClientInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
NodeInstanceClientProxy(QObject *parent = 0);
|
||||
|
||||
void informationChanged(const InformationChangedCommand &command);
|
||||
void valuesChanged(const ValuesChangedCommand &command);
|
||||
void pixmapChanged(const PixmapChangedCommand &command);
|
||||
void childrenChanged(const ChildrenChangedCommand &command);
|
||||
void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command);
|
||||
void componentCompleted(const ComponentCompletedCommand &command);
|
||||
void token(const TokenCommand &command);
|
||||
|
||||
void flush();
|
||||
void synchronizeWithClientProcess();
|
||||
qint64 bytesToWrite() const;
|
||||
|
||||
protected:
|
||||
void initializeSocket();
|
||||
void writeCommand(const QVariant &command);
|
||||
void dispatchCommand(const QVariant &command);
|
||||
NodeInstanceServerInterface *nodeInstanceServer() const;
|
||||
void setNodeInstanceServer(NodeInstanceServerInterface *nodeInstanceServer);
|
||||
|
||||
void createInstances(const CreateInstancesCommand &command);
|
||||
void changeFileUrl(const ChangeFileUrlCommand &command);
|
||||
void createScene(const CreateSceneCommand &command);
|
||||
void clearScene(const ClearSceneCommand &command);
|
||||
void removeInstances(const RemoveInstancesCommand &command);
|
||||
void removeProperties(const RemovePropertiesCommand &command);
|
||||
void changePropertyBindings(const ChangeBindingsCommand &command);
|
||||
void changePropertyValues(const ChangeValuesCommand &command);
|
||||
void changeAuxiliaryValues(const ChangeAuxiliaryCommand &command);
|
||||
void reparentInstances(const ReparentInstancesCommand &command);
|
||||
void changeIds(const ChangeIdsCommand &command);
|
||||
void changeState(const ChangeStateCommand &command);
|
||||
void completeComponent(const CompleteComponentCommand &command);
|
||||
void changeNodeSource(const ChangeNodeSourceCommand &command);
|
||||
void removeSharedMemory(const RemoveSharedMemoryCommand &command);
|
||||
void redirectToken(const TokenCommand &command);
|
||||
|
||||
private slots:
|
||||
void readDataStream();
|
||||
|
||||
private:
|
||||
QLocalSocket *m_socket;
|
||||
NodeInstanceServerInterface *m_nodeInstanceServer;
|
||||
quint32 m_blockSize;
|
||||
quint32 m_writeCommandCounter;
|
||||
quint32 m_lastReadCommandCounter;
|
||||
int m_synchronizeId;
|
||||
};
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
#endif // NODEINSTANCECLIENTPROXY_H
|
||||
@@ -16,6 +16,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
|
||||
DEFINES += QWEAKPOINTER_ENABLE_ARROW
|
||||
|
||||
include (../instances/instances.pri)
|
||||
include (instances/instances.pri)
|
||||
include (../commands/commands.pri)
|
||||
include (../container/container.pri)
|
||||
|
||||
Reference in New Issue
Block a user