rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

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)

Browse Source
This commit is contained in:
Laurent Lalanne 2014-08-26 23:30:57 +02:00
parent 2c99d4172b
commit 5f3699fbaa
6 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp
View File

@ -21,7 +21,7 @@
// Make larger sized integers from smaller sized integers // Make larger sized integers from smaller sized integers
#define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb)) #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 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 // Used to extract smaller integers from larger sized intergers

2
ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp
View File

@ -91,7 +91,7 @@
// Make larger sized integers from smaller sized integers // Make larger sized integers from smaller sized integers
#define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb)) #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 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 // Used to extract smaller integers from larger sized intergers

2
ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp
View File

@ -147,7 +147,7 @@ template<typename Scalar> void geometry(void)
t1.setIdentity(); t1.setIdentity();
t1.linear() = q1.toRotationMatrix(); t1.linear() = q1.toRotationMatrix();
v0 << 50, 2, 1;//= ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5)); v0 << 50, 2, 1; // = ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
t0.scale(v0); t0.scale(v0);
t1.prescale(v0); t1.prescale(v0);

2
ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp
View File

@ -149,7 +149,7 @@ template<typename Scalar> void geometry(void)
t1.setIdentity(); t1.setIdentity();
t1.linear() = q1.toRotationMatrix(); t1.linear() = q1.toRotationMatrix();
v0 << 50, 2, 1;//= ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5)); v0 << 50, 2, 1; // = ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
t0.scale(v0); t0.scale(v0);
t1.prescale(v0); t1.prescale(v0);

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

@ -43,26 +43,20 @@ 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("Utils::FileSearch", return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: canceled. %n occurrences found in %2 files."),
"%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("Utils::FileSearch", return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: %n occurrences found in %2 files."),
"%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("Utils::FileSearch", return QCoreApplication::translate(tr("Utils::FileSearch"), tr("%1: %n occurrences found in %2 of %3 files."),
"%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);
} }
namespace { namespace {

2
ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp
View File

@ -47,7 +47,7 @@
// Make larger sized integers from smaller sized integers // Make larger sized integers from smaller sized integers
#define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb)) #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 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 // Used to extract smaller integers from larger sized intergers