forked from qt-creator/qt-creator
Replace all remaining functions deprecated in Qt 5, if possible.
These are:
- QInputDialog::getInteger() [-> getInt()]
- QKeySequence::operator QString() [-> toString()]
- QRegion::intersect() [-> intersected()]
- qVariantCanConvert() [-> QVariant::canConvert()]
Plus some left-over occurrences of qFindChild() and
QAbstractItemModel::reset() that were missed by the
respective earlier patches.
All deprecated features still left are not trivially
replaceable, i.e. the code using them cannot be made
to compile with both Qt 4 and Qt 5.
Change-Id: I32541681bbf66b0fef78f5c7025521f9ff84f463
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -186,8 +186,9 @@ void RemoteModel::clear()
|
||||
{
|
||||
if (m_remotes.isEmpty())
|
||||
return;
|
||||
beginResetModel();
|
||||
m_remotes.clear();
|
||||
reset();
|
||||
endResetModel();
|
||||
}
|
||||
|
||||
bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage)
|
||||
@@ -200,6 +201,7 @@ bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage
|
||||
return false;
|
||||
// Parse output
|
||||
m_workingDirectory = workingDirectory;
|
||||
beginResetModel();
|
||||
m_remotes.clear();
|
||||
const QStringList lines = output.split(QLatin1Char('\n'));
|
||||
for (int r = 0; r < lines.count(); ++r) {
|
||||
@@ -207,7 +209,7 @@ bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage
|
||||
if (newRemote.parse(lines.at(r)))
|
||||
m_remotes.push_back(newRemote);
|
||||
}
|
||||
reset();
|
||||
endResetModel();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user