From 49f6c4e757367b84757e979c10f42a2ec8ff830e Mon Sep 17 00:00:00 2001 From: lotodore Date: Wed, 9 Feb 2011 16:25:05 +0000 Subject: [PATCH] More cppcheck fixes. --- src/gui/qt/gametable/myavatarlabel.cpp | 2 +- src/gui/qt/startwindow/startwindowimpl.h | 2 +- src/net/common/chatcleanermanager.cpp | 1 + src/net/receivebuffer.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp index 57682d01..e8f2078f 100644 --- a/src/gui/qt/gametable/myavatarlabel.cpp +++ b/src/gui/qt/gametable/myavatarlabel.cpp @@ -362,7 +362,7 @@ bool MyAvatarLabel::playerIsOnIgnoreList(QString playerName) { list playerIgnoreList = myW->getMyConfig()->readConfigStringList("PlayerIgnoreList"); list::iterator it1; - for(it1= playerIgnoreList.begin(); it1 != playerIgnoreList.end(); it1++) { + for(it1= playerIgnoreList.begin(); it1 != playerIgnoreList.end(); ++it1) { if(playerName == QString::fromUtf8(it1->c_str())) { return true; diff --git a/src/gui/qt/startwindow/startwindowimpl.h b/src/gui/qt/startwindow/startwindowimpl.h index 721bb6f8..97d44613 100644 --- a/src/gui/qt/startwindow/startwindowimpl.h +++ b/src/gui/qt/startwindow/startwindowimpl.h @@ -24,7 +24,7 @@ #include #include "ui_startwindow.h" #include "game_defs.h" -#include "QMessageBox" +#include class GuiInterface; class GuiWrapper; diff --git a/src/net/common/chatcleanermanager.cpp b/src/net/common/chatcleanermanager.cpp index 3e79a9b2..75401989 100644 --- a/src/net/common/chatcleanermanager.cpp +++ b/src/net/common/chatcleanermanager.cpp @@ -34,6 +34,7 @@ ChatCleanerManager::ChatCleanerManager(ChatCleanerCallback &cb, boost::shared_pt : m_callback(cb), m_ioService(ioService), m_connected(false), m_curRequestId(0), m_serverPort(0), m_useIpv6(false), m_recvBufUsed(0) { + m_recvBuf[0] = 0; m_resolver.reset( new boost::asio::ip::tcp::resolver(*m_ioService)); } diff --git a/src/net/receivebuffer.h b/src/net/receivebuffer.h index 4dd1dfe4..253f1d91 100644 --- a/src/net/receivebuffer.h +++ b/src/net/receivebuffer.h @@ -28,7 +28,7 @@ struct ReceiveBuffer { - ReceiveBuffer() : recvBufUsed(0) {} + ReceiveBuffer() : recvBufUsed(0) {recvBuf[0] = 0;} NetPacketList receivedPackets; char recvBuf[RECV_BUF_SIZE]; unsigned recvBufUsed;