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

Replace INetwork::CConnectionStatus with proper value object

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-09-13 10:55:48 +02:00
parent 865b25df87
commit 4772aadc1a
42 changed files with 206 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackgui/components/aircraftcomponent.cpp
View File

@@ -17,7 +17,6 @@
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/context/contextownaircraft.h"
#include "blackcore/network.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/fsdsetup.h"
#include "ui_aircraftcomponent.h"
@@ -163,14 +162,14 @@ namespace BlackGui
this->tabBar()->setTabText(ap, aps);
}
void CAircraftComponent::onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
void CAircraftComponent::onConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
if (to.isDisconnected())
{
ui->tvp_AircraftInRange->clear();
}
else if (INetwork::isConnectedStatus(to))
else if (to.isConnected())
{
if (sGui && sGui->getIContextNetwork())
{

4
src/blackgui/components/aircraftcomponent.h
View File

@@ -14,7 +14,7 @@
#include "blackgui/settings/viewupdatesettings.h"
#include "blackgui/enablefordockwidgetinfoarea.h"
#include "blackgui/blackguiexport.h"
#include "blackcore/network.h"
#include "blackmisc/network/connectionstatus.h"
#include <QObject>
#include <QScopedPointer>
@@ -86,7 +86,7 @@ namespace BlackGui
void onRowCountChanged(int count, bool withFilter);
//! Connection status has been changed
void onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onConnectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Settings have been changed
void onSettingsChanged();

5
src/blackgui/components/aircraftpartshistory.cpp
View File

@@ -23,6 +23,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackCore;
using namespace BlackCore::Context;
@@ -163,10 +164,10 @@ namespace BlackGui
}
}
void CAircraftPartsHistory::connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CAircraftPartsHistory::connectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (to == INetwork::Connected || to == INetwork::Disconnected)
if (to.isConnected() || to.isDisconnected())
{
this->initGui();
}

4
src/blackgui/components/aircraftpartshistory.h
View File

@@ -11,11 +11,11 @@
#ifndef BLACKGUI_COMPONENT_AIRCRAFTPARTSHISTORY_H
#define BLACKGUI_COMPONENT_AIRCRAFTPARTSHISTORY_H
#include "blackcore/network.h"
#include <QFrame>
#include <QTabWidget>
#include <QTimer>
#include <QTextDocument>
#include "blackmisc/network/connectionstatus.h"
namespace Ui { class CAircraftPartsHistory; }
namespace BlackGui
@@ -65,7 +65,7 @@ namespace BlackGui
void toggleHistoryEnabled(bool enabled);
//! Connection status changed
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void connectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
};
} // ns
} // ns

5
src/blackgui/components/atcbuttoncomponent.cpp
View File

@@ -19,6 +19,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackCore;
using namespace BlackCore::Context;
@@ -115,10 +116,10 @@ namespace BlackGui
this->updateStations();
}
void CAtcButtonComponent::onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CAtcButtonComponent::onConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
if (to.isDisconnected())
{
this->setVisible(false);
}

3
src/blackgui/components/atcbuttoncomponent.h
View File

@@ -12,6 +12,7 @@
#define BLACKGUI_COMPONENTS_ATCBUTTONCOMPONENT_H
#include "blackcore/context/contextnetwork.h"
#include "blackmisc/network/connectionstatus.h"
#include <QFrame>
#include <QScopedPointer>
@@ -62,7 +63,7 @@ namespace BlackGui
void onChangedAtcStations();
//! Connection status did change
void onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onConnectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Button has been clicked
void onButtonClicked();

7
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -47,6 +47,7 @@ using namespace BlackGui::Views;
using namespace BlackGui::Settings;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Weather;
using namespace BlackCore;
@@ -338,16 +339,16 @@ namespace BlackGui
this->update();
}
void CAtcStationComponent::connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CAtcStationComponent::connectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (INetwork::isConnectedStatus(to))
if (to.isConnected())
{
ui->tvp_AtcStationsOnline->clear();
this->updateTreeView();
m_updateTimer.start();
}
else if (INetwork::isDisconnectedStatus(to))
else if (to.isDisconnected())
{
m_updateTimer.stop();
this->clearOnlineViews();

4
src/blackgui/components/atcstationcomponent.h
View File

@@ -15,11 +15,11 @@
#include "blackgui/settings/atcstationssettings.h"
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/blackguiexport.h"
#include "blackcore/network.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/pq/frequency.h"
#include "blackmisc/identifiable.h"
#include "blackmisc/network/connectionstatus.h"
#include <QDateTime>
#include <QModelIndex>
@@ -121,7 +121,7 @@ namespace BlackGui
void changedAtcStationsOnline();
//! Connection status has been changed
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void connectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Request dummy ATC online stations
void testCreateDummyOnlineAtcStations(int number);

5
src/blackgui/components/callsigncompleter.cpp
View File

@@ -16,6 +16,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackCore;
using namespace BlackCore::Context;
@@ -106,10 +107,10 @@ namespace BlackGui
this->updateCallsignsFromContext();
}
void CCallsignCompleter::onChangedConnectionStatus(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CCallsignCompleter::onChangedConnectionStatus(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
const bool connected = (INetwork::Connected == to);
const bool connected = to.isConnected();
ui->led_Status->setOn(connected);
ui->le_Callsign->clear();
ui->le_Callsign->setEnabled(connected);

4
src/blackgui/components/callsigncompleter.h
View File

@@ -15,7 +15,7 @@
#include "blackgui/sharedstringlistcompleter.h"
#include "blackmisc/digestsignal.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackcore/network.h"
#include "blackmisc/network/connectionstatus.h"
#include <QFrame>
#include <QScopedPointer>
#include <QTimer>
@@ -69,7 +69,7 @@ namespace BlackGui
void updateCallsignsFromContext();
void onEditingFinished();
void onChangedAircraftInRange();
void onChangedConnectionStatus(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onChangedConnectionStatus(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
bool isValidKnownCallsign(const QString &callsignString) const;
//! Shared completer data

14
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -38,6 +38,7 @@ using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackGui;
using namespace BlackMisc;
using namespace BlackMisc::Network;
namespace BlackGui
{
@@ -186,22 +187,19 @@ namespace BlackGui
this->onMapperReady();
}
void CInfoBarStatusComponent::onNetworkConnectionChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CInfoBarStatusComponent::onNetworkConnectionChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
switch (to)
switch (to.getConnectionStatus())
{
case INetwork::Disconnected:
case INetwork::DisconnectedError:
case INetwork::DisconnectedFailed:
case INetwork::DisconnectedLost:
case CConnectionStatus::Disconnected:
ui->led_Network->setOn(false);
break;
case INetwork::Connected:
case CConnectionStatus::Connected:
ui->led_Network->setOn(true);
ui->led_Network->setOnToolTip(u"Connected: " % sGui->getIContextNetwork()->getConnectedServer().getName());
break;
case INetwork::Connecting:
case CConnectionStatus::Connecting:
ui->led_Network->setTriStateColor(CLedWidget::Yellow);
break;
default:

4
src/blackgui/components/infobarstatuscomponent.h
View File

@@ -12,9 +12,9 @@
#define BLACKGUI_INFOBARSTATUSCOMPONENT_H
#include "blackcore/actionbind.h"
#include "blackcore/network.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/input/actionhotkeydefs.h"
#include "blackmisc/network/connectionstatus.h"
#include <QFrame>
#include <QObject>
@@ -72,7 +72,7 @@ namespace BlackGui
void onSimulatorStatusChanged(int status);
//! Network connection has been changed
void onNetworkConnectionChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onNetworkConnectionChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Context menu requested
void onCustomAudioContextMenuRequested(const QPoint &position);

6
src/blackgui/components/logincomponent.cpp
View File

@@ -22,13 +22,13 @@
#include "blackcore/context/contextsimulator.h"
#include "blackcore/webdataservices.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/network.h"
#include "blackcore/simulator.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/network/connectionstatus.h"
#include "blackmisc/network/entityflags.h"
#include "blackmisc/network/serverlist.h"
#include "blackmisc/simulation/simulatorinternals.h"
@@ -445,10 +445,10 @@ namespace BlackGui
}
}
void CLoginComponent::onNetworkStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CLoginComponent::onNetworkStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (to != INetwork::Connected) { return; }
if (to != CConnectionStatus::Connected) { return; }
this->setUiLoginState(true);
this->updateGui();

3
src/blackgui/components/logincomponent.h
View File

@@ -20,6 +20,7 @@
#include "blackmisc/simulation/data/lastmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/connectionstatus.h"
#include "blackmisc/network/data/lastserver.h"
#include "blackmisc/network/entityflags.h"
#include "blackmisc/network/server.h"
@@ -225,7 +226,7 @@ namespace BlackGui
void onSimulatorStatusChanged(int status);
//! Network status has changed
void onNetworkStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onNetworkStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Tab widget (server) changed
void onServerTabWidgetChanged(int index);

5
src/blackgui/components/logindialog.cpp
View File

@@ -12,6 +12,7 @@
#include "blackgui/guiapplication.h"
#include "blackcore/context/contextnetwork.h"
using namespace BlackMisc::Network;
using namespace BlackCore;
using namespace BlackCore::Context;
@@ -90,10 +91,10 @@ namespace BlackGui
this->close();
}
void CLoginDialog::onNetworkStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
void CLoginDialog::onNetworkStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (to == INetwork::Disconnected || to == INetwork::Connected)
if (to.isDisconnected() || to.isConnected())
{
this->init();
}

4
src/blackgui/components/logindialog.h
View File

@@ -12,8 +12,8 @@
#define BLACKGUI_COMPONENTS_LOGINDIALOG_H
#include "blackgui/blackguiexport.h"
#include "blackcore/network.h"
#include "blackmisc/aviation/airport.h"
#include "blackmisc/network/connectionstatus.h"
#include <QDialog>
#include <QScopedPointer>
@@ -49,7 +49,7 @@ namespace BlackGui
void onLoginOrLogoffCancelled();
void onLoginOrLogoffSuccessful();
void onRequestNetworkSettings();
void onNetworkStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onNetworkStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
QScopedPointer<Ui::CLoginDialog> ui;
};

1
src/blackgui/components/loginoverviewcomponent.cpp
View File

@@ -22,7 +22,6 @@
#include "blackcore/context/contextnetwork.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/webdataservices.h"
#include "blackcore/network.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/simulation/aircraftmodel.h"

7
src/blackgui/components/mainkeypadareacomponent.cpp
View File

@@ -24,6 +24,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
using namespace BlackCore;
using namespace BlackCore::Context;
@@ -154,12 +155,12 @@ namespace BlackGui
}
}
void CMainKeypadAreaComponent::connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CMainKeypadAreaComponent::connectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
// Connected button
if (to == INetwork::Connected)
if (to.isConnected())
{
ui->pb_Connect->setText("Discon."); // full terms some too wide
ui->pb_Connect->setChecked(true);
@@ -274,7 +275,7 @@ namespace BlackGui
if (sGui->getIContextNetwork() && sGui->getIContextNetwork()->isConnected())
{
this->connectionStatusChanged(INetwork::Connected, INetwork::Connected);
this->connectionStatusChanged(CConnectionStatus::Connected, CConnectionStatus::Connected);
}
}
} // namespace

