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

refs #466 Resolved miscellaneous TODO items.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-14 22:57:19 +01:00
parent a102fc73b6
commit b1a3793c2f
5 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/voice_vatlib.cpp
View File

@@ -63,16 +63,6 @@ namespace BlackCore
return make_unique<CAudioMixerVatlib>(this);
}
/* FIXME:
Can the following methods be more general somehow?
E.g.:
template <typename Input, typename Output>
connectVoice(Input input, Output output)
{
...
}
*/
void CVoiceVatlib::connectVoice(IAudioInputDevice *device, IAudioMixer *mixer, IAudioMixer::InputPort inputPort)
{
auto audioInputVatlib = qobject_cast<CAudioInputDeviceVatlib*>(device);

6
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -151,6 +151,8 @@ uint BlackMisc::calculateHash(const QList<int> &values, const char *className)
return calculateHash(list, className);
}
QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type);
QVariant BlackMisc::fixQVariantFromDbusArgument(const QVariant &variant, int localUserType)
{
// my business?
@@ -163,7 +165,7 @@ QVariant BlackMisc::fixQVariantFromDbusArgument(const QVariant &variant, int loc
if (localUserType < userType)
{
// complex Qt type, e.g. QDateTime
return BlackMisc::complexQtTypeFromDbusArgument(arg, localUserType);
return complexQtTypeFromDbusArgument(arg, localUserType);
}
else
{
@@ -179,7 +181,7 @@ QVariant BlackMisc::fixQVariantFromDbusArgument(const QVariant &variant, int loc
}
}
QVariant BlackMisc::complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type)
QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type)
{
// QDate = 14, QTime = 15, QDateTime = 16, QUrl = 17,

11
src/blackmisc/blackmiscfreefunctions.h
View File

@@ -254,17 +254,6 @@ namespace BlackMisc
*/
BLACKMISC_EXPORT QVariant fixQVariantFromDbusArgument(const QVariant &variant, int localUserType);
/*!
* Convert a QDBusArgument back to a concrete type if required
* This is a workaround if a QVariant is sent via DBus, QDBusArgument is
* received and Qt is not able to get the original QVariant back
* \param argument send via DBus
* \param type Metatype
* \return QVariant generated from the above
* \todo To be removed if a better solution is found
*/
BLACKMISC_EXPORT QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type);
//! Display all user metatypes
//! \remarks Used in order to debug code, do not remove
BLACKMISC_EXPORT void displayAllUserMetatypesTypes(QTextStream &out);

7
src/blackmisc/pq/measurementunit.h
View File

@@ -235,13 +235,6 @@ namespace BlackMisc
: m_name(name), m_symbol(symbol), m_epsilon(0.0), m_displayDigits(0)
{}
//! \copydoc CValueObject::stringForStreaming
// todo: Causes build error. Ask KB is still required.
// virtual QString stringForStreaming() const override
// {
// return this->getName(false);
// }
public:
//! Destructor
virtual ~CMeasurementUnit() = default;

2
src/blackmisc/tuple_private.h
View File

@@ -146,7 +146,7 @@ namespace BlackMisc
template <class Derived>
struct AttributeComparable<Derived, false, false>
{
template <class T> using isCValueObject = typename std::is_base_of<CEmpty, T>::type; // FIXME use TemplateIsBaseOf
template <class T> using isCValueObject = typename std::is_base_of<CEmpty, T>::type; // historical use case, may need tweaking in future
friend int compare(const Derived &a, const Derived &b) { return compareHelper(a.m_obj, b.m_obj, isCValueObject<Derived>()); }
friend bool operator ==(const Derived &a, const Derived &b) { return a.m_obj == b.m_obj; }
friend bool operator !=(const Derived &a, const Derived &b) { return a.m_obj != b.m_obj; }