[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libnm-qt] examples: Make device listing example compile and work again.
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2013-08-31 19:10:38
Message-ID: E1VFqZC-0002sN-Fo () scm ! kde ! org
[Download RAW message or body]

Git commit 37a381e1897858f3192e18572e41673eaa1aa334 by Lamarque V. Souza.
Committed on 31/08/2013 at 17:00.
Pushed by lvsouza into branch 'master'.

Make device listing example compile and work again.

M  +1    -1    examples/CMakeLists.txt
M  +4    -4    examples/createconnection/main.cpp
M  +38   -23   examples/main.cpp

http://commits.kde.org/libnm-qt/37a381e1897858f3192e18572e41673eaa1aa334

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e8ad30c..a154880 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -11,7 +11,7 @@ endif (NOT NETWORKMANAGERQT_FOUND)
 pkg_check_modules(QTNETWORK REQUIRED QtNetwork)
 pkg_check_modules(NETWORKMANAGER REQUIRED NetworkManager)
 
-include_directories(${QTNETWORK_INCLUDE_DIRS} ${NETWORKMANAGERQT_INCLUDE_DIRS})
+include_directories(${QTNETWORK_INCLUDE_DIRS} ${NETWORKMANAGERQT_INCLUDE_DIRS} \
${NETWORKMANAGER_INCLUDE_DIRS})  link_directories(${QTNETWORK_LIBRARY_DIRS} \
${NETWORKMANAGERQT_LIBRARY_DIRS})  
 set(exampleNetworkManagerQt_SRCS
diff --git a/examples/createconnection/main.cpp b/examples/createconnection/main.cpp
index 2e8cdd0..9cd5723 100644
--- a/examples/createconnection/main.cpp
+++ b/examples/createconnection/main.cpp
@@ -26,10 +26,10 @@
 #include <NetworkManagerQt/accesspoint.h>
 #include <NetworkManagerQt/generic-types.h>
 #include <NetworkManagerQt/connection.h>
-#include <NetworkManagerQt/settings/connection.h>
-#include <NetworkManagerQt/settings/802-11-wireless.h>
-#include <NetworkManagerQt/settings/802-11-wireless-security.h>
-#include <NetworkManagerQt/settings/ipv4.h>
+#include <NetworkManagerQt/ConnectionSettings>
+#include <NetworkManagerQt/WirelessSetting>
+#include <NetworkManagerQt/WirelessSecuritySetting>
+#include <NetworkManagerQt/Ipv4Setting>
 
 #include <QtDBus/QDBusMetaType>
 #include <QtCore/QTextStream>
diff --git a/examples/main.cpp b/examples/main.cpp
index c92dc6e..5a13abc 100644
--- a/examples/main.cpp
+++ b/examples/main.cpp
@@ -22,10 +22,10 @@ along with this program.  If not, see \
<http://www.gnu.org/licenses/>.  
 #include <QtCore/QTextStream>
 
-#include <NetworkManagerQt/manager.h>
-#include <NetworkManagerQt/device.h>
-#include <NetworkManagerQt/activeconnection.h>
-#include <NetworkManagerQt/connection.h>
+#include <NetworkManagerQt/Manager>
+#include <NetworkManagerQt/Device>
+#include <NetworkManagerQt/ActiveConnection>
+#include <NetworkManagerQt/Connection>
 
 QString typeAsString(const int type)
 {
@@ -47,38 +47,52 @@ int main()
 {
     QTextStream qout(stdout, QIODevice::WriteOnly);
 
-    NetworkManager::DeviceList list = NetworkManager::networkInterfaces();
+    NetworkManager::Device::List list = NetworkManager::networkInterfaces();
 
-    foreach (NetworkManager::Device *dev, list) {
+    foreach (NetworkManager::Device::Ptr dev, list) {
         qout << "\n=====\n";
         qout << dev->uni() << "\n";
         qout << "type: " << typeAsString(dev->type()) << "\n";
         qout << "managed: " << dev->managed() << "\n";
         qout << "interface name: " << dev->interfaceName() << "\n";
 
-        // dev->ipV4Config() is valid only in activated state
-        if (dev->state() == NetworkManager::Device::Activated) {
+        NetworkManager::IpConfig ipConfig = dev->ipV4Config();
+        if (ipConfig.isValid()) {
             // static IPv4 configuration.
-            if (dev->ipV4Config().addresses().isEmpty()) {
+            if (ipConfig.addresses().isEmpty()) {
                 qout << "ip address: <not set>\n";
             } else {
-                QHostAddress addr;
-                addr.setAddress(dev->ipV4Config().addresses().at(0).address());
-                qout << "ip address: " << addr.toString() << "\n";
-                qout << "ip address (raw): " << dev->ipV4Address() << "\n";
+                NetworkManager::IpAddress address = ipConfig.addresses().at(0);
+                qout << "ip address: " << address.ip().toString() << "\n";
+                qout << "gateway: " << address.gateway().toString() << "\n";
+                qout << "ip address (raw): " << dev->ipV4Address().toString() << \
"\n";  
-                if (dev->ipV4Config().routes().isEmpty()) {
-                    qout << "default gateway: <not set>\n";
+                if (ipConfig.routes().isEmpty()) {
+                    qout << "routers: <not set>\n";
                 } else {
-                    addr.setAddress(dev->ipV4Config().routes().at(0).route());
-                    qout << "default gateway: " << addr.toString() << "\n";
+                    qout << "routers: " << ipConfig.routes().at(0).ip().toString() \
<< "\n"; +                }
+
+                if (ipConfig.nameservers().isEmpty()) {
+                    qout << "nameserver: <not set>\n";
+                } else {
+                    qout << "nameserver: " << \
ipConfig.nameservers().at(0).toString() << "\n";  }
             }
             // DHCPv4 configuration.
-            NetworkManager::Dhcp4Config *dhcp4Config = dev->dhcp4Config();
-            if (dhcp4Config == 0) {
-                qout << "(dhcp) ip address: <not set>\n";
+            NetworkManager::Dhcp4Config::Ptr dhcp4Config = dev->dhcp4Config();
+            if (!dhcp4Config) {
+                qout << "dhcp info unavailable\n";
             } else {
+                qout << "Dhcp4 options (" << dhcp4Config->path() <<"): ";
+                QVariantMap options = dhcp4Config->options();
+                QVariantMap::ConstIterator it = options.constBegin();
+                QVariantMap::ConstIterator end = options.constEnd();
+                for (; it != end; ++it){
+                    qout << it.key() << "=" << it.value().toString() << " ";
+                }
+                qout << "\n";
+
                 qout << "(dhcp) ip address: " << \
dhcp4Config->optionValue("ip_address") << "\n";  qout << "(dhcp) network: " << \
dhcp4Config->optionValue("network_number") << '/' << \
dhcp4Config->optionValue("subnet_cidr") << " (" << \
dhcp4Config->optionValue("subnet_mask") << ")\n";  
@@ -96,13 +110,14 @@ int main()
             }
         }
 
-        QList<NetworkManager::Settings::Connection *> connections = \
dev->availableConnections(); +        NetworkManager::Connection::List connections = \
dev->availableConnections();  
         qout << "available connections: ";
 
-        foreach (NetworkManager::Settings::Connection *con, connections) {
+        foreach (NetworkManager::Connection::Ptr con, connections) {
             qDebug() << "con";
-            qout << con->settings().value("connection").value("id").toString();
+            NetworkManager::ConnectionSettings::Ptr settings = con->settings();
+            qout << "\"" << settings->id() << "\" ";
         }
     }
     qout << "\n";


[prev in list] [next in list] [prev in thread] [next in thread]