flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 20:40:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #624 Use constexpr instead of Q_CONSTEXPR.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-03-19 20:40:03 +00:00
parent e9bb8f2fcc
commit 96d9fffcd7
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/atomicfile.cpp
View File

@@ -73,7 +73,7 @@ namespace BlackMisc
QString CAtomicFile::randomSuffix() QString CAtomicFile::randomSuffix()
{ {
Q_CONSTEXPR auto max = 2176782335; constexpr auto max = 2176782335;
return QString::number(std::uniform_int_distribution<std::decay<decltype(max)>::type>(0, max)(Private::defaultRandomGenerator()), 36); return QString::number(std::uniform_int_distribution<std::decay<decltype(max)>::type>(0, max)(Private::defaultRandomGenerator()), 36);
} }

2
src/blackmisc/range.h
View File

@@ -45,7 +45,7 @@ namespace BlackMisc
*/ */
//! @{ //! @{
template <class T> template <class T>
Q_CONSTEXPR typename std::add_const<T>::type &as_const(T &v) Q_DECL_NOEXCEPT { return v; } constexpr typename std::add_const<T>::type &as_const(T &v) Q_DECL_NOEXCEPT { return v; }
template <class T> template <class T>
void as_const(const T &&) = delete; void as_const(const T &&) = delete;
//! @} //! @}

4
src/blackmisc/variantprivate.h
View File

@@ -232,7 +232,7 @@ namespace BlackMisc
template <typename T, bool IsRegisteredMetaType /* = true */> template <typename T, bool IsRegisteredMetaType /* = true */>
struct MetaTypeHelperImpl struct MetaTypeHelperImpl
{ {
static Q_DECL_CONSTEXPR int maybeGetMetaTypeId() { return qMetaTypeId<T>(); } static constexpr int maybeGetMetaTypeId() { return qMetaTypeId<T>(); }
static void maybeRegisterMetaType() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); registerMetaValueType<T>(); } static void maybeRegisterMetaType() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); registerMetaValueType<T>(); }
static QVariant maybeToQVariant(const T &obj) { return QVariant::fromValue(obj); } static QVariant maybeToQVariant(const T &obj) { return QVariant::fromValue(obj); }
static void maybeConvertFromQVariant(T &obj, const QVariant &var) { BlackMisc::setFromQVariant(&obj, var); } static void maybeConvertFromQVariant(T &obj, const QVariant &var) { BlackMisc::setFromQVariant(&obj, var); }
@@ -241,7 +241,7 @@ namespace BlackMisc
template <typename T> template <typename T>
struct MetaTypeHelperImpl<T, /* IsRegisteredMetaType = */ false> struct MetaTypeHelperImpl<T, /* IsRegisteredMetaType = */ false>
{ {
static Q_DECL_CONSTEXPR int maybeGetMetaTypeId() { return QMetaType::UnknownType; } static constexpr int maybeGetMetaTypeId() { return QMetaType::UnknownType; }
static void maybeRegisterMetaType() {} static void maybeRegisterMetaType() {}
static QVariant maybeToQVariant(const T &) { return {}; } static QVariant maybeToQVariant(const T &) { return {}; }
static void maybeConvertFromQVariant(T &, const QVariant &) {} static void maybeConvertFromQVariant(T &, const QVariant &) {}

2
src/plugins/simulator/fsx/simulatorfsx.cpp
View File

@@ -839,7 +839,7 @@ namespace BlackSimPlugin
ISimulatorListener(info), ISimulatorListener(info),
m_timer(new QTimer(this)) m_timer(new QTimer(this))
{ {
Q_CONSTEXPR int QueryInterval = 5 * 1000; // 5 seconds constexpr int QueryInterval = 5 * 1000; // 5 seconds
m_timer->setInterval(QueryInterval); m_timer->setInterval(QueryInterval);
this->m_timer->setObjectName(this->objectName().append(":m_timer")); this->m_timer->setObjectName(this->objectName().append(":m_timer"));
connect(m_timer, &QTimer::timeout, this, &CSimulatorFsxListener::ps_checkConnection); connect(m_timer, &QTimer::timeout, this, &CSimulatorFsxListener::ps_checkConnection);