Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-29 17:28:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

convert RSNET_NETSTATE to enum class

Browse source
This commit is contained in:
sehraf 2020-02-09 21:58:56 +01:00
parent acda7b8cc4
commit 3f5dcecc4d
No known key found for this signature in database
GPG key ID: DF09F6EAE356B2C6
11 changed files with 87 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

22
retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp
View file

@ -281,39 +281,39 @@ void ConnectProgressDialog::stopAndClose()
void ConnectProgressDialog::updateNetworkStatus()
{
uint32_t netState = rsConfig->getNetState();
RsNetState netState = rsConfig->getNetState();
QLabel *label = ui->NetResult;
switch(netState)
{
case RSNET_NETSTATE_BAD_UNKNOWN:
case RsNetState::BAD_UNKNOWN:
label->setText(tr("Unknown State"));
break;
case RSNET_NETSTATE_BAD_OFFLINE:
case RsNetState::BAD_OFFLINE:
label->setText(tr("Offline"));
break;
case RSNET_NETSTATE_BAD_NATSYM:
case RsNetState::BAD_NATSYM:
label->setText(tr("Behind Symmetric NAT"));
break;
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RsNetState::BAD_NODHT_NAT:
label->setText(tr("Behind NAT & No DHT"));
break;
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
label->setText(tr("NET Restart"));
break;
case RSNET_NETSTATE_WARNING_NATTED:
case RsNetState::WARNING_NATTED:
label->setText(tr("Behind NAT"));
break;
case RSNET_NETSTATE_WARNING_NODHT:
case RsNetState::WARNING_NODHT:
label->setText(tr("No DHT"));
break;
case RSNET_NETSTATE_GOOD:
case RsNetState::GOOD:
label->setText(tr("NET STATE GOOD!"));
break;
case RSNET_NETSTATE_ADV_FORWARD:
case RsNetState::ADV_FORWARD:
label->setText(tr("UNVERIFIABLE FORWARD!"));
break;
case RSNET_NETSTATE_ADV_DARK_FORWARD:
case RsNetState::ADV_DARK_FORWARD:
label->setText(tr("UNVERIFIABLE FORWARD & NO DHT"));
break;
}

22
retroshare-gui/src/gui/statistics/DhtWindow.cpp
View file

@ -241,39 +241,39 @@ void DhtWindow::updateNetStatus()
label->setText(connOut);
uint32_t netState = rsConfig->getNetState();
RsNetState netState = rsConfig->getNetState();
label = ui.netStatusLabel;
switch(netState)
{
case RSNET_NETSTATE_BAD_UNKNOWN:
case RsNetState::BAD_UNKNOWN:
label->setText(tr("NET BAD: Unknown State"));
break;
case RSNET_NETSTATE_BAD_OFFLINE:
case RsNetState::BAD_OFFLINE:
label->setText(tr("NET BAD: Offline"));
break;
case RSNET_NETSTATE_BAD_NATSYM:
case RsNetState::BAD_NATSYM:
label->setText(tr("NET BAD: Behind Symmetric NAT"));
break;
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RsNetState::BAD_NODHT_NAT:
label->setText(tr("NET BAD: Behind NAT & No DHT"));
break;
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
label->setText(tr("NET WARNING: NET Restart"));
break;
case RSNET_NETSTATE_WARNING_NATTED:
case RsNetState::WARNING_NATTED:
label->setText(tr("NET WARNING: Behind NAT"));
break;
case RSNET_NETSTATE_WARNING_NODHT:
case RsNetState::WARNING_NODHT:
label->setText(tr("NET WARNING: No DHT"));
break;
case RSNET_NETSTATE_GOOD:
case RsNetState::GOOD:
label->setText(tr("NET STATE GOOD!"));
break;
case RSNET_NETSTATE_ADV_FORWARD:
case RsNetState::ADV_FORWARD:
label->setText(tr("CAUTION: UNVERIFIABLE FORWARD!"));
break;
case RSNET_NETSTATE_ADV_DARK_FORWARD:
case RsNetState::ADV_DARK_FORWARD:
label->setText(tr("CAUTION: UNVERIFIABLE FORWARD & NO DHT"));
break;
}

20
retroshare-gui/src/gui/statusbar/natstatus.cpp
View file

@ -51,7 +51,7 @@ NATStatus::NATStatus(QWidget *parent)
void NATStatus::getNATStatus()
{
uint32_t netState = rsConfig -> getNetState();
RsNetState netState = rsConfig -> getNetState();
statusNAT->setVisible(!_compactMode);
QString text = _compactMode?statusNAT->text():"";
@ -60,14 +60,14 @@ void NATStatus::getNATStatus()
switch(netState)
{
default:
case RSNET_NETSTATE_BAD_UNKNOWN:
case RsNetState::BAD_UNKNOWN:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Network Status Unknown")) ;
}
break ;
case RSNET_NETSTATE_BAD_OFFLINE:
case RsNetState::BAD_OFFLINE:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_grey_129.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Offline")) ;
@ -75,14 +75,14 @@ void NATStatus::getNATStatus()
break ;
// BAD. (RED)
case RSNET_NETSTATE_BAD_NATSYM:
case RsNetState::BAD_NATSYM:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Nasty Firewall")) ;
}
break ;
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RsNetState::BAD_NODHT_NAT:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("DHT Disabled and Firewalled")) ;
@ -90,21 +90,21 @@ void NATStatus::getNATStatus()
break ;
// CAUTION. (ORANGE)
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Network Restarting")) ;
}
break ;
case RSNET_NETSTATE_WARNING_NATTED:
case RsNetState::WARNING_NATTED:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Behind Firewall")) ;
}
break ;
case RSNET_NETSTATE_WARNING_NODHT:
case RsNetState::WARNING_NODHT:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("DHT Disabled")) ;
@ -112,14 +112,14 @@ void NATStatus::getNATStatus()
break ;
// GOOD (GREEN)
case RSNET_NETSTATE_GOOD:
case RsNetState::GOOD:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("RetroShare Server")) ;
}
break ;
case RSNET_NETSTATE_ADV_FORWARD:
case RsNetState::ADV_FORWARD:
{
iconLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
iconLabel->setToolTip( text + tr("Forwarded Port")) ;

20
retroshare-gui/src/gui/statusbar/torstatus.cpp
View file

@ -60,24 +60,24 @@ void TorStatus::getTorStatus()
QString text = _compactMode?statusTor->text():"";
/* check local network state. We cannot make sure that Tor is running yet. */
uint32_t netState = rsConfig -> getNetState();
RsNetState netState = rsConfig -> getNetState();
bool online ;
switch(netState)
{
default:
case RSNET_NETSTATE_BAD_UNKNOWN:
case RSNET_NETSTATE_BAD_OFFLINE: online = false ;
case RsNetState::BAD_UNKNOWN:
case RsNetState::BAD_OFFLINE: online = false ;
break ;
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
case RSNET_NETSTATE_BAD_NATSYM:
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RSNET_NETSTATE_WARNING_NATTED:
case RSNET_NETSTATE_WARNING_NODHT:
case RSNET_NETSTATE_GOOD:
case RSNET_NETSTATE_ADV_FORWARD: online = true ;
case RsNetState::BAD_NATSYM:
case RsNetState::BAD_NODHT_NAT:
case RsNetState::WARNING_NATTED:
case RsNetState::WARNING_NODHT:
case RsNetState::GOOD:
case RsNetState::ADV_FORWARD: online = true ;
break ;
}