Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
c70912e0
Commit
c70912e0
authored
13 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #5998: removed using namespace std from networkmanager
parent
974b92f7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/src/dbus/networkmanager.cpp
+4
-6
4 additions, 6 deletions
sflphone-common/src/dbus/networkmanager.cpp
sflphone-common/src/dbus/networkmanager.h
+2
-4
2 additions, 4 deletions
sflphone-common/src/dbus/networkmanager.h
with
6 additions
and
10 deletions
sflphone-common/src/dbus/networkmanager.cpp
+
4
−
6
View file @
c70912e0
...
...
@@ -36,11 +36,9 @@
#include
<instance.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"
};
string
NetworkManager
::
stateAsString
(
const
uint32_t
&
state
)
std
::
string
NetworkManager
::
stateAsString
(
const
uint32_t
&
state
)
{
return
statesString
[
state
];
}
...
...
@@ -52,9 +50,9 @@ void NetworkManager::StateChanged (const uint32_t& state)
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
());
/*
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/src/dbus/networkmanager.h
+
2
−
4
View file @
c70912e0
...
...
@@ -37,8 +37,6 @@
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
using
namespace
std
;
class
NetworkManager
:
public
org
::
freedesktop
::
NetworkManager_proxy
,
public
DBus
::
IntrospectableProxy
,
...
...
@@ -49,7 +47,7 @@ class NetworkManager
NetworkManager
(
DBus
::
Connection
&
,
const
DBus
::
Path
&
,
const
char
*
);
void
StateChanged
(
const
uint32_t
&
state
);
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
{
NM_STATE_UNKNOWN
=
0
,
...
...
@@ -59,7 +57,7 @@ class NetworkManager
NM_STATE_DISCONNECTED
};
static
const
string
statesString
[
5
];
static
const
std
::
string
statesString
[
5
];
};
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment