diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/channelmanager.cpp | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | mv-stripped1.1.11.12.tar.gz mv-stripped1.1.11.12.tar.bz2 mv-stripped1.1.11.12.tar.xz mv-stripped1.1.11.12.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
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; } |