rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-31 16:52:10 +01:00
Code Issues Releases Activity

OP-1362 make_ts_errors : Revert filesearch.cpp changes (compile error). Added Q_OBJECT for xmlconfig.cpp error

Browse Source
This commit is contained in:
Laurent Lalanne 2014-08-27 01:35:09 +02:00
parent 5f3699fbaa
commit 2e5a28c5c3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/libs/utils/filesearch.cpp
View File

@ -43,19 +43,19 @@ using namespace Utils;
static inline QString msgCanceled(const QString &searchTerm, int numMatches, int numFilesSearched) static inline QString msgCanceled(const QString &searchTerm, int numMatches, int numFilesSearched)
{ {
return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: canceled. %n occurrences found in %2 files."), return QCoreApplication::translate("Utils::FileSearch", "%1: canceled. %n occurrences found in %2 files.",
0, numMatches).arg(searchTerm).arg(numFilesSearched); 0, numMatches).arg(searchTerm).arg(numFilesSearched);
} }
static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched) static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched)
{ {
return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: %n occurrences found in %2 files."), return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 files.",
0, numMatches).arg(searchTerm).arg(numFilesSearched); 0, numMatches).arg(searchTerm).arg(numFilesSearched);
} }
static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched, int filesSize) static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched, int filesSize)
{ {
return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: %n occurrences found in %2 of %3 files."), return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 of %3 files.",
0, numMatches).arg(searchTerm).arg(numFilesSearched).arg(filesSize); 0, numMatches).arg(searchTerm).arg(numFilesSearched).arg(filesSize);
} }

1
ground/openpilotgcs/src/libs/utils/xmlconfig.h
View File

@ -38,6 +38,7 @@
#include <QObject> #include <QObject>
class XMLCONFIG_EXPORT XmlConfig : QObject { class XMLCONFIG_EXPORT XmlConfig : QObject {
Q_OBJECT
public: public:
static const QSettings::Format XmlSettingsFormat; static const QSettings::Format XmlSettingsFormat;