Differential D28799 Diff 80146 mobile/wifi/wifisettings.cpp

Changeset View

Standalone View

View Options

mobile/wifi/wifisettings.cpp

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)
57{ 57​{
58 if (type.isEmpty()) 58​ if (type.isEmpty())
59 return QVariantMap(); 59​ return QVariantMap();
60 60​
61 NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection); 61​ NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection);
62 if (!con) 62​ if (!con)
63 return QVariantMap(); 63​ return QVariantMap();
64 64​
65​ if (type == "secrets")
nicolasfellaUnsubmitted
Done

space after if

nicolasfella: space after if
66​ return con->secrets(QLatin1String("802-11-wireless-security")).value().value(QLatin1String("802-11-wireless-security"));
67​
65 QVariantMap map = con->settings()->toMap().value(type); 68​ QVariantMap map = con->settings()->toMap().value(type);
66 if (type == "ipv4") { 69​ if (type == "ipv4") {
67 NetworkManager::Ipv4Setting::Ptr ipSettings = NetworkManager::Ipv4Setting::Ptr(new NetworkManager::Ipv4Setting()); 70​ NetworkManager::Ipv4Setting::Ptr ipSettings = NetworkManager::Ipv4Setting::Ptr(new NetworkManager::Ipv4Setting());
68 ipSettings->fromMap(map); 71​ ipSettings->fromMap(map);
69 map.clear(); 72​ map.clear();
70 if (ipSettings->method() == NetworkManager::Ipv4Setting::Automatic) { 73​ if (ipSettings->method() == NetworkManager::Ipv4Setting::Automatic) {
71 map.insert(QLatin1String("method"),QVariant(QLatin1String("auto"))); 74​ map.insert(QLatin1String("method"),QVariant(QLatin1String("auto")));
72 } 75​ }
73 76​
74 if (ipSettings->method() == NetworkManager::Ipv4Setting::Manual) { 77​ if (ipSettings->method() == NetworkManager::Ipv4Setting::Manual) {
75 map.insert(QLatin1String("method"),QVariant(QLatin1String("manual"))); 78​ map.insert(QLatin1String("method"),QVariant(QLatin1String("manual")));
76 map.insert(QLatin1String("address"),QVariant(ipSettings->addresses().first().ip().toString())); 79​ map.insert(QLatin1String("address"),QVariant(ipSettings->addresses().first().ip().toString()));
77 map.insert(QLatin1String("prefix"),QVariant(ipSettings->addresses().first().netmask().toString())); 80​ map.insert(QLatin1String("prefix"),QVariant(ipSettings->addresses().first().prefixLength()));
78 map.insert(QLatin1String("gateway"),QVariant(ipSettings->addresses().first().gateway().toString())); 81​ map.insert(QLatin1String("gateway"),QVariant(ipSettings->addresses().first().gateway().toString()));
79 map.insert(QLatin1String("dns"),QVariant(ipSettings->dns().first().toString())); 82​ map.insert(QLatin1String("dns"),QVariant(ipSettings->dns().first().toString()));
80 } 83​ }
81 } 84​ }
82 return map; 85​ return map;
83} 86​}
84 87​
85QVariantMap WifiSettings::getActiveConnectionInfo(const QString &connection) 88​QVariantMap WifiSettings::getActiveConnectionInfo(const QString &connection)
▲ Show 20 Lines • Show All 217 Lines • Show Last 20 Lines