From c6fc46403cf1dd26aeca8925cf55c1bba612b73a Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Thu, 28 Aug 2014 00:11:46 +0200 Subject: [PATCH] OP-1362 make_ts_errors Better fix, replace 0 with NULL and no more 'make ts' error. Tks Filnet --- .../openpilotgcs/src/libs/utils/filesearch.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ground/openpilotgcs/src/libs/utils/filesearch.cpp b/ground/openpilotgcs/src/libs/utils/filesearch.cpp index 1e7d508ef..0c3249104 100644 --- a/ground/openpilotgcs/src/libs/utils/filesearch.cpp +++ b/ground/openpilotgcs/src/libs/utils/filesearch.cpp @@ -43,20 +43,26 @@ using namespace Utils; static inline QString msgCanceled(const QString &searchTerm, int numMatches, int numFilesSearched) { - return QCoreApplication::translate("Utils::FileSearch", "%1: canceled. %n occurrences found in %2 files.") - .arg(searchTerm).arg(numMatches).arg(numFilesSearched); + return QCoreApplication::translate("Utils::FileSearch", + "%1: canceled. %n occurrences found in %2 files.", + NULL, numMatches). + arg(searchTerm).arg(numFilesSearched); } static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched) { - return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 files.") - .arg(searchTerm).arg(numMatches).arg(numFilesSearched); + return QCoreApplication::translate("Utils::FileSearch", + "%1: %n occurrences found in %2 files.", + NULL, numMatches). + arg(searchTerm).arg(numFilesSearched); } static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched, int filesSize) { - return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 of %3 files.") - .arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(filesSize); + return QCoreApplication::translate("Utils::FileSearch", + "%1: %n occurrences found in %2 of %3 files.", + NULL, numMatches). + arg(searchTerm).arg(numFilesSearched).arg(filesSize); } namespace {