Constness fixes. Thnks PKEuS :)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4621 17fca916-40b9-46aa-a4ea-0a15b648b75c

14 files changed, 39 insertions, 40 deletions

diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index d1ec565f2..21edede92 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -130,22 +130,22 @@ public:
 	KviStr          szCodec;           // codec name
 	int             iSampleRate;       // Sample rate
 public:
-	QString protocol(){ return szType; };
-	bool isActive(){ return bActive; };
-	QString remoteNick(){ return szNick; };
-	QString remoteUser(){ return szUser; };
-	QString remoteHost(){ return szHost; };
-	QString remoteIp(){ return szIp; };
-	QString remotePort(){ return szPort; };
-	QString remoteFileName(){ return szFileName; };
-	QString remoteFileSize(){ return szFileSize; };
-	QString localNick(){ return szLocalNick; };
-	QString localUser(){ return szLocalUser; };
-	QString localHost(){ return szLocalHost; };
-	QString localIp(){ return szIp; };
-	QString localPort(){ return szPort; };
-	QString localFileName(){ return szLocalFileName; };
-	QString localFileSize(){ return szLocalFileSize; };
+	QString protocol() const { return szType; };
+	bool isActive() const { return bActive; };
+	QString remoteNick() const { return szNick; };
+	QString remoteUser() const { return szUser; };
+	QString remoteHost() const { return szHost; };
+	QString remoteIp() const { return szIp; };
+	QString remotePort() const { return szPort; };
+	QString remoteFileName() const { return szFileName; };
+	QString remoteFileSize() const { return szFileSize; };
+	QString localNick() const { return szLocalNick; };
+	QString localUser() const { return szLocalUser; };
+	QString localHost() const { return szLocalHost; };
+	QString localIp() const { return szIp; };
+	QString localPort() const { return szPort; };
+	QString localFileName() const { return szLocalFileName; };
+	QString localFileSize() const { return szLocalFileSize; };
 	bool isFileUpload();
 	bool isFileDownload();
 	bool isDccChat();
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index cab8f98b9..f41adc930 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -122,7 +122,7 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 			int offset = 0;
 			switch(m_eGeneralStatus)
 			{
-				case Initializing: offset = 0; break;
+				case Initializing:
 				case Connecting: offset = 0; break;
 				case Downloading: offset = 48; break;
 				case Success: offset = 96; break;
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 5aae14f3b..54a63ef9d 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -56,14 +56,14 @@ public:
 
 	KviLogFile(const QString& name);
 
-	const QString & fileName() { return m_szFilename; };
-	const QString & name() { return m_szName; };
-	const QString & network() { return m_szNetwork; };
-	const QDate   & date() { return m_date; };
+	const QString & fileName() const { return m_szFilename; };
+	const QString & name() const { return m_szName; };
+	const QString & network() const { return m_szNetwork; };
+	const QDate   & date() const { return m_date; };
 
 	void getText(QString & text,const QString& logDir);
 
-	KviLogTypes type() { return m_type; };
+	KviLogTypes type() const { return m_type; };
 private:
 	KviLogTypes  m_type;
 	QString      m_szFilename;
diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h
index f095dab59..ca0615f3a 100644
--- a/src/modules/mediaplayer/mp_interface.h
+++ b/src/modules/mediaplayer/mp_interface.h
@@ -38,7 +38,7 @@ public:
 protected:
 	QString m_szLastError;
 public:
-	const QString & lastError(){ return m_szLastError; };
+	const QString & lastError() const { return m_szLastError; };
 
 	//
 	// mandatory interface
diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp
index 520f5f420..4dc8fb480 100644
--- a/src/modules/my/idle_mac.cpp
+++ b/src/modules/my/idle_mac.cpp
@@ -156,7 +156,7 @@
 	}
 
 
