diff --git a/samples/blackgui/mainwindow_settings.cpp b/samples/blackgui/mainwindow_settings.cpp index fae08756a..18254e404 100644 --- a/samples/blackgui/mainwindow_settings.cpp +++ b/samples/blackgui/mainwindow_settings.cpp @@ -26,7 +26,7 @@ void MainWindow::reloadSettings() CSettingsNetwork nws = this->m_contextSettings->getNetworkSettings(); // update servers - this->m_modelTrafficServerList->setSelectedServer(nws.getCurrentNetworkServer()); + this->m_modelTrafficServerList->setSelectedServer(nws.getCurrentTrafficNetworkServer()); this->m_modelTrafficServerList->update(nws.getTrafficNetworkServers()); this->ui->tv_SettingsTnServers->resizeColumnsToContents(); this->ui->tv_SettingsTnServers->resizeRowsToContents(); @@ -63,7 +63,7 @@ void MainWindow::alterTrafficServer() return; } - const QString path = CSettingUtilities::appendPaths(IContextSettings::PathNetworkSettings(), CSettingsNetwork::ValueTrafficServer()); + const QString path = CSettingUtilities::appendPaths(IContextSettings::PathNetworkSettings(), CSettingsNetwork::ValueTrafficServers()); QObject *sender = QObject::sender(); CStatusMessageList msgs; if (sender == this->ui->pb_SettingsTnCurrentServer) diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index f6b4a23a3..c622ae5d4 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -99,7 +99,7 @@ namespace BlackCore CAltitude(312, CAltitude::MeanSeaLevel, CLengthUnit::ft()) ); this->m_ownAircraft.setSituation(situation); - this->m_ownAircraft.setPilot(this->getRuntime()->getIContextSettings()->getNetworkSettings().getCurrentNetworkServer().getUser()); + this->m_ownAircraft.setPilot(this->getRuntime()->getIContextSettings()->getNetworkSettings().getCurrentTrafficNetworkServer().getUser()); // TODO: This would need to come from somewhere (mappings) // Own callsign, plane ICAO status, model used @@ -114,7 +114,7 @@ namespace BlackCore { // this->log(Q_FUNC_INFO); CStatusMessageList msgs; - CServer currentServer = this->getRuntime()->getIContextSettings()->getNetworkSettings().getCurrentNetworkServer(); + CServer currentServer = this->getRuntime()->getIContextSettings()->getNetworkSettings().getCurrentTrafficNetworkServer(); if (!currentServer.getUser().isValid()) { diff --git a/src/blackcore/context_settings_impl.cpp b/src/blackcore/context_settings_impl.cpp index 074965094..7b09870d6 100644 --- a/src/blackcore/context_settings_impl.cpp +++ b/src/blackcore/context_settings_impl.cpp @@ -25,7 +25,7 @@ namespace BlackCore // this would actually be reading the settings from disk .. this->m_settingsNetwork.setCurrentNetworkServer(CServer("Testserver", "Client project testserver", "vatsim-germany.org", 6809, CUser("guest", "Guest Client project", "", "guest"))); - this->m_settingsNetwork.addTrafficNetworkServer(this->m_settingsNetwork.getCurrentNetworkServer()); + this->m_settingsNetwork.addTrafficNetworkServer(this->m_settingsNetwork.getCurrentTrafficNetworkServer()); this->m_settingsNetwork.addTrafficNetworkServer(CServer("Europe C2", "VATSIM Server", "88.198.19.202", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw"))); this->m_settingsNetwork.addTrafficNetworkServer(CServer("Europe CC", "VATSIM Server", "5.9.155.43", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw"))); this->m_settingsNetwork.addTrafficNetworkServer(CServer("UK", "VATSIM Server", "109.169.48.148", 6809, CUser("vatsimid", "Black Client", "", "vatsimpw"))); diff --git a/src/blackmisc/setnetwork.cpp b/src/blackmisc/setnetwork.cpp index 84d955425..235937d3b 100644 --- a/src/blackmisc/setnetwork.cpp +++ b/src/blackmisc/setnetwork.cpp @@ -127,7 +127,7 @@ namespace BlackMisc // TODO: This needs to be refactored to a smarter way to delegate commands changedFlag = false; CStatusMessageList msgs; - if (path == CSettingsNetwork::ValueTrafficServer()) + if (path == CSettingsNetwork::ValueTrafficServers()) { const CServer server = value.value(); if (command == CSettingsNetwork::CmdSetCurrentServer()) diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index 25e84833c..5be7b8114 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -20,100 +20,62 @@ namespace BlackMisc { namespace Settings { - /*! - * Value object encapsulating information of a server - */ + //! Value object encapsulating information of a server class CSettingsNetwork : public BlackMisc::CValueObject { public: - /*! - * Default constructor. - */ + //! \brief Default constructor. CSettingsNetwork(); - /*! - * Destructor. - */ + //! \brief Destructor. virtual ~CSettingsNetwork() {} - /*! - * \brief Update - * \return - */ + //! \brief Update static const QString &CmdSetCurrentServer() { static const QString cmd("currenttrafficserver"); return cmd; } - /*! - * \brief Path - * \return - */ - static const QString &ValueTrafficServer() + //! \brief Path + static const QString &ValueTrafficServers() { - static const QString cmd("trafficserver"); - return cmd; + static const QString value("trafficservers"); + return value; } - /*! - * \copydoc CValueObject::toQVariant() - */ + //! \copydoc CValueObject::toQVariant() virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - /*! - * Traffic network server objects - */ + //! \brief Value object, traffic network server objects BlackMisc::Network::CServerList getTrafficNetworkServers() const { return m_trafficNetworkServers; } - /*! - * Selected traffic network server - */ - BlackMisc::Network::CServer getCurrentNetworkServer() const { return m_trafficNetworkServerCurrent; } + //! \brief Selected traffic network server + BlackMisc::Network::CServer getCurrentTrafficNetworkServer() const { return m_trafficNetworkServerCurrent; } - /*! - * \brief URL of booking service - */ - QString getBookingServiceUrl() const { return "http://vatbook.euroutepro.com/xml2.php"; } + //! \brief URL of booking service - /*! - * Selected traffic network server - * \param currentServer - * \return - */ + //! \brief Selected traffic network server bool setCurrentNetworkServer(const BlackMisc::Network::CServer ¤tServer); - /*! - * Traffic network server objects - */ + //! \brief Traffic network server objects void addTrafficNetworkServer(const BlackMisc::Network::CServer &server) { m_trafficNetworkServers.push_back(server); } - /*! - * \brief Equal operator == - */ + //! \brief Equal operator == bool operator ==(const CSettingsNetwork &other) const; - /*! - * \brief Unequal operator != - */ + //! \brief Unequal operator != bool operator !=(const CSettingsNetwork &other) const; - /*! - * \copydoc BlackCore::IContextSettings - */ + //! \copydoc BlackCore::IContextSettings virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value, bool &changedFlag); - /*! - * \copydoc CValueObject::getValueHash - */ + //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; - /*! - * \brief Register metadata - */ static void registerMetadata(); protected: diff --git a/src/blackmisc/settingutilities.cpp b/src/blackmisc/settingutilities.cpp index 054dcdb34..00b2616e5 100644 --- a/src/blackmisc/settingutilities.cpp +++ b/src/blackmisc/settingutilities.cpp @@ -40,12 +40,8 @@ namespace BlackMisc return path.mid(sl + 1); } - /*! - * \brief Append paths - * \param part1 - * \param part2 - * \param part3 - * \return + /* + * Append paths */ QString CSettingUtilities::appendPaths(const QString &part1, const QString &part2, const QString &part3) { diff --git a/src/blackmisc/settingutilities.h b/src/blackmisc/settingutilities.h index 3c4dec9ab..7927370cb 100644 --- a/src/blackmisc/settingutilities.h +++ b/src/blackmisc/settingutilities.h @@ -7,9 +7,7 @@ namespace BlackMisc { namespace Settings { - /*! - * \brief Helper / utility methods for settings - */ + //! \brief Helper / utility methods for settings class CSettingUtilities { private: @@ -17,74 +15,44 @@ namespace BlackMisc public: - /*! - * \brief Validate - * \return - */ + //! \brief Command validate static const QString &CmdValidate() { static const QString cmd("validate"); return cmd; } - /*! - * \brief Update - * \return - */ + //! Command Update static const QString &CmdUpdate() { static const QString cmd("update"); return cmd; } - /*! - * \brief Remove - * \return - */ + //! Command Remove static const QString &CmdRemove() { static const QString cmd("remove"); return cmd; } - /*! - * \brief Add - * \return - */ + //! Command Add static const QString &CmdAdd() { static const QString cmd("add"); return cmd; } - /*! - * \brief Wrong path message - * \param path - * \return - */ + //! \brief Wrong path message static BlackMisc::CStatusMessage wrongPathMessage(const QString &path = ""); - /*! - * \brief Wrong path messages - * \param path - * \return - */ + //! \brief Wrong path messages static BlackMisc::CStatusMessageList wrongPathMessages(const QString &path = ""); - /*! - * \brief Remove leading path - * \param path - * \return - */ + //! \brief Remove leading path static QString removeLeadingPath(const QString &path); - /*! - * \brief Append paths - * \param part1 - * \param part2 - * \param part3 - * \return - */ + //! \brief Append setting paths static QString appendPaths(const QString &part1, const QString &part2, const QString &part3 = ""); };