flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #415, mixin style lists

Browse Source
This commit is contained in:
Klaus Basan
2015-05-18 20:33:34 +02:00
parent 6d5c3d85a1
commit bad3ed3ea8
48 changed files with 126 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/network/aircraftmappinglist.cpp
View File

@@ -74,16 +74,5 @@ namespace BlackMisc
});
}
void CAircraftMappingList::registerMetadata()
{
qRegisterMetaType<BlackMisc::CSequence<CAircraftMapping>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CAircraftMapping>>();
qRegisterMetaType<BlackMisc::CCollection<CAircraftMapping>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftMapping>>();
qRegisterMetaType<CAircraftMappingList>();
qDBusRegisterMetaType<CAircraftMappingList>();
registerMetaValueType<CAircraftMappingList>();
}
} // namespace
} // namespace

15
src/blackmisc/network/aircraftmappinglist.h
View File

@@ -25,9 +25,13 @@ namespace BlackMisc
namespace Network
{
//! Value object encapsulating a list of aircraft mappings
class BLACKMISC_EXPORT CAircraftMappingList : public CSequence<CAircraftMapping>
class BLACKMISC_EXPORT CAircraftMappingList :
public CSequence<CAircraftMapping>,
public BlackMisc::Mixin::MetaType<CAircraftMappingList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftMappingList)
//! Empty constructor.
CAircraftMappingList();
@@ -51,15 +55,6 @@ namespace BlackMisc
//! Find by model string
CAircraftMappingList findByModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();
};
} //namespace

11
src/blackmisc/network/clientlist.cpp
View File

@@ -22,16 +22,5 @@ namespace BlackMisc
CClientList::CClientList(const CSequence &other) : CSequence<CClient>(other)
{ }
void CClientList::registerMetadata()
{
qRegisterMetaType<BlackMisc::CSequence<CClient>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CClient>>();
qRegisterMetaType<BlackMisc::CCollection<CClient>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CClient>>();
qRegisterMetaType<CClientList>();
qDBusRegisterMetaType<CClientList>();
registerMetaValueType<CClientList>();
}
} // namespace
} // namespace

11
src/blackmisc/network/clientlist.h
View File

@@ -30,22 +30,19 @@ namespace BlackMisc
//! Value object encapsulating a list of voice rooms.
class BLACKMISC_EXPORT CClientList :
public CSequence<CClient>,
public BlackMisc::Aviation::ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>
public BlackMisc::Aviation::ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>,
public BlackMisc::Mixin::MetaType<CClientList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CClientList)
//! Default constructor.
CClientList();
//! Construct from a base class object.
CClientList(const CSequence &other);
//! QVariant, required for DBus QVariant lists
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! Register metadata
static void registerMetadata();
};
} //namespace
} // namespace

11
src/blackmisc/network/serverlist.cpp
View File

@@ -20,16 +20,5 @@ namespace BlackMisc
CSequence<CServer>(other)
{ }
void CServerList::registerMetadata()
{
qRegisterMetaType<BlackMisc::CSequence<CServer>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CServer>>();
qRegisterMetaType<BlackMisc::CCollection<CServer>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CServer>>();
qRegisterMetaType<CServerList>();
qDBusRegisterMetaType<CServerList>();
registerMetaValueType<CServerList>();
}
} // namespace
} // namespace

20
src/blackmisc/network/serverlist.h
View File

@@ -21,27 +21,19 @@ namespace BlackMisc
{
namespace Network
{
/*!
* Value object encapsulating a list of servers.
*/
class BLACKMISC_EXPORT CServerList : public CSequence<CServer>
//! Value object encapsulating a list of servers.
class BLACKMISC_EXPORT CServerList :
public CSequence<CServer>,
public BlackMisc::Mixin::MetaType<CServerList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CServerList)
//! Default constructor.
CServerList();
//! Construct from a base class object.
CServerList(const CSequence<CServer> &other);
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();
};
} //namespace

11
src/blackmisc/network/textmessagelist.cpp
View File

@@ -87,17 +87,6 @@ namespace BlackMisc
return this->contains(&CTextMessage::isRadioMessage, true);
}
void CTextMessageList::registerMetadata()
{
qRegisterMetaType<BlackMisc::CSequence<CTextMessage>>();
qDBusRegisterMetaType<BlackMisc::CSequence<CTextMessage>>();
qRegisterMetaType<BlackMisc::CCollection<CTextMessage>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CTextMessage>>();
qRegisterMetaType<CTextMessageList>();
qDBusRegisterMetaType<CTextMessageList>();
registerMetaValueType<CTextMessageList>();
}
CTextMessageList CTextMessageList::findByFrequency(const CFrequency &frequency) const
{
return this->findBy(&CTextMessage::getFrequency, frequency);

18
src/blackmisc/network/textmessagelist.h
View File

@@ -25,14 +25,15 @@ namespace BlackMisc
{
namespace Network
{
/*!
* Value object encapsulating a list of text messages
*/
//! Value object encapsulating a list of text messages
class BLACKMISC_EXPORT CTextMessageList :
public CSequence<CTextMessage>,
public BlackMisc::ITimestampObjectList<CTextMessage, CTextMessageList>
public BlackMisc::ITimestampObjectList<CTextMessage, CTextMessageList>,
public BlackMisc::Mixin::MetaType<CTextMessageList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CTextMessageList)
//! Default constructor.
CTextMessageList();
@@ -81,15 +82,6 @@ namespace BlackMisc
//! Mark all messages as sent
void markAsSent();
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();
};
} //namespace
} // namespace

7
src/blackmisc/network/userlist.cpp
View File

@@ -20,12 +20,5 @@ namespace BlackMisc
CUserList::CUserList(const CSequence &other) : CSequence<CUser>(other)
{ }
void CUserList::registerMetadata()
{
qRegisterMetaType<CUserList>();
qDBusRegisterMetaType<CUserList>();
registerMetaValueType<CUserList>();
}
} // namespace
} // namespace

15
src/blackmisc/network/userlist.h
View File

@@ -25,24 +25,19 @@ namespace BlackMisc
namespace Network
{
//! Value object encapsulating a list of voice rooms.
class BLACKMISC_EXPORT CUserList : public CSequence<CUser>
class BLACKMISC_EXPORT CUserList :
public CSequence<CUser>,
public BlackMisc::Mixin::MetaType<CUserList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CUserList)
//! Default constructor.
CUserList();
//! Construct from a base class object.
CUserList(const CSequence &other);
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
//! Register metadata
static void registerMetadata();
};
} //namespace

4
src/blackmisc/network/voicecapabilities.h
View File

@@ -20,9 +20,7 @@ namespace BlackMisc
{
namespace Network
{
/*!
* Value object encapsulating information for voice capabilities.
*/
//! Value object encapsulating information for voice capabilities.
class BLACKMISC_EXPORT CVoiceCapabilities : public CValueObject<CVoiceCapabilities>
{
public: