feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: I273a1e8f5f9e54756befbc398c2c2754534ff128
This commit is contained in:
Eike Ziller
2019-08-09 09:43:16 +02:00
parent c54db06a50 98d454d58b
commit a81c1aab2c
59 changed files with 2243 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
View File

@@ -34,7 +34,7 @@
#include <QSharedPointer>
#include <QWeakPointer>
#include "enumeration.h"
#include <enumeration.h>
QT_BEGIN_NAMESPACE
class QQmlContext;

116
share/qtcreator/qml/qmlpuppet/types/enumeration.cpp
View File

@@ -1,116 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** 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 The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "enumeration.h"
#include <QString>
#include <QList>
#include <QtDebug>
namespace QmlDesigner {
Enumeration::Enumeration() = default;
Enumeration::Enumeration(const EnumerationName &enumerationName)
: m_enumerationName(enumerationName)
{
}
Enumeration::Enumeration(const QString &enumerationName)
: m_enumerationName(enumerationName.toUtf8())
{
}
Enumeration::Enumeration(const QString &scope, const QString &name)
{
QString enumerationString = scope + QLatin1Char('.') + name;
m_enumerationName = enumerationString.toUtf8();
}
QmlDesigner::EnumerationName QmlDesigner::Enumeration::scope() const
{
return m_enumerationName.split('.').constFirst();
}
EnumerationName Enumeration::name() const
{
return m_enumerationName.split('.').last();
}
EnumerationName Enumeration::toEnumerationName() const
{
return m_enumerationName;
}
QString Enumeration::toString() const
{
return QString::fromUtf8(m_enumerationName);
}
QString Enumeration::nameToString() const
{
return QString::fromUtf8(name());
}
QDataStream &operator<<(QDataStream &out, const Enumeration &enumeration)
{
out << enumeration.toEnumerationName();
return out;
}
QDataStream &operator>>(QDataStream &in, Enumeration &enumeration)
{
in >> enumeration.m_enumerationName;
return in;
}
bool operator ==(const Enumeration &first, const Enumeration &second)
{
return first.m_enumerationName == second.m_enumerationName;
}
bool operator <(const Enumeration &first, const Enumeration &second)
{
return first.m_enumerationName < second.m_enumerationName;
}
QDebug operator <<(QDebug debug, const Enumeration &enumeration)
{
debug.nospace() << "Enumeration("
<< enumeration.toString()
<< ")";
return debug;
}
} // namespace QmlDesigner

78
share/qtcreator/qml/qmlpuppet/types/enumeration.h
View File

@@ -30,6 +30,10 @@
#include <QMetaType>
#include <QVariant>
#include <QString>
#include <QList>
#include <QtDebug>
namespace QmlDesigner {
using EnumerationName = QByteArray;
@@ -41,29 +45,75 @@ class Enumeration
friend QDataStream &operator>>(QDataStream &in, Enumeration &enumeration);
public:
Enumeration();
Enumeration(const EnumerationName &enumerationName);
Enumeration(const QString &enumerationName);
Enumeration(const QString &scope, const QString &name);
Enumeration() = default;
Enumeration(const EnumerationName &enumerationName)
: m_enumerationName(enumerationName)
{
}
Enumeration(const QString &enumerationName)
: m_enumerationName(enumerationName.toUtf8())
{
}
Enumeration(const QString &scope, const QString &name)
{
QString enumerationString = scope + QLatin1Char('.') + name;
m_enumerationName = enumerationString.toUtf8();
}
EnumerationName scope() const;
EnumerationName name() const;
EnumerationName toEnumerationName() const;
QString toString() const;
QString nameToString() const;
EnumerationName scope() const
{
return m_enumerationName.split('.').constFirst();
}
EnumerationName name() const
{
return m_enumerationName.split('.').last();
}
EnumerationName toEnumerationName() const
{
return m_enumerationName;
}
QString toString() const
{
return QString::fromUtf8(m_enumerationName);
}
QString nameToString() const
{
return QString::fromUtf8(name());
}
private:
EnumerationName m_enumerationName;
};
QDataStream &operator<<(QDataStream &out, const Enumeration &enumeration);
QDataStream &operator>>(QDataStream &in, Enumeration &enumeration);
inline QDataStream &operator<<(QDataStream &out, const Enumeration &enumeration){
out << enumeration.toEnumerationName();
return out;
}
bool operator ==(const Enumeration &first, const Enumeration &second);
bool operator <(const Enumeration &first, const Enumeration &second);
inline QDataStream &operator>>(QDataStream &in, Enumeration &enumeration)
{
in >> enumeration.m_enumerationName;
return in;
}
QDebug operator <<(QDebug debug, const Enumeration &enumeration);
inline bool operator==(const Enumeration &first, const Enumeration &second)
{
return first.m_enumerationName == second.m_enumerationName;
}
inline bool operator<(const Enumeration &first, const Enumeration &second)
{
return first.m_enumerationName < second.m_enumerationName;
}
inline QDebug operator <<(QDebug debug, const Enumeration &enumeration)
{
debug.nospace() << "Enumeration("
<< enumeration.toString()
<< ")";
return debug;
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/types/types.pri
View File

@@ -1,5 +1,3 @@
INCLUDEPATH += $$PWD/
HEADERS += $$PWD/enumeration.h
SOURCES += $$PWD/enumeration.cpp