feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not use deprecated Qt functionality.

Browse Source 
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.

* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.

Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Christian Kandeler
2014-08-28 17:33:47 +02:00
parent 7ba0f8a4c4
commit 1d5091e48f
76 changed files with 202 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
View File

@@ -248,7 +248,7 @@ QVariant DataModel::data(const QModelIndex &index, int role) const
QString entry = QLatin1String("<dt>%1</dt><dd>%2</dd>\n");
// body, function info first
ret += entry.arg(tr("Function:")).arg(Qt::escape(func->name()));
ret += entry.arg(tr("Function:")).arg(func->name().toHtmlEscaped());
ret += entry.arg(tr("File:")).arg(func->file());
if (!func->costItems().isEmpty()) {
const CostItem *firstItem = func->costItems().first();

4
src/plugins/valgrind/memcheckerrorview.cpp
View File

@@ -168,7 +168,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo,
if (frame.line() != -1)
path += QLatin1Char(':') + QString::number(frame.line());
path = Qt::escape(path);
path = path.toHtmlEscaped();
if (link && !f.isEmpty() && QFile::exists(fullPath)) {
// make a hyperlink label
@@ -177,7 +177,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo,
}
if (!fn.isEmpty())
return QCoreApplication::translate("Valgrind::Internal", "%1 in %2").arg(Qt::escape(fn), path);
return QCoreApplication::translate("Valgrind::Internal", "%1 in %2").arg(fn.toHtmlEscaped(), path);
if (!path.isEmpty())
return path;
return QString::fromLatin1("0x%1").arg(frame.instructionPointer(), 0, 16);