check c++11 for move constructor
This commit is contained in:
parent
0762e647fb
commit
ace81b6fed
|
|
@ -258,11 +258,12 @@ ConditionalPhrase::ConditionalPhrase(const ConditionalPhrase &other)
|
||||||
this->data = new PhraseData(other.data);
|
this->data = new PhraseData(other.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if __cplusplus >= 201103L
|
||||||
ConditionalPhrase::ConditionalPhrase(const ConditionalPhrase &&other)
|
ConditionalPhrase::ConditionalPhrase(const ConditionalPhrase &&other)
|
||||||
{
|
{
|
||||||
qDebug() << "************* ctor called:";
|
this->data = std::move(other.data);
|
||||||
this->data = new PhraseData(other.data);
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ConditionalPhrase::ConditionalPhrase(const PhraseData *data)
|
ConditionalPhrase::ConditionalPhrase(const PhraseData *data)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,9 @@ public:
|
||||||
QSharedPointer<PhraseData> rightDataPointer;
|
QSharedPointer<PhraseData> rightDataPointer;
|
||||||
ConditionalPhrase();
|
ConditionalPhrase();
|
||||||
ConditionalPhrase(const ConditionalPhrase &other);
|
ConditionalPhrase(const ConditionalPhrase &other);
|
||||||
|
#if __cplusplus >= 201103L
|
||||||
ConditionalPhrase(const ConditionalPhrase &&other);
|
ConditionalPhrase(const ConditionalPhrase &&other);
|
||||||
|
#endif
|
||||||
ConditionalPhrase(const PhraseData *data);
|
ConditionalPhrase(const PhraseData *data);
|
||||||
ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition);
|
ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition);
|
||||||
ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition, const QVariant &v);
|
ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition, const QVariant &v);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue