CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phrase compiler check macro

This commit is contained in:
Hamed Masafi 2018-02-19 18:20:15 +03:30
parent 56d8e3e6f7
commit 103cb49214
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phrase.cpp
View File

@ -266,11 +266,13 @@ ConditionalPhrase::ConditionalPhrase(const ConditionalPhrase &other)
// const_cast<ConditionalPhrase&>(other).data = 0; // const_cast<ConditionalPhrase&>(other).data = 0;
} }
#ifdef Q_COMPILER_RVALUE_REFS
ConditionalPhrase::ConditionalPhrase(const ConditionalPhrase &&other) ConditionalPhrase::ConditionalPhrase(const ConditionalPhrase &&other)
{ {
qDebug() << "************* ctor called:"; qDebug() << "************* ctor called:";
this->data = qMove(other.data); this->data = qMove(other.data);
} }
#endif
ConditionalPhrase::ConditionalPhrase(const PhraseData *data) ConditionalPhrase::ConditionalPhrase(const PhraseData *data)
{ {

7
src/phrase.h
View File

@ -66,9 +66,6 @@ public:
And = 20, And = 20,
Or, Or,
// Append,
// Set,
Add, Add,
Minus, Minus,
Multiple, Multiple,
@ -161,7 +158,9 @@ public:
QSharedPointer<PhraseData> rightDataPointer; QSharedPointer<PhraseData> rightDataPointer;
ConditionalPhrase(); ConditionalPhrase();
ConditionalPhrase(const ConditionalPhrase &other); ConditionalPhrase(const ConditionalPhrase &other);
#ifdef Q_COMPILER_RVALUE_REFS
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);
@ -205,7 +204,7 @@ public:
return ConditionalPhrase(this, PhraseData::In, vlist); return ConditionalPhrase(this, PhraseData::In, vlist);
} }
#if __cplusplus >= 201103L #ifdef Q_COMPILER_INITIALIZER_LISTS
ConditionalPhrase in(std::initializer_list<int> list) { ConditionalPhrase in(std::initializer_list<int> list) {
QVariantList vlist; QVariantList vlist;
std::initializer_list<int>::iterator it; std::initializer_list<int>::iterator it;