4
src/blackgui/components/mainkeypadareacomponent.h
View File

@@ -11,10 +11,10 @@
#ifndef BLACKGUI_MAINKEYPADAREACOMPONENT_H
#define BLACKGUI_MAINKEYPADAREACOMPONENT_H
#include "blackcore/network.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/components/maininfoareacomponent.h"
#include "blackmisc/identifier.h"
#include "blackmisc/network/connectionstatus.h"
#include <QFrame>
#include <QList>
@@ -74,7 +74,7 @@ namespace BlackGui
void buttonSelected();
//! \copydoc BlackCore::Context::IContextNetwork::connectionStatusChanged
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void connectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! \copydoc BlackCore::Context::IContextOwnAircraft::changedAircraftCockpit
void ownAircraftCockpitChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);

14
src/blackgui/components/mappingcomponent.cpp
View File

@@ -17,7 +17,7 @@
#include "blackgui/views/viewbase.h"
#include "blackcore/context/contextnetwork.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/network.h"
#include "blackmisc/network/connectionstatus.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/aircraftmodel.h"
@@ -449,15 +449,15 @@ namespace BlackGui
this->tokenBucketUpdateAircraft(aircraft);
}
void CMappingComponent::onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CMappingComponent::onConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
if (to.isDisconnected())
{
this->tokenBucketUpdate();
ui->tvp_RenderedAircraft->clear();
}
else if (INetwork::isConnectedStatus(to))
else if (to.isConnected())
{
if (sGui && sGui->getIContextNetwork())
{
@@ -564,15 +564,15 @@ namespace BlackGui
m_updateTimer.setInterval(ms);
}
void CMappingComponent::onNetworkConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CMappingComponent::onNetworkConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
if (to.isDisconnected())
{
ui->tvp_RenderedAircraft->clear();
m_updateTimer.stop();
}
else if (INetwork::isConnectedStatus(to))
else if (to.isConnected())
{
ui->comp_SimulatorSelector->setReadOnly(true);
m_updateTimer.start();

6
src/blackgui/components/mappingcomponent.h
View File

@@ -15,11 +15,11 @@
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/enablefordockwidgetinfoarea.h"
#include "blackgui/blackguiexport.h"
#include "blackcore/network.h"
#include "blackmisc/tokenbucket.h"
#include "blackmisc/identifiable.h"
#include "blackmisc/identifier.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/network/connectionstatus.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/variant.h"
@@ -128,7 +128,7 @@ namespace BlackGui
void onRemoteAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
//! Connection status has been changed
void onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onConnectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Widget changed
void onTabWidgetChanged(int index);
@@ -158,7 +158,7 @@ namespace BlackGui
void settingsChanged();
//! Connection status has been changed
void onNetworkConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onNetworkConnectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Update simulated aircraft view
void updateRenderedAircraftView(bool forceUpdate = false);

5
src/blackgui/components/modelmatcherlogenable.cpp
View File

@@ -17,6 +17,7 @@
using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
namespace BlackGui
@@ -119,10 +120,10 @@ namespace BlackGui
this->initGui();
}
void CModelMatcherLogEnable::connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CModelMatcherLogEnable::connectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (to == INetwork::Connected || to == INetwork::Disconnected)
if (to.isConnected() || to.isDisconnected())
{
this->initGui();
}

4
src/blackgui/components/modelmatcherlogenable.h
View File

@@ -11,7 +11,7 @@
#ifndef BLACKGUI_COMPONENTS_MODELMATCHERLOGENABLE_H
#define BLACKGUI_COMPONENTS_MODELMATCHERLOGENABLE_H
#include "blackcore/network.h"
#include "blackmisc/network/connectionstatus.h"
#include <QFrame>
#include <QScopedPointer>
@@ -54,7 +54,7 @@ namespace BlackGui
void valuesChanged();
//! Connection status has been changed
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void connectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
};
} // ns
} // ns

