From 5f3699fbaac287003575960fa55846f38d849421 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Tue, 26 Aug 2014 23:30:57 +0200 Subject: [PATCH 1/4] OP-1362 make_ts_errors Fix for 'make ts' errors. Still two errors, with one to fix (xmlconfig.cpp:61: Class 'XmlConfig' lacks Q_OBJECT macro) --- .../experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp | 2 +- .../experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp | 2 +- .../libs/eigen/test/eigen2/eigen2_geometry.cpp | 2 +- .../eigen2_geometry_with_eigen2_prefix.cpp | 2 +- .../openpilotgcs/src/libs/utils/filesearch.cpp | 18 ++++++------------ .../src/plugins/uploader/SSP/qssp.cpp | 2 +- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp index aadd01330..7944449ed 100644 --- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp +++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp @@ -21,7 +21,7 @@ // Make larger sized integers from smaller sized integers #define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb)) #define MAKEWORD32(uw, lw) ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw))) -#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)) +#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))) // Used to extract smaller integers from larger sized intergers diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp index 385178312..03d6dc89f 100644 --- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp +++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp @@ -91,7 +91,7 @@ // Make larger sized integers from smaller sized integers #define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb)) #define MAKEWORD32(uw, lw) ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw))) -#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)) +#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))) // Used to extract smaller integers from larger sized intergers diff --git a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp index 70b4ab5f1..faf1d7fdb 100644 --- a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp +++ b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp @@ -147,7 +147,7 @@ template void geometry(void) t1.setIdentity(); t1.linear() = q1.toRotationMatrix(); - v0 << 50, 2, 1;//= ei_random_matrix().cwiseProduct(Vector3(10,2,0.5)); + v0 << 50, 2, 1; // = ei_random_matrix().cwiseProduct(Vector3(10,2,0.5)); t0.scale(v0); t1.prescale(v0); diff --git a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp index f83b57249..9ff9f4026 100644 --- a/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp +++ b/ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp @@ -149,7 +149,7 @@ template void geometry(void) t1.setIdentity(); t1.linear() = q1.toRotationMatrix(); - v0 << 50, 2, 1;//= ei_random_matrix().cwiseProduct(Vector3(10,2,0.5)); + v0 << 50, 2, 1; // = ei_random_matrix().cwiseProduct(Vector3(10,2,0.5)); t0.scale(v0); t1.prescale(v0); diff --git a/ground/openpilotgcs/src/libs/utils/filesearch.cpp b/ground/openpilotgcs/src/libs/utils/filesearch.cpp index 8a40e96c7..53b43a296 100644 --- a/ground/openpilotgcs/src/libs/utils/filesearch.cpp +++ b/ground/openpilotgcs/src/libs/utils/filesearch.cpp @@ -43,26 +43,20 @@ 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.", - 0, numMatches). - arg(searchTerm).arg(numFilesSearched); + return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: canceled. %n occurrences found in %2 files."), + 0, 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.", - 0, numMatches). - arg(searchTerm).arg(numFilesSearched); + return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: %n occurrences found in %2 files."), + 0, 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.", - 0, numMatches). - arg(searchTerm).arg(numFilesSearched).arg(filesSize); + return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: %n occurrences found in %2 of %3 files."), + 0, numMatches).arg(searchTerm).arg(numFilesSearched).arg(filesSize); } namespace { diff --git a/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp b/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp index 517772ad9..3c68b0449 100644 --- a/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp @@ -47,7 +47,7 @@ // Make larger sized integers from smaller sized integers #define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb)) #define MAKEWORD32(uw, lw) ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw))) -#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)) +#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))) // Used to extract smaller integers from larger sized intergers From 2e5a28c5c3cf365a01381ea0b2cda0b863c39a6d Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Wed, 27 Aug 2014 01:35:09 +0200 Subject: [PATCH 2/4] OP-1362 make_ts_errors : Revert filesearch.cpp changes (compile error). Added Q_OBJECT for xmlconfig.cpp error --- ground/openpilotgcs/src/libs/utils/filesearch.cpp | 6 +++--- ground/openpilotgcs/src/libs/utils/xmlconfig.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/libs/utils/filesearch.cpp b/ground/openpilotgcs/src/libs/utils/filesearch.cpp index 53b43a296..ff7df5072 100644 --- a/ground/openpilotgcs/src/libs/utils/filesearch.cpp +++ b/ground/openpilotgcs/src/libs/utils/filesearch.cpp @@ -43,19 +43,19 @@ using namespace Utils; 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); } 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); } 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); } diff --git a/ground/openpilotgcs/src/libs/utils/xmlconfig.h b/ground/openpilotgcs/src/libs/utils/xmlconfig.h index 98345e38d..0f92f0060 100644 --- a/ground/openpilotgcs/src/libs/utils/xmlconfig.h +++ b/ground/openpilotgcs/src/libs/utils/xmlconfig.h @@ -38,6 +38,7 @@ #include class XMLCONFIG_EXPORT XmlConfig : QObject { + Q_OBJECT public: static const QSettings::Format XmlSettingsFormat; From 2202bbc7aa3983ad1d48dbaee20c78bc269efeb9 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Wed, 27 Aug 2014 23:48:51 +0200 Subject: [PATCH 3/4] OP-1362_make_ts_errors : Fix the last real error (filesearch.cpp) --- ground/openpilotgcs/src/libs/utils/filesearch.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ground/openpilotgcs/src/libs/utils/filesearch.cpp b/ground/openpilotgcs/src/libs/utils/filesearch.cpp index ff7df5072..1e7d508ef 100644 --- a/ground/openpilotgcs/src/libs/utils/filesearch.cpp +++ b/ground/openpilotgcs/src/libs/utils/filesearch.cpp @@ -43,20 +43,20 @@ 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.", - 0, numMatches).arg(searchTerm).arg(numFilesSearched); + return QCoreApplication::translate("Utils::FileSearch", "%1: canceled. %n occurrences found in %2 files.") + .arg(searchTerm).arg(numMatches).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.", - 0, numMatches).arg(searchTerm).arg(numFilesSearched); + return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 files.") + .arg(searchTerm).arg(numMatches).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.", - 0, numMatches).arg(searchTerm).arg(numFilesSearched).arg(filesSize); + return QCoreApplication::translate("Utils::FileSearch", "%1: %n occurrences found in %2 of %3 files.") + .arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(filesSize); } namespace { From c6fc46403cf1dd26aeca8925cf55c1bba612b73a Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Thu, 28 Aug 2014 00:11:46 +0200 Subject: [PATCH 4/4] 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 {