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

List:       kde-commits
Subject:    playground/base/plasma/applets/networkmanager/applet
From:       Sebastian Kügler <sebas () kde ! org>
Date:       2009-11-07 2:56:10
Message-ID: 1257562570.326854.26562.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1046000 by sebas:

better naming

 M  +2 -4      networkmanager.cpp  
 M  +1 -1      networkmanager.h  


--- trunk/playground/base/plasma/applets/networkmanager/applet/networkmanager.cpp \
#1045999:1046000 @@ -290,7 +290,7 @@
     }
 }
 
-QString NetworkManagerApplet::interfaceName(const \
Solid::Control::NetworkInterface::Type type) +QString \
NetworkManagerApplet::descriptiveName(const Solid::Control::NetworkInterface::Type \
type)  {
     QString deviceText;
     switch (type) {
@@ -430,11 +430,9 @@
                 KNetworkManagerServicePrefs::instance(Knm::ConnectionPersistence::NETWORKMANAGEMENT_RCFILE);
  
                 if (KNetworkManagerServicePrefs::self()->interfaceNamingStyle() == \
                KNetworkManagerServicePrefs::DescriptiveNames) {
-
-                    deviceText = interfaceName(iface->type());
+                    deviceText = descriptiveName(iface->type());
                 } else {
                     deviceText = iface->interfaceName();
-                    Solid::Device* dev = new Solid::Device(iface->uni());
                 }
 
                 QString ifaceName = iface->interfaceName();
--- trunk/playground/base/plasma/applets/networkmanager/applet/networkmanager.h \
#1045999:1046000 @@ -119,7 +119,7 @@
     // used to let the user easily hide VPN
     void hideVpnGroup();
 private:
-    QString interfaceName(const Solid::Control::NetworkInterface::Type type);
+    QString descriptiveName(const Solid::Control::NetworkInterface::Type type);
 
     bool hasInterfaceOfType(Solid::Control::NetworkInterface::Type type);
     void updateIcons();


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