-	int IdlePlatform::secondsIdle() {
+	int IdlePlatform::secondsIdle() const {
 		return d->mSecondsIdle;
 	}
 #endif
diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp
index 28178c0b7..27c619864 100644
--- a/src/modules/my/idle_x11.cpp
+++ b/src/modules/my/idle_x11.cpp
@@ -25,8 +25,8 @@
 #ifndef COMPILE_XSS_SUPPORT
 	IdlePlatform::IdlePlatform() {}
 	IdlePlatform::~IdlePlatform() {}
-	bool IdlePlatform::init() { return false; }
-	int IdlePlatform::secondsIdle() { return 0; }
+	bool IdlePlatform::init() const { return false; }
+	int IdlePlatform::secondsIdle() const { return 0; }
 #else
 	#include <QApplication>
 	#include <QDesktopWidget>
diff --git a/src/modules/notifier/notifierwindowborder.h b/src/modules/notifier/notifierwindowborder.h
index f933a90fa..d3aad1030 100644
--- a/src/modules/notifier/notifierwindowborder.h
+++ b/src/modules/notifier/notifierwindowborder.h
@@ -117,11 +117,11 @@ public:
 	inline int height() const { return m_rct.height(); };
 	inline int baseLine() const { return (y()+height()); };
 
-	inline QRect bodyRect() { return m_bodyRect; };
-	inline QRect captionRect() { return m_captionRect; };
-	inline QRect rect() { return m_rct; };
-	inline QRect closeRect() { return m_closeIconRect; };
-	inline QRect titleRect() { return m_titleRect; };
+	inline QRect bodyRect() const { return m_bodyRect; };
+	inline QRect captionRect() const { return m_captionRect; };
+	inline QRect rect() const { return m_rct; };
+	inline QRect closeRect() const { return m_closeIconRect; };
+	inline QRect titleRect() const { return m_titleRect; };
 
 	void draw(QPainter *, bool b = false);
 	void setPics(bool b = false);
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 0a3415229..3900d2f5d 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -107,7 +107,7 @@ public:
 	bool init(); // if this fails then well.. :D
 	void done();
 	bool execute(const QString &szCode,QStringList &args,QString &szRetVal,QString &szError,QStringList &lWarnings);
-	const QString & contextName(){ return m_szContextName; };
+	const QString & contextName() const { return m_szContextName; };
 protected:
 	QString svToQString(SV * sv);
 };
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index aef979c02..d57a29861 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -58,7 +58,7 @@ public:
 	bool init(); // if this fails then well.. :D
 	void done();
 	bool execute(const QString & szCode, QStringList & lArgs, QString & szRetVal, QString & szError, QStringList & lWarnings);
-	const QString & contextName(){ return m_szContextName; };
+	const QString & contextName() const { return m_szContextName; };
 };
 
 KviPythonInterpreter::KviPythonInterpreter(const QString & szContextName)
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 762d0ec3a..3ef26665f 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -120,12 +120,12 @@ public:
 	{
 	}
 
-	SoundSystemPlayRoutine playRoutine()
+	SoundSystemPlayRoutine playRoutine() const
 	{
 		return m_pPlayRoutine;
 	}
 	
-	SoundSystemCleanupRoutine cleanupRoutine()
+	SoundSystemCleanupRoutine cleanupRoutine() const
 	{
 		return m_pCleanupRoutine;
 	}
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp
index c96f8fe10..15f331396 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/plugin.cpp
@@ -194,7 +194,7 @@ int KviPlugin::call(const QString& pszFunctionName, int argc, char * argv[], cha
 	return r;
 }
 
-QString KviPlugin::name()
+QString KviPlugin::name() const
 {
 	return m_szName;
 }
diff --git a/src/modules/system/plugin.h b/src/modules/system/plugin.h
index 43229ab76..0ff3c9baa 100644
--- a/src/modules/system/plugin.h
+++ b/src/modules/system/plugin.h
@@ -53,7 +53,7 @@ public:
 	bool unload();
 	bool canunload();
 	int call(const QString& szFunctionName, int argc, char * argv[], char ** pBuffer);
-	QString name();
+	QString name() const;
 	void setName(const QString& szName);
 protected:
 };
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 5f3e6a65f..1e5107ec7 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -258,9 +258,8 @@ static bool tip_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	if(!g_pTipWindow)g_pTipWindow = new KviTipWindow();
-	bool error=false;
 	if (!szTipfilename.isEmpty())
-		error=g_pTipWindow->openConfig(szTipfilename);
+		_pTipWindow->openConfig(szTipfilename);
 	g_pTipWindow->nextTip();
 	g_pTipWindow->show();
 	return true;
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 17563cd81..c125c5cff 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -461,9 +461,9 @@ void KviTrayIcon::grabActivityInfo()
 				break;
 			}
 		} else {
-			unsigned int iLevel=0;
 			if(b->kviWindow()->view())
 			{
+				unsigned int iLevel=0;
 				if(b->kviWindow()->view()->haveUnreadedHighlightedMessages())
 				{
 					iLevel=2;