Skip to content
Snippets Groups Projects
Commit c70912e0 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #5998: removed using namespace std from networkmanager

parent 974b92f7
No related branches found
No related tags found
No related merge requests found
...@@ -36,11 +36,9 @@ ...@@ -36,11 +36,9 @@
#include <instance.h> #include <instance.h>
#include "../manager.h" #include "../manager.h"
using namespace std; const std::string NetworkManager::statesString[5] = {"unknown", "asleep", "connecting", "connected", "disconnected"};
const string NetworkManager::statesString[5] = {"unknown", "asleep", "connecting", "connected", "disconnected"}; std::string NetworkManager::stateAsString (const uint32_t& state)
string NetworkManager::stateAsString (const uint32_t& state)
{ {
return statesString[state]; return statesString[state];
} }
...@@ -52,9 +50,9 @@ void NetworkManager::StateChanged (const uint32_t& state) ...@@ -52,9 +50,9 @@ void NetworkManager::StateChanged (const uint32_t& state)
void NetworkManager::PropertiesChanged (const std::map< std::string, ::DBus::Variant >& argin0) void NetworkManager::PropertiesChanged (const std::map< std::string, ::DBus::Variant >& argin0)
{ {
const map< string, ::DBus::Variant >::const_iterator iter = argin0.begin(); const std::map< std::string, ::DBus::Variant >::const_iterator iter = argin0.begin();
string message = iter->first; std::string message = iter->first;
_warn ("Properties changed: %s", iter->first.c_str()); _warn ("Properties changed: %s", iter->first.c_str());
/* /*
......
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#pragma GCC diagnostic warning "-Wignored-qualifiers" #pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter" #pragma GCC diagnostic warning "-Wunused-parameter"
using namespace std;
class NetworkManager class NetworkManager
: public org::freedesktop::NetworkManager_proxy, : public org::freedesktop::NetworkManager_proxy,
public DBus::IntrospectableProxy, public DBus::IntrospectableProxy,
...@@ -49,7 +47,7 @@ class NetworkManager ...@@ -49,7 +47,7 @@ class NetworkManager
NetworkManager (DBus::Connection&, const DBus::Path&, const char*); NetworkManager (DBus::Connection&, const DBus::Path&, const char*);
void StateChanged (const uint32_t& state); void StateChanged (const uint32_t& state);
void PropertiesChanged (const std::map< std::string, ::DBus::Variant >& argin0); void PropertiesChanged (const std::map< std::string, ::DBus::Variant >& argin0);
string stateAsString (const uint32_t& state); std::string stateAsString (const uint32_t& state);
enum NMState { enum NMState {
NM_STATE_UNKNOWN = 0, NM_STATE_UNKNOWN = 0,
...@@ -59,7 +57,7 @@ class NetworkManager ...@@ -59,7 +57,7 @@ class NetworkManager
NM_STATE_DISCONNECTED NM_STATE_DISCONNECTED
}; };
static const string statesString[5]; static const std::string statesString[5];
}; };
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment