mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-24 09:54:16 +08:00
style and consistency:
* rename CStatusMessages to CStatusMessageList * rename NetworkVatlib to CNetworkVatlib * replace all occurrences of Realname with RealName (correct camel case) * CSequence method corresponding to CList::append is push_back * don't compile the qdbuscpp2xml metadata plugin by default * CAircraftIcao string members always trimmed and capitalized * added CComSystem::roundTo25KHz * using epsilon comparison in a couple of places refs #81
This commit is contained in:
committed by
Mathew Sutcliffe
parent
b5c3a5543f
commit
bb61654a29
@@ -6,13 +6,15 @@
|
||||
#ifndef BLACKMISC_PQUNITS_H
|
||||
#define BLACKMISC_PQUNITS_H
|
||||
|
||||
#pragma push_macro("min")
|
||||
#undef min
|
||||
|
||||
#include "blackmisc/pqbase.h"
|
||||
#include <QtDBus/QDBusArgument>
|
||||
#include <QList>
|
||||
#include <QtCore/qmath.h>
|
||||
#include <QTranslator>
|
||||
|
||||
|
||||
//
|
||||
// Used with the template for quantities. This is the reason for
|
||||
// having all units in one file, since template requires concrete instantiations
|
||||
@@ -949,14 +951,15 @@ namespace BlackMisc
|
||||
return h;
|
||||
}
|
||||
|
||||
|
||||
/*!
|
||||
* \brief Minute
|
||||
* \return
|
||||
*/
|
||||
static const CTimeUnit &min()
|
||||
{
|
||||
static CTimeUnit min(QT_TRANSLATE_NOOP("CMeasurementUnit", "minute"), "min", LinearConverter<MinutesToSeconds>(), 2);
|
||||
return min;
|
||||
static CTimeUnit minute(QT_TRANSLATE_NOOP("CMeasurementUnit", "minute"), "min", LinearConverter<MinutesToSeconds>(), 2);
|
||||
return minute;
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -1128,4 +1131,5 @@ Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CSpeedUnit)
|
||||
Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CTimeUnit)
|
||||
Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAccelerationUnit)
|
||||
|
||||
#pragma pop_macro("min")
|
||||
#endif // guard
|
||||
|
||||
Reference in New Issue
Block a user