Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-21 06:10:16 +08:00
Code Issues Projects Releases Wiki Activity

QCMakeCacheView: use non-deprecated List and Set constructions

Browse Source
This commit is contained in:
Ben Boeckel
2020-06-10 16:14:46 -04:00
parent 973fc56020
commit d7679f6427
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/QtDialog/QCMakeCacheView.cxx
View File

@@ -217,14 +217,27 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
QSet<QCMakeProperty> newProps2; QSet<QCMakeProperty> newProps2;
if (this->ShowNewProperties) { if (this->ShowNewProperties) {
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
newProps = props.toSet(); newProps = props.toSet();
#else
newProps = QSet(props.begin(), props.end());
#endif
newProps2 = newProps; newProps2 = newProps;
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QSet<QCMakeProperty> oldProps = this->properties().toSet(); QSet<QCMakeProperty> oldProps = this->properties().toSet();
#else
QSet<QCMakeProperty> oldProps =
QSet(this->properties().begin(), this->properties().end());
#endif
oldProps.intersect(newProps); oldProps.intersect(newProps);
newProps.subtract(oldProps); newProps.subtract(oldProps);
newProps2.subtract(newProps); newProps2.subtract(newProps);
} else { } else {
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
newProps2 = props.toSet(); newProps2 = props.toSet();
#else
newProps2 = QSet(props.begin(), props.end());
#endif
} }
bool b = this->blockSignals(true); bool b = this->blockSignals(true);
@@ -233,8 +246,8 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
this->NewPropertyCount = newProps.size(); this->NewPropertyCount = newProps.size();
if (View == FlatView) { if (View == FlatView) {
QCMakePropertyList newP = newProps.toList(); QCMakePropertyList newP = newProps.values();
QCMakePropertyList newP2 = newProps2.toList(); QCMakePropertyList newP2 = newProps2.values();
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
std::sort(newP.begin(), newP.end()); std::sort(newP.begin(), newP.end());
std::sort(newP2.begin(), newP2.end()); std::sort(newP2.begin(), newP2.end());