diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
| commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
| tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/channelmanager.cpp | |
| parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
| download | mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip | |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/channelmanager.cpp')
| -rw-r--r-- | src/channelmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp index 23c68c1f7..4ae1ebe2a 100644 --- a/src/channelmanager.cpp +++ b/src/channelmanager.cpp @@ -40,7 +40,7 @@ ChannelManager::~ChannelManager() Channel *ChannelManager::findById(int id) const { - Channel *channel = 0; + Channel *channel = nullptr; for (std::list<Channel*>::const_iterator itr = mChannels.begin(), end = mChannels.end(); itr != end; @@ -60,7 +60,7 @@ Channel *ChannelManager::findById(int id) const Channel *ChannelManager::findByName(const std::string &name) const { - Channel *channel = 0; + Channel *channel = nullptr; if (!name.empty()) { for (std::list<Channel*>::const_iterator itr = mChannels.begin(), @@ -90,5 +90,5 @@ void ChannelManager::removeChannel(Channel *channel) { mChannels.remove(channel); delete channel; - channel = 0; + channel = nullptr; } |