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

QtDialog: avoid using deprecated APIs

Browse Source
This commit is contained in:
Ben Boeckel
2020-06-01 08:00:25 -04:00
parent 6950706ca0
commit 44f1744bed
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/QtDialog/CMakeSetupDialog.cxx
View File

@@ -595,7 +595,11 @@ void CMakeSetupDialog::doHelp()
QDialog dialog; QDialog dialog;
QFontMetrics met(this->font()); QFontMetrics met(this->font());
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
int msgWidth = met.horizontalAdvance(msg);
#else
int msgWidth = met.width(msg); int msgWidth = met.width(msg);
#endif
dialog.setMinimumSize(msgWidth / 15, 20); dialog.setMinimumSize(msgWidth / 15, 20);
dialog.setWindowTitle(tr("Help")); dialog.setWindowTitle(tr("Help"));
QVBoxLayout* l = new QVBoxLayout(&dialog); QVBoxLayout* l = new QVBoxLayout(&dialog);

43
Source/QtDialog/QCMakeCacheView.cxx
View File

@@ -209,6 +209,10 @@ void QCMakeCacheModel::clear()
void QCMakeCacheModel::setProperties(const QCMakePropertyList& props) void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
this->beginResetModel();
#endif
QSet<QCMakeProperty> newProps; QSet<QCMakeProperty> newProps;
QSet<QCMakeProperty> newProps2; QSet<QCMakeProperty> newProps2;
@@ -231,8 +235,13 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
if (View == FlatView) { if (View == FlatView) {
QCMakePropertyList newP = newProps.toList(); QCMakePropertyList newP = newProps.toList();
QCMakePropertyList newP2 = newProps2.toList(); QCMakePropertyList newP2 = newProps2.toList();
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
std::sort(newP.begin(), newP.end());
std::sort(newP2.begin(), newP2.end());
#else
qSort(newP); qSort(newP);
qSort(newP2); qSort(newP2);
#endif
int row_count = 0; int row_count = 0;
foreach (QCMakeProperty const& p, newP) { foreach (QCMakeProperty const& p, newP) {
this->insertRow(row_count); this->insertRow(row_count);
@@ -262,10 +271,17 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
parentItems.append( parentItems.append(
new QStandardItem(key.isEmpty() ? tr("Ungrouped Entries") : key)); new QStandardItem(key.isEmpty() ? tr("Ungrouped Entries") : key));
parentItems.append(new QStandardItem()); parentItems.append(new QStandardItem());
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
parentItems[0]->setData(QBrush(QColor(255, 100, 100)),
Qt::BackgroundRole);
parentItems[1]->setData(QBrush(QColor(255, 100, 100)),
Qt::BackgroundRole);
#else
parentItems[0]->setData(QBrush(QColor(255, 100, 100)), parentItems[0]->setData(QBrush(QColor(255, 100, 100)),
Qt::BackgroundColorRole); Qt::BackgroundColorRole);
parentItems[1]->setData(QBrush(QColor(255, 100, 100)), parentItems[1]->setData(QBrush(QColor(255, 100, 100)),
Qt::BackgroundColorRole); Qt::BackgroundColorRole);
#endif
parentItems[0]->setData(1, GroupRole); parentItems[0]->setData(1, GroupRole);
parentItems[1]->setData(1, GroupRole); parentItems[1]->setData(1, GroupRole);
root->appendRow(parentItems); root->appendRow(parentItems);
@@ -305,7 +321,11 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
} }
this->blockSignals(b); this->blockSignals(b);
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
this->endResetModel();
#else
this->reset(); this->reset();
#endif
} }
QCMakeCacheModel::ViewType QCMakeCacheModel::viewType() const QCMakeCacheModel::ViewType QCMakeCacheModel::viewType() const
@@ -315,6 +335,10 @@ QCMakeCacheModel::ViewType QCMakeCacheModel::viewType() const
void QCMakeCacheModel::setViewType(QCMakeCacheModel::ViewType t) void QCMakeCacheModel::setViewType(QCMakeCacheModel::ViewType t)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
this->beginResetModel();
#endif
this->View = t; this->View = t;
QCMakePropertyList props = this->properties(); QCMakePropertyList props = this->properties();
@@ -330,7 +354,11 @@ void QCMakeCacheModel::setViewType(QCMakeCacheModel::ViewType t)
this->setProperties(oldProps); this->setProperties(oldProps);
this->setProperties(props); this->setProperties(props);
this->blockSignals(b); this->blockSignals(b);
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
this->endResetModel();
#else
this->reset(); this->reset();
#endif
} }
void QCMakeCacheModel::setPropertyData(const QModelIndex& idx1, void QCMakeCacheModel::setPropertyData(const QModelIndex& idx1,
@@ -356,10 +384,15 @@ void QCMakeCacheModel::setPropertyData(const QModelIndex& idx1,
} }
if (isNew) { if (isNew) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
this->setData(idx1, QBrush(QColor(255, 100, 100)), Qt::BackgroundRole);
this->setData(idx2, QBrush(QColor(255, 100, 100)), Qt::BackgroundRole);
#else
this->setData(idx1, QBrush(QColor(255, 100, 100)), this->setData(idx1, QBrush(QColor(255, 100, 100)),
Qt::BackgroundColorRole); Qt::BackgroundColorRole);
this->setData(idx2, QBrush(QColor(255, 100, 100)), this->setData(idx2, QBrush(QColor(255, 100, 100)),
Qt::BackgroundColorRole); Qt::BackgroundColorRole);
#endif
} }
} }
@@ -409,7 +442,11 @@ void QCMakeCacheModel::breakProperties(
reorgProps.append((*iter)[0]); reorgProps.append((*iter)[0]);
iter = tmp.erase(iter); iter = tmp.erase(iter);
} else { } else {
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
std::sort(iter->begin(), iter->end());
#else
qSort(*iter); qSort(*iter);
#endif
++iter; ++iter;
} }
} }
@@ -639,9 +676,15 @@ QSize QCMakeCacheModelDelegate::sizeHint(const QStyleOptionViewItem& option,
// increase to checkbox size // increase to checkbox size
QStyleOptionButton opt; QStyleOptionButton opt;
opt.QStyleOption::operator=(option); opt.QStyleOption::operator=(option);
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
sz = sz.expandedTo(
style->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &opt, nullptr)
.size());
#else
sz = sz.expandedTo( sz = sz.expandedTo(
style->subElementRect(QStyle::SE_ViewItemCheckIndicator, &opt, nullptr) style->subElementRect(QStyle::SE_ViewItemCheckIndicator, &opt, nullptr)
.size()); .size());
#endif
return sz; return sz;
} }