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

wip

This commit is contained in:
Hamed Masafi 2019-02-26 16:51:16 +03:30
parent 9782d1ff7e
commit 0857a7b165
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -13,11 +13,23 @@ compiler:
env: env:
matrix: matrix:
- QT=59 BREW=@5.9 PPA=beineri/opt-qt591-trusty - QT=59 BREW=ex PPA=beineri/opt-qt591-trusty
- QT=59 BREW=ex PPA=beineri/opt-qt592-trusty
- QT=59 BREW=ex PPA=beineri/opt-qt593-trusty
- QT=59 BREW=ex PPA=beineri/opt-qt594-trusty
- QT=59 BREW=ex PPA=beineri/opt-qt595-trusty
- QT=59 BREW=ex PPA=beineri/opt-qt596-trusty
- QT=510 BREW=ex PPA=beineri/opt-qt-5.10.1-trusty
matrix: matrix:
exclude: exclude:
- { os: osx, env: QT=58 BREW=ex PPA=beineri/opt-qt58-trusty } - { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt591-trusty }
- { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt592-trusty }
- { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt593-trusty }
- { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt594-trusty }
- { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt595-trusty }
- { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt596-trusty }
- { os: osx, env: QT=510 BREW=ex PPA=beineri/opt-qt-5.10.1-trusty }
addons: addons:
coverity_scan: coverity_scan:

2
src/phrases/conditionalphrase.h
View File

@ -24,7 +24,7 @@ public:
#ifdef Q_COMPILER_RVALUE_REFS #ifdef Q_COMPILER_RVALUE_REFS
ConditionalPhrase(const ConditionalPhrase &&other); ConditionalPhrase(const ConditionalPhrase &&other);
#endif #endif
ConditionalPhrase(const PhraseData *data); explicit 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);
ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition, const AbstractFieldPhrase &v); ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition, const AbstractFieldPhrase &v);

7
src/phrases/fieldphrase.h
View File

@ -15,9 +15,14 @@ public:
AbstractFieldPhrase(className, s) AbstractFieldPhrase(className, s)
{} {}
AssignmentPhrase operator =(const QVariant &other) { AssignmentPhrase operator =(const T &other) {
return AssignmentPhrase(this, other); return AssignmentPhrase(this, other);
} }
ConditionalPhrase operator ==(const T &other) {
return ConditionalPhrase(this, PhraseData::Equal, other);
}
}; };