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

List:       kde-commits
Subject:    [networkmanagement] applet: More fixes.
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2011-10-24 3:36:47
Message-ID: 20111024033647.08C6DA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit e7618ec7882d3e8ac3bb796364db024bd1b3bc7d by Lamarque V. Souza.
Committed on 24/10/2011 at 05:35.
Pushed by lvsouza into branch 'master'.

More fixes.

M  +1    -1    applet/interfacedetailswidget.cpp
M  +1    -1    applet/interfacedetailswidget.h
M  +3    -8    applet/interfaceitem.cpp
M  +1    -2    applet/interfaceitem.h
M  +1    -1    applet/nmpopup.cpp
M  +1    -1    applet/nmpopup.h

http://commits.kde.org/networkmanagement/e7618ec7882d3e8ac3bb796364db024bd1b3bc7d

diff --git a/applet/interfacedetailswidget.cpp b/applet/interfacedetailswidget.cpp
index 16687e5..0d17de2 100644
--- a/applet/interfacedetailswidget.cpp
+++ b/applet/interfacedetailswidget.cpp
@@ -542,7 +542,7 @@ void InterfaceDetailsWidget::dataUpdated(const QString \
&sourceName, const Plasma  updateWidgets();
 }
 
-void InterfaceDetailsWidget::handleConnectionStateChange(int new_state, int \
old_state, int reason) +void \
InterfaceDetailsWidget::handleConnectionStateChange(NetworkManager::Device::State \
new_state, NetworkManager::Device::State old_state, \
NetworkManager::Device::StateChangeReason reason)  {
     Q_UNUSED(old_state)
     if ((new_state == NetworkManager::Device::Unavailable || new_state == \
NetworkManager::Device::Unmanaged || new_state == \
                NetworkManager::Device::UnknownState) &&
diff --git a/applet/interfacedetailswidget.h b/applet/interfacedetailswidget.h
index 190e28d..5168dac 100644
--- a/applet/interfacedetailswidget.h
+++ b/applet/interfacedetailswidget.h
@@ -53,7 +53,7 @@ Q_OBJECT
         void dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data \
                &data);
         //void dataUpdated(const QString&, const Plasma::DataEngine::Data&);
         //void sourceAdded(const QString&);
-        void handleConnectionStateChange(int new_state, int old_state, int reason);
+        void handleConnectionStateChange(NetworkManager::Device::State new_state, \
NetworkManager::Device::State old_state, NetworkManager::Device::StateChangeReason \
reason);  
     Q_SIGNALS:
         void back();
diff --git a/applet/interfaceitem.cpp b/applet/interfaceitem.cpp
index 3327489..a2c9030 100644
--- a/applet/interfaceitem.cpp
+++ b/applet/interfaceitem.cpp
@@ -136,8 +136,8 @@ InterfaceItem::InterfaceItem(NetworkManager::Device * iface, \
                RemoteActivatableLi
     m_layout->addItem(m_connectionInfoIcon, 1, 2, 1, 1, Qt::AlignRight); // check...
 
     if (m_iface) {
-        connect(m_iface.data(), SIGNAL(connectionStateChanged(int,int,int)),
-                this, SLOT(handleConnectionStateChange(int,int,int)));
+        connect(m_iface.data(), \
SIGNAL(connectionStateChanged(NetworkManager::Device::State,NetworkManager::Device::State,NetworkManager::Device::StateChangeReason)),
 +                this, \
SLOT(handleConnectionStateChange(NetworkManager::Device::State,NetworkManager::Device::State,NetworkManager::Device::StateChangeReason)));
                
         connect(m_iface.data(), SIGNAL(linkUpChanged(bool)), this, \
SLOT(setActive(bool)));  }
     setNameDisplayMode(mode);
@@ -355,18 +355,13 @@ void InterfaceItem::slotClicked()
     emit clicked(m_iface.data());
 }
 
-void InterfaceItem::handleConnectionStateChange(int new_state, int old_state, int \
reason) +void InterfaceItem::handleConnectionStateChange(NetworkManager::Device::State \
new_state, NetworkManager::Device::State old_state, \
NetworkManager::Device::StateChangeReason reason)  {
     Q_UNUSED(old_state);
     Q_UNUSED(reason);
     connectionStateChanged((NetworkManager::Device::State)new_state);
 }
 
-void InterfaceItem::handleConnectionStateChange(int new_state)
-{
-    connectionStateChanged((NetworkManager::Device::State)new_state);
-}
-
 void InterfaceItem::connectionStateChanged(NetworkManager::Device::State state, bool \
updateConnection)  {
     if (m_state == state) {
diff --git a/applet/interfaceitem.h b/applet/interfaceitem.h
index 2c1daa7..cb8a092 100644
--- a/applet/interfaceitem.h
+++ b/applet/interfaceitem.h
@@ -85,8 +85,7 @@ protected Q_SLOTS:
      * Remove any connections that were provided by this service
      * from our active connection list
      */
-    void handleConnectionStateChange(int new_state);
-    void handleConnectionStateChange(int new_state, int old_state, int reason);
+    void handleConnectionStateChange(NetworkManager::Device::State new_state, \
NetworkManager::Device::State old_state, NetworkManager::Device::StateChangeReason \
reason);  void handleHasDefaultRouteChanged(bool);
     void pppStats(uint in, uint out);
     void slotClicked();
diff --git a/applet/nmpopup.cpp b/applet/nmpopup.cpp
index 7fd5e3f..5e8b44d 100644
--- a/applet/nmpopup.cpp
+++ b/applet/nmpopup.cpp
@@ -454,7 +454,7 @@ void NMPopup::addVpnInterface()
     m_leftLayout->insertItem(2, m_vpnItem);
 }
 
-void NMPopup::handleConnectionStateChange(int new_state, int old_state, int reason)
+void NMPopup::handleConnectionStateChange(NetworkManager::Device::State new_state, \
NetworkManager::Device::State old_state, NetworkManager::Device::StateChangeReason \
reason)  {
     Q_UNUSED( reason );
     // Switch to default tab if an interface has become available, or unavailable
diff --git a/applet/nmpopup.h b/applet/nmpopup.h
index a6ba160..18a5433 100644
--- a/applet/nmpopup.h
+++ b/applet/nmpopup.h
@@ -74,7 +74,7 @@ public Q_SLOTS:
     void manageConnections();
     void showMore();
     void showMore(bool);
-    void handleConnectionStateChange(int new_state, int old_state, int reason);
+    void handleConnectionStateChange(NetworkManager::Device::State new_state, \
NetworkManager::Device::State old_state, NetworkManager::Device::StateChangeReason \
reason);  void toggleInterfaceTab();
     void deleteInterfaceItem();
 


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