1
src/blackgui/components/networkdetailscomponent.h
View File

@@ -22,6 +22,7 @@
#include "blackmisc/audio/voicesetup.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/datacache.h"
#include "blackmisc/network/connectionstatus.h"
namespace Ui { class CNetworkDetailsComponent; }
namespace BlackGui

8
src/blackgui/components/usercomponent.cpp
View File

@@ -12,7 +12,7 @@
#include "blackgui/views/clientview.h"
#include "blackgui/views/userview.h"
#include "blackcore/context/contextnetwork.h"
#include "blackcore/network.h"
#include "blackmisc/network/connectionstatus.h"
#include "blackmisc/network/userlist.h"
#include "ui_usercomponent.h"
@@ -98,16 +98,16 @@ namespace BlackGui
this->tabBar()->setTabText(ic, c);
}
void CUserComponent::onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CUserComponent::onConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
if (to.isDisconnected())
{
ui->tvp_AllUsers->clear();
ui->tvp_Clients->clear();
m_updateTimer.stop();
}
else if (INetwork::isConnectedStatus(to))
else if (to.isConnected())
{
m_updateTimer.start();
}

5
src/blackgui/components/usercomponent.h
View File

@@ -14,7 +14,8 @@
#include "blackgui/enablefordockwidgetinfoarea.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/settings/viewupdatesettings.h"
#include "blackcore/network.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/connectionstatus.h"
#include <QObject>
#include <QScopedPointer>
@@ -59,7 +60,7 @@ namespace BlackGui
void onCountChanged(int count, bool withFilter);
//! Connection status
void onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void onConnectionStatusChanged(const BlackMisc::Network::CConnectionStatus &from, const BlackMisc::Network::CConnectionStatus &to);
//! Settings have been changed
void onSettingsChanged();