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

refs #179 & #147 Added INetwork methods getStatusUrls and getKnownServers.

Browse Source 
Added CServer member isAcceptingConnections.
This commit is contained in:
Mathew Sutcliffe
2014-04-01 18:57:13 +01:00
parent da5a42c556
commit 37296e1822
5 changed files with 95 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/nwserver.cpp
View File

@@ -16,6 +16,7 @@ namespace BlackMisc
s.append(" ").append(this->m_address);
s.append(" ").append(QString::number(this->m_port));
s.append(" ").append(this->m_user.toQString(i18n));
s.append(" ").append(this->m_isAcceptingConnections ? "true" : "false");
return s;
}
@@ -68,7 +69,7 @@ namespace BlackMisc
*/
bool CServer::isValidForLogin() const
{
return this->m_user.hasValidCredentials() && this->m_port > 0 && !this->m_address.isEmpty();
return this->m_user.hasValidCredentials() && this->m_port > 0 && !this->m_address.isEmpty() && this->isAcceptingConnections();
}
/*
@@ -115,6 +116,8 @@ namespace BlackMisc
return QVariant::fromValue(this->m_user.getId());
case IndexUserRealName:
return QVariant::fromValue(this->m_user.getRealName());
case IndexIsAcceptingConnections:
return QVariant::fromValue(this->m_isAcceptingConnections);
default:
break;
}
@@ -161,6 +164,9 @@ namespace BlackMisc
case IndexUserRealName:
this->m_user.setRealName(variant.value<QString>());
break;
case IndexIsAcceptingConnections:
this->setIsAcceptingConnections(variant.value<bool>());
break;
default:
Q_ASSERT_X(false, "CServer", "index unknown");
break;

18
src/blackmisc/nwserver.h
View File

@@ -23,11 +23,11 @@ namespace BlackMisc
{
public:
//! \brief Default constructor.
CServer() : m_port(-1) {}
CServer() : m_port(-1), m_isAcceptingConnections(true) {}
//! \brief Constructor.
CServer(const QString &name, const QString &description, const QString &address, qint32 port, const CUser &user)
: m_name(name), m_description(description), m_address(address), m_port(port), m_user(user) {}
CServer(const QString &name, const QString &description, const QString &address, qint32 port, const CUser &user, bool isAcceptingConnections = true)
: m_name(name), m_description(description), m_address(address), m_port(port), m_user(user), m_isAcceptingConnections(isAcceptingConnections) {}
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override
@@ -65,6 +65,12 @@ namespace BlackMisc
//! \brief Set port
void setPort(qint32 port) { m_port = port; }
//! \brief Server is accepting connections
bool isAcceptingConnections() const { return m_isAcceptingConnections; }
//! \brief Set whether server is accepting connections
void setIsAcceptingConnections(bool value) { m_isAcceptingConnections = value; }
//! \brief Is valid for login?
bool isValidForLogin() const;
@@ -98,7 +104,8 @@ namespace BlackMisc
IndexPort,
IndexUserId,
IndexUserRealName,
IndexUserPassword
IndexUserPassword,
IndexIsAcceptingConnections
};
//! \copydoc CValueObject::propertyByIndex(int)
@@ -136,11 +143,12 @@ namespace BlackMisc
QString m_address;
qint32 m_port;
CUser m_user;
bool m_isAcceptingConnections;
};
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CServer, (o.m_name, o.m_description, o.m_address, o.m_port, o.m_user))
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CServer, (o.m_name, o.m_description, o.m_address, o.m_port, o.m_user, o.m_isAcceptingConnections))
Q_DECLARE_METATYPE(BlackMisc::Network::CServer)
#endif // guard