summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2019-01-28 23:01:27 +0100
committerNao Pross <naopross@thearcway.org>2019-01-28 23:01:27 +0100
commit8699104339217cf6b7e9fe46332c73f4a0c7901f (patch)
treef699cd8c7a196034dd171e27ba504e56c2807215 /test
parentRemove bitfileds to remove a bazillion of warnings (diff)
downloadflatland-8699104339217cf6b7e9fe46332c73f4a0c7901f.tar.gz
flatland-8699104339217cf6b7e9fe46332c73f4a0c7901f.zip
Remove almost every -Wshadow warning
Diffstat (limited to 'test')
-rw-r--r--test/signal_test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/signal_test.cpp b/test/signal_test.cpp
index 4dcb635..01fbe2d 100644
--- a/test/signal_test.cpp
+++ b/test/signal_test.cpp
@@ -14,19 +14,19 @@ using namespace flat::core;
class sender : public object
{
- const char * message;
- channel::ptr chan;
+ const char *m_message;
+ channel::ptr m_chan;
public:
- sender(const char * message, channel::ptr chan) : message(message), chan(chan)
+ sender(const char * message, channel::ptr chan) : m_message(message), m_chan(chan)
{
}
void send()
{
- signal msg(this, "", (void*)message);
- chan->emit(msg);
+ signal msg(this, "", (void*)m_message);
+ m_chan->emit(msg);
}
};
@@ -38,13 +38,13 @@ void function_listener(const object*, core::signal::package msg)
class c_listener
{
- listener::ptr lis;
+ listener::ptr m_lis;
public:
c_listener(channel::ptr chan)
{
- lis = chan->connect(&c_listener::method_listener, this);
+ m_lis = chan->connect(&c_listener::method_listener, this);
}
void method_listener(const object *o, signal::package msg)