last round of compilation noise reduction

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

4 files changed, 19 insertions, 18 deletions

diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 86bfa9c9e..8a7a12c0c 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -102,9 +102,9 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
 	KviBoolSelector * b6 = addBoolSelector(g,__tr2qs_ctx("Use custom alert level","options"),KviOption_boolHighlightOnlyAtCostumHighlightLevel);
 	mergeTip(b6, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the window list only if the specified alert level is reached.</center>","options"));
 
-	KviUIntSelector * b7 = addUIntSelector(g,__tr2qs_ctx("Minimum alert level:","options"),KviOption_uintMinHighlightLevel,1,KVI_MSGTYPE_MAXLEVEL,KVI_MSGTYPE_MAXLEVEL,KVI_OPTION_UINT(KviOption_boolHighlightOnlyAtCostumHighlightLevel));
+	KviUIntSelector * b7 = addUIntSelector(g,__tr2qs_ctx("Minimum alert level:","options"),KviOption_uintMinHighlightLevel,1,KVI_MSGTYPE_MAXLEVEL,KVI_MSGTYPE_MAXLEVEL,KVI_OPTION_BOOL(KviOption_boolHighlightOnlyAtCostumHighlightLevel));
 	b7->setEnabled(KVI_OPTION_BOOL(KviOption_boolHighlightOnlyAtCostumHighlightLevel));
-	mergeTip(b6, __tr2qs_ctx("<center>This option sets the minimum alert level for the window list.</center>","options"));
+	mergeTip(b7, __tr2qs_ctx("<center>This option sets the minimum alert level for the window list.</center>","options"));
 	connect(b6,SIGNAL(toggled(bool)),b7,SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,1,0,1);
diff --git a/src/modules/rijndael/rijndael.cpp b/src/modules/rijndael/rijndael.cpp
index 61eab2084..baa70a30f 100644
--- a/src/modules/rijndael/rijndael.cpp
+++ b/src/modules/rijndael/rijndael.cpp
@@ -1135,7 +1135,7 @@ int Rijndael::blockEncrypt(const UINT8 *input,int inputLen,UINT8 *outBuffer)
 					iv[3][0] = (iv[3][0] << 1) | (iv[3][1] >> 7);
 					iv[3][1] = (iv[3][1] << 1) | (iv[3][2] >> 7);
 					iv[3][2] = (iv[3][2] << 1) | (iv[3][3] >> 7);
-					iv[3][3] = (iv[3][3] << 1) | (outBuffer[k/8] >> (7-(k&7))) & 1;
+					iv[3][3] = (iv[3][3] << 1) | ((outBuffer[k/8] >> (7-(k&7))) & 1);
 				}
 			}
 		break;
@@ -1289,7 +1289,7 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer)
 					iv[3][0] = (iv[3][0] << 1) | (iv[3][1] >> 7);
 					iv[3][1] = (iv[3][1] << 1) | (iv[3][2] >> 7);
 					iv[3][2] = (iv[3][2] << 1) | (iv[3][3] >> 7);
-					iv[3][3] = (iv[3][3] << 1) | (input[k/8] >> (7-(k&7))) & 1;
+					iv[3][3] = (iv[3][3] << 1) | ((input[k/8] >> (7-(k&7))) & 1);
 					outBuffer[k/8] ^= (block[0] & 0x80) >> (k & 7);
 				}
 			}
diff --git a/src/modules/rijndael/rijndael.h b/src/modules/rijndael/rijndael.h
index 9ad685c20..bd2d7401f 100644
--- a/src/modules/rijndael/rijndael.h
+++ b/src/modules/rijndael/rijndael.h
@@ -88,6 +88,7 @@
 #define _MAX_ROUNDS      14
 //#define BITSPERBLOCK        128 /* Default number of bits in a cipher block */
 #define MAX_IV_SIZE      16
+#define STRICT_ALIGN 0
 
 // We assume that unsigned int is 32 bits long....
 typedef unsigned char  UINT8;
diff --git a/src/modules/torrent/tc_ktorrentdbusinterface.cpp b/src/modules/torrent/tc_ktorrentdbusinterface.cpp
index f35305432..cff07885b 100644
--- a/src/modules/torrent/tc_ktorrentdbusinterface.cpp
+++ b/src/modules/torrent/tc_ktorrentdbusinterface.cpp
@@ -45,7 +45,7 @@
 
 	KviKTorrentDBusInterface::KviKTorrentDBusInterface()
 	{
-		printf("KviKTorrentDBusInterface\n");
+// 		printf("KviKTorrentDBusInterface\n");
 
 // 		QTimer *timer = new QTimer(this);
 // 		connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer()));
@@ -60,7 +60,7 @@
 
 	KviKTorrentDBusInterface::~KviKTorrentDBusInterface()
 	{
-		printf("~KviKTorrentDBusInterface\n");
+// 		printf("~KviKTorrentDBusInterface\n");
 	}
 
 	bool KviKTorrentDBusInterface::findRunningApp()
@@ -90,7 +90,7 @@
 	}
 
 #define KTDBUS_SIMPLE_CALL(__action) \
-	QDBusInterface dbus_iface("org.ktorrent.ktorrent", "/KTorrent", \
+	QDBusInterface dbus_iface("org.ktorrent.ktorrent", "/core", \
 				"org.ktorrent.KTorrent", QDBusConnection::sessionBus()); \
 	QDBusMessage reply = dbus_iface.call(QDBus::Block, __action); \
 	if (reply.type() == QDBusMessage::ErrorMessage) { \
@@ -168,7 +168,7 @@
 		return true;
 	}
 */
-	bool KviKTorrentDBusInterface::start(int i)
+	bool KviKTorrentDBusInterface::start(int )
 	{
 /*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -180,7 +180,7 @@
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::stop(int i)
+	bool KviKTorrentDBusInterface::stop(int )
 	{
 /*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -192,7 +192,7 @@
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::announce(int i)
+	bool KviKTorrentDBusInterface::announce(int )
 	{
 /*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -204,7 +204,7 @@
 		return true;
 	}
 
-	QString KviKTorrentDBusInterface::state(int i)
+	QString KviKTorrentDBusInterface::state(int )
 	{
 /*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -214,7 +214,7 @@
 	return QString();
 	}
 
-	QString KviKTorrentDBusInterface::name(int i)
+	QString KviKTorrentDBusInterface::name(int )
 	{
 	/*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -224,7 +224,7 @@
 	return QString();
 	}
 
-	int KviKTorrentDBusInterface::fileCount(int i)
+	int KviKTorrentDBusInterface::fileCount(int )
 	{
 	/*
 		CHECK_RANGE_INT(i, m_ti.size())
@@ -238,7 +238,7 @@
 	return 0;
 	}
 
-	QString KviKTorrentDBusInterface::fileName(int i, int file)
+	QString KviKTorrentDBusInterface::fileName(int , int )
 	{
 	/*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -254,7 +254,7 @@
 	return QString();
 	}
 
-	QString KviKTorrentDBusInterface::filePriority(int i, int file)
+	QString KviKTorrentDBusInterface::filePriority(int , int )
 	{
 	/*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -278,7 +278,7 @@
 	return QString();
 	}
 
-	bool KviKTorrentDBusInterface::setFilePriority(int i, int file, const QString &prio)
+	bool KviKTorrentDBusInterface::setFilePriority(int , int , const QString &)
 	{
 	/*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -480,7 +480,7 @@
 	return -1;
 	}
 
-	bool KviKTorrentDBusInterface::setMaxUploadSpeed(int kbytes_per_sec)
+	bool KviKTorrentDBusInterface::setMaxUploadSpeed(int )
 	{
 	/*
 		if (!voidRetIntDCOPCall("KTorrent", "setMaxUploadSpeed(int)", kbytes_per_sec))
@@ -489,7 +489,7 @@
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::setMaxDownloadSpeed(int kbytes_per_sec)
+	bool KviKTorrentDBusInterface::setMaxDownloadSpeed(int )
 	{
 	/*
 		if (!voidRetIntDCOPCall("KTorrent", "setMaxDownloadSpeed(int)", kbytes_per_sec))