From 83da8559a49d950400b78158031d724adcb1de47 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Tue, 26 Oct 2010 21:32:39 +0000
Subject: [PATCH] Some changes to make CppCheck happier.

---
 src/chatcleaner/capsfloodcheck.cpp       | 1 +
 src/chatcleaner/cleanerconfig.cpp        | 3 +--
 src/chatcleaner/cleanerconfig.h          | 2 +-
 src/chatcleaner/letterrepeatingcheck.cpp | 1 +
 src/chatcleaner/messagefilter.cpp        | 4 ++--
 src/config/configfile.cpp                | 5 ++---
 src/game.h                               | 1 -
 src/gamedata.h                           | 3 ++-
 src/net/common/ircthread.cpp             | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/chatcleaner/capsfloodcheck.cpp b/src/chatcleaner/capsfloodcheck.cpp
index a2b47453..10f901ee 100644
--- a/src/chatcleaner/capsfloodcheck.cpp
+++ b/src/chatcleaner/capsfloodcheck.cpp
@@ -3,6 +3,7 @@
 #include <QtCore>
 
 CapsFloodCheck::CapsFloodCheck()
+: capsNumberToTrigger(0)
 {
 }
 
diff --git a/src/chatcleaner/cleanerconfig.cpp b/src/chatcleaner/cleanerconfig.cpp
index 341316ea..2172a168 100644
--- a/src/chatcleaner/cleanerconfig.cpp
+++ b/src/chatcleaner/cleanerconfig.cpp
@@ -213,7 +213,6 @@ CleanerConfig::~CleanerConfig()
 
 void CleanerConfig::fillBuffer() {
 
-	size_t i;
 	string tempString1("");
 	string tempString2("");
 
@@ -222,7 +221,7 @@ void CleanerConfig::fillBuffer() {
 	if(doc.LoadFile()) {
 	TiXmlHandle docHandle( &doc );	
 
-		for (i=0; i<configBufferList.size(); i++) {	
+		for (size_t i=0; i<configBufferList.size(); i++) {
 	
 			TiXmlElement* conf = docHandle.FirstChild( "PokerTHCleaner" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
 				
diff --git a/src/chatcleaner/cleanerconfig.h b/src/chatcleaner/cleanerconfig.h
index 4ef727be..f5d4da02 100644
--- a/src/chatcleaner/cleanerconfig.h
+++ b/src/chatcleaner/cleanerconfig.h
@@ -34,7 +34,7 @@ public:
 
 	~CleanerConfig();
 	
-	std::string getConfigFileName() { return configFileName; }
+	std::string getConfigFileName() const { return configFileName; }
 	
 	void fillBuffer();
 	void writeBuffer() const;
diff --git a/src/chatcleaner/letterrepeatingcheck.cpp b/src/chatcleaner/letterrepeatingcheck.cpp
index 72f9f6ad..6349ee64 100644
--- a/src/chatcleaner/letterrepeatingcheck.cpp
+++ b/src/chatcleaner/letterrepeatingcheck.cpp
@@ -3,6 +3,7 @@
 #include <QtCore>
 
 LetterRepeatingCheck::LetterRepeatingCheck()
+: letterNumberToTrigger(0)
 {
 }
 
diff --git a/src/chatcleaner/messagefilter.cpp b/src/chatcleaner/messagefilter.cpp
index 73233154..08b126a4 100644
--- a/src/chatcleaner/messagefilter.cpp
+++ b/src/chatcleaner/messagefilter.cpp
@@ -55,7 +55,6 @@ QStringList MessageFilter::check(unsigned playerId, QString nick, QString msg)
     QString returnAction;
 
     OffenceType offence = NONE;
-    ActionType action = NOTHING;
 
     if(myBadWordCheck->run(msg)) offence = BAD_WORD;
     if(myCapsFloodCheck->run(msg)) offence = CAPS_FLOOD;
@@ -65,7 +64,8 @@ QStringList MessageFilter::check(unsigned playerId, QString nick, QString msg)
 
     if(offence){
 	
-        QMap<unsigned, ClientWarnInfos>::const_iterator i = myClientWarnLevelList.find(playerId);
+		ActionType action = NOTHING;
+		QMap<unsigned, ClientWarnInfos>::const_iterator i = myClientWarnLevelList.find(playerId);
 
         if(i == myClientWarnLevelList.end()) {
             ClientWarnInfos tmpInfos;
diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 557d9bcd..eaa2a184 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -340,8 +340,7 @@ void ConfigFile::fillBuffer() {
 
     boost::recursive_mutex::scoped_lock lock(m_configMutex);
 
-    size_t i;
-    string tempString1("");
+	string tempString1("");
     string tempString2("");
 
     TiXmlDocument doc(configFileName);
@@ -349,7 +348,7 @@ void ConfigFile::fillBuffer() {
     if(doc.LoadFile()) {
         TiXmlHandle docHandle( &doc );
 
-        for (i=0; i<configBufferList.size(); i++) {
+		for (size_t i=0; i<configBufferList.size(); i++) {
 
             TiXmlElement* conf = docHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( configList[i].name ).ToElement();
 
diff --git a/src/game.h b/src/game.h
index f3b63e7e..52262bbc 100755
--- a/src/game.h
+++ b/src/game.h
@@ -97,7 +97,6 @@ private:
 	int startCash;
 	int startSmallBlind;
 	int myGameID;
-	int guiPlayerNum;
 
 	// running variables
 	int currentSmallBlind;
diff --git a/src/gamedata.h b/src/gamedata.h
index 0c8b8bf4..e9799019 100644
--- a/src/gamedata.h
+++ b/src/gamedata.h
@@ -69,7 +69,8 @@ struct GameData
 		firstSmallBlind(0), raiseIntervalMode(RAISE_ON_HANDNUMBER),
 		raiseSmallBlindEveryHandsValue(8), raiseSmallBlindEveryMinutesValue(1),
 		raiseMode(DOUBLE_BLINDS), afterManualBlindsMode(AFTERMB_DOUBLE_BLINDS),
-		afterMBAlwaysRaiseValue(0), guiSpeed(4), playerActionTimeoutSec(20) {}
+		afterMBAlwaysRaiseValue(0), guiSpeed(4), delayBetweenHandsSec(6),
+		playerActionTimeoutSec(20) {}
 	GameType gameType;
 	int maxNumberOfPlayers;
 	int startMoney;
diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp
index fa51d7f4..baed8e3c 100644
--- a/src/net/common/ircthread.cpp
+++ b/src/net/common/ircthread.cpp
@@ -41,7 +41,7 @@ using namespace std;
 
 struct IrcContext
 {
-	IrcContext(IrcThread &t) : ircThread(t), session(NULL), serverPort(0), useIPv6(false), renameTries(0), sendingBlocked(false) {}
+	IrcContext(IrcThread &t) : ircThread(t), session(NULL), serverPort(0), useIPv6(false), renameTries(0), sendingBlocked(false), sendCounter(0) {}
 	IrcThread &ircThread;
 	irc_session_t *session;
 	string serverAddress;