From 9be93b6962eab05ba74d992a5c822388398aa511 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 27 Jul 2015 14:49:17 +0200 Subject: [PATCH] Still use 0 instead of nullptr in numerous forms of tr(). Looks like lupdate isn't prepared yet for nullptr. Change-Id: I8341d6b11c63871b4d2240dd184228f53dcbf35c Reviewed-by: Friedemann Kleint --- src/plugins/debugger/debuggerprotocol.cpp | 4 ++-- src/plugins/texteditor/basefilefind.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp index 824edc6473f..ad0f9e86595 100644 --- a/src/plugins/debugger/debuggerprotocol.cpp +++ b/src/plugins/debugger/debuggerprotocol.cpp @@ -741,10 +741,10 @@ QString decodeData(const QByteArray &ba, int encoding) return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); } case SpecialItemCountValue: { - return QCoreApplication::translate("Debugger::Internal::WatchHandler", "<%n items>", nullptr, ba.toInt()); + return QCoreApplication::translate("Debugger::Internal::WatchHandler", "<%n items>", 0, ba.toInt()); } case SpecialMinimumItemCountValue: { - return QCoreApplication::translate("Debugger::Internal::WatchHandler", "", nullptr, ba.toInt()); + return QCoreApplication::translate("Debugger::Internal::WatchHandler", "", 0, ba.toInt()); } case SpecialNotCallableValue: { return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 0bbdf16d9d5..ff6b4e3d6b1 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -210,7 +210,7 @@ void BaseFileFind::doReplace(const QString &text, QStringList files = replaceAll(text, items, preserveCase); if (!files.isEmpty()) { Utils::FadingIndicator::showText(ICore::mainWindow(), - tr("%n occurrences replaced.", nullptr, items.size()), + tr("%n occurrences replaced.", 0, items.size()), Utils::FadingIndicator::SmallText); DocumentManager::notifyFilesChangedInternally(files); SearchResultWindow::instance()->hide();