From 1fee440e726cd56b42a1df36cd2fc9d8fcbbadf2 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 28 Aug 2013 11:38:33 +0200
Subject: [PATCH] QmlDesigner: Remove unused AnchorLine
Change-Id: If8b8656f821ef5b5e25a37e020ead7f9c1e15ff9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../designercore/include/anchorline.h | 118 ----------------
.../designercore/model/anchorline.cpp | 129 ------------------
2 files changed, 247 deletions(-)
delete mode 100644 src/plugins/qmldesigner/designercore/include/anchorline.h
delete mode 100644 src/plugins/qmldesigner/designercore/model/anchorline.cpp
diff --git a/src/plugins/qmldesigner/designercore/include/anchorline.h b/src/plugins/qmldesigner/designercore/include/anchorline.h
deleted file mode 100644
index ace7dc85824..00000000000
--- a/src/plugins/qmldesigner/designercore/include/anchorline.h
+++ /dev/null
@@ -1,118 +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 ANCHORLINE_H
-#define ANCHORLINE_H
-
-#include <QMetaType>
-#include <QSharedPointer>
-#include <QWeakPointer>
-#include <QVariant>
-
-#include "corelib_global.h"
-
-namespace QmlDesigner {
-
-namespace Internal {
- class ModelPrivate;
- class InternalNode;
- typedef QSharedPointer<InternalNode> InternalNodePointer;
- typedef QWeakPointer<InternalNode> InternalNodeWeakPointer;
-
- class InternalNodeAnchors;
-
- class InternalNodeState;
- typedef QSharedPointer<InternalNodeState> InternalNodeStatePointer;
- typedef QWeakPointer<InternalNodeState> InternalNodeStateWeakPointer;
-
- class TextToModelMerger;
-}
-
-class NodeAnchors;
-class ModelNode;
-class NodeState;
-class Model;
-
-class CORESHARED_EXPORT AnchorLine
-{
-public:
- friend class NodeAnchors;
- friend class Internal::InternalNodeAnchors;
- friend class Internal::ModelPrivate;
- friend class Internal::TextToModelMerger;
-
- enum Type {
- Invalid = 0x0,
- NoAnchor = Invalid,
- Left = 0x01,
- Right = 0x02,
- Top = 0x04,
- Bottom = 0x08,
- HorizontalCenter = 0x10,
- VerticalCenter = 0x20,
- Baseline = 0x40,
-
- HorizontalMask = Left | Right | HorizontalCenter,
- VerticalMask = Top | Bottom | VerticalCenter | Baseline,
- AllMask = VerticalMask | HorizontalMask
- };
-
- AnchorLine();
- AnchorLine(const NodeState &nodeState, Type type);
- ~AnchorLine();
- AnchorLine(const AnchorLine &other);
- AnchorLine &operator =(const AnchorLine &AnchorLine);
-
- ModelNode modelNode() const;
- Type type() const;
- bool isValid() const;
-
- QVariant toVariant() const;
-
-protected:
- Internal::InternalNodeStatePointer internalNodeState() const;
- Internal::InternalNodePointer internalNode() const;
-
-private:
- AnchorLine(const Internal::InternalNodeStatePointer &internalNodeState,
- const Internal::InternalNodePointer &internalNode,
- Model* model,
- Type type);
-
- Internal::InternalNodeStateWeakPointer m_internalNodeState;
- Internal::InternalNodeWeakPointer m_internalNode;
- QWeakPointer<Model> m_model;
- Type m_anchorType;
-};
-
-} // namespace QmlDesigner
-
-Q_DECLARE_METATYPE(QmlDesigner::AnchorLine);
-
-#endif // ANCHORLINE_H
diff --git a/src/plugins/qmldesigner/designercore/model/anchorline.cpp b/src/plugins/qmldesigner/designercore/model/anchorline.cpp
deleted file mode 100644
index 25636474366..00000000000
--- a/src/plugins/qmldesigner/designercore/model/anchorline.cpp
+++ /dev/null
@@ -1,129 +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 "anchorline.h"
-#include "model.h"
-#include "internalnode_p.h"
-#include "modelnode.h"
-
-namespace QmlDesigner {
-
-AnchorLine::AnchorLine()
- : m_anchorType(Invalid)
-{
-}
-
-AnchorLine::AnchorLine(const Internal::InternalNodeStatePointer &internalNodeState,
- const Internal::InternalNodePointer &internalNode,
- Model* model,
- Type type)
- : m_internalNodeState(internalNodeState),
- m_internalNode(internalNode),
- m_model(model),
- m_anchorType(type)
-{
-}
-
-AnchorLine::AnchorLine(const NodeState &nodeState,
- Type type)
- : m_internalNodeState(nodeState.internalNodeState()),
- m_internalNode(nodeState.internalNode()),
- m_model(nodeState.model()),
- m_anchorType(type)
-{
-
-}
-
-AnchorLine::~AnchorLine()
-{
-}
-
-AnchorLine::AnchorLine(const AnchorLine &other)
- : m_internalNodeState(other.m_internalNodeState),
- m_internalNode(other.m_internalNode),
- m_model(other.m_model),
- m_anchorType(other.m_anchorType)
-{
-}
-
-AnchorLine &AnchorLine::operator =(const AnchorLine &other)
-{
- m_internalNodeState = other.m_internalNodeState;
- m_internalNode = other.m_internalNode;
- m_model = other.m_model;
- m_anchorType = other.m_anchorType;
-
- return *this;
-}
-
-ModelNode AnchorLine::modelNode() const
-{
- if (m_internalNode.isNull() || m_internalNodeState.isNull() || m_model.isNull())
- return ModelNode();
- return ModelNode(m_internalNode, m_model.data());
-}
-
-
-AnchorLine::Type AnchorLine::type() const
-{
- return m_anchorType;
-}
-
-bool AnchorLine::isValid() const
-{
- return m_anchorType != Invalid &&
- !m_model.isNull() &&
- !m_internalNode.isNull() &&
- !m_internalNodeState.isNull() &&
- m_internalNode.toStrongRef()->isValid() &&
- m_internalNodeState.toStrongRef()->isValid();
-}
-
-QVariant AnchorLine::toVariant() const
-{
- return QVariant::fromValue(*this);
-}
-
-Internal::InternalNodeStatePointer AnchorLine::internalNodeState() const
-{
- if (m_internalNodeState.isNull())
- return Internal::InternalNodeStatePointer(new Internal::InternalNodeState);
-
- return m_internalNodeState.toStrongRef();
-}
-
-Internal::InternalNodePointer AnchorLine::internalNode() const
-{
- if (m_internalNode.isNull())
- return Internal::InternalNodePointer(new Internal::InternalNode);
-
- return m_internalNode.toStrongRef();
-}
-
-} // namespace QmlDesigner
--
GitLab