Changeset View
Changeset View
Standalone View
Standalone View
libs/models/networkmodel.cpp
Show First 20 Lines • Show All 393 Lines • ▼ Show 20 Line(s) | 383 | { | |||
---|---|---|---|---|---|
394 | 394 | | |||
395 | if (settings->connectionType() == NetworkManager::ConnectionSettings::Vpn) { | 395 | if (settings->connectionType() == NetworkManager::ConnectionSettings::Vpn) { | ||
396 | vpnSetting = settings->setting(NetworkManager::Setting::Vpn).dynamicCast<NetworkManager::VpnSetting>(); | 396 | vpnSetting = settings->setting(NetworkManager::Setting::Vpn).dynamicCast<NetworkManager::VpnSetting>(); | ||
397 | } else if (settings->connectionType() == NetworkManager::ConnectionSettings::Wireless) { | 397 | } else if (settings->connectionType() == NetworkManager::ConnectionSettings::Wireless) { | ||
398 | wirelessSetting = settings->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>(); | 398 | wirelessSetting = settings->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>(); | ||
399 | } | 399 | } | ||
400 | 400 | | |||
401 | // Check whether the connection is already in the model to avoid duplicates, but this shouldn't happen | 401 | // Check whether the connection is already in the model to avoid duplicates, but this shouldn't happen | ||
402 | if (!m_list.contains(NetworkItemsList::Connection, connection->path())) { | 402 | if (m_list.contains(NetworkItemsList::Connection, connection->path())) { | ||
403 | return; | ||||
404 | } | ||||
crossi: Code style : Use curly braces even when the body of a conditional statement contains only one… | |||||
I think this is a valid Qt coding style, it was just my obsession to use curly braces everywhere, even for single line body. jgrulich: I think this is a valid Qt coding style, it was just my obsession to use curly braces… | |||||
As much as I hate it, crossi is right. https://community.kde.org/Policies/Kdelibs_Coding_Style#Braces nicolasfella: As much as I hate it, crossi is right. https://community.kde. | |||||
crossi: That's a good obsession and help a lot to avoid error . ;) | |||||
405 | | ||||
403 | NetworkModelItem *item = new NetworkModelItem(); | 406 | NetworkModelItem *item = new NetworkModelItem(); | ||
404 | item->setConnectionPath(connection->path()); | 407 | item->setConnectionPath(connection->path()); | ||
405 | item->setName(settings->id()); | 408 | item->setName(settings->id()); | ||
406 | item->setTimestamp(settings->timestamp()); | 409 | item->setTimestamp(settings->timestamp()); | ||
407 | item->setType(settings->connectionType()); | 410 | item->setType(settings->connectionType()); | ||
408 | item->setUuid(settings->uuid()); | 411 | item->setUuid(settings->uuid()); | ||
409 | item->setSlave(settings->isSlave()); | 412 | item->setSlave(settings->isSlave()); | ||
410 | 413 | | |||
411 | if (item->type() == NetworkManager::ConnectionSettings::Vpn) { | 414 | if (item->type() == NetworkManager::ConnectionSettings::Vpn) { | ||
412 | item->setVpnType(vpnSetting->serviceType().section('.', -1)); | 415 | item->setVpnType(vpnSetting->serviceType().section('.', -1)); | ||
413 | } else if (item->type() == NetworkManager::ConnectionSettings::Wireless) { | 416 | } else if (item->type() == NetworkManager::ConnectionSettings::Wireless) { | ||
414 | item->setMode(wirelessSetting->mode()); | 417 | item->setMode(wirelessSetting->mode()); | ||
415 | item->setSecurityType(NetworkManager::securityTypeFromConnectionSetting(settings)); | 418 | item->setSecurityType(NetworkManager::securityTypeFromConnectionSetting(settings)); | ||
416 | item->setSsid(QString::fromUtf8(wirelessSetting->ssid())); | 419 | item->setSsid(QString::fromUtf8(wirelessSetting->ssid())); | ||
417 | } | 420 | } | ||
418 | 421 | | |||
419 | item->invalidateDetails(); | 422 | item->invalidateDetails(); | ||
420 | 423 | | |||
421 | const int index = m_list.count(); | 424 | const int index = m_list.count(); | ||
422 | beginInsertRows(QModelIndex(), index, index); | 425 | beginInsertRows(QModelIndex(), index, index); | ||
423 | m_list.insertItem(item); | 426 | m_list.insertItem(item); | ||
424 | endInsertRows(); | 427 | endInsertRows(); | ||
425 | qCDebug(PLASMA_NM) << "New connection " << item->name() << " added"; | 428 | qCDebug(PLASMA_NM) << "New connection " << item->name() << " added"; | ||
426 | } | 429 | } | ||
427 | } | | |||
428 | 430 | | |||
429 | void NetworkModel::addDevice(const NetworkManager::Device::Ptr &device) | 431 | void NetworkModel::addDevice(const NetworkManager::Device::Ptr &device) | ||
430 | { | 432 | { | ||
431 | initializeSignals(device); | 433 | initializeSignals(device); | ||
432 | 434 | | |||
433 | if (device->type() == NetworkManager::Device::Wifi) { | 435 | if (device->type() == NetworkManager::Device::Wifi) { | ||
434 | NetworkManager::WirelessDevice::Ptr wifiDev = device.objectCast<NetworkManager::WirelessDevice>(); | 436 | NetworkManager::WirelessDevice::Ptr wifiDev = device.objectCast<NetworkManager::WirelessDevice>(); | ||
435 | for (const NetworkManager::WirelessNetwork::Ptr &wifiNetwork : wifiDev->networks()) { | 437 | for (const NetworkManager::WirelessNetwork::Ptr &wifiNetwork : wifiDev->networks()) { | ||
▲ Show 20 Lines • Show All 647 Lines • Show Last 20 Lines |
Code style : Use curly braces even when the body of a conditional statement contains only one line.