More Qt 4.x port

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

4 files changed, 14 insertions, 8 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index fa286d587..221084dae 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -58,7 +58,7 @@ KviDccBroker::KviDccBroker()
 	m_pDccWindowList = new KviPtrList<KviWindow>;
 	m_pDccWindowList->setAutoDelete(false);
 
-	m_pZeroPortTags = new QDict<KviDccZeroPortTag>(17);
+	m_pZeroPortTags = new KviDict<KviDccZeroPortTag>(17);
 	m_pZeroPortTags->setAutoDelete(true);
 }
 
diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h
index 283e3862e..5bac15613 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/broker.h
@@ -29,7 +29,7 @@
 #include "kvi_list.h"
 #include "kvi_sparser.h"
 
-#include <qdict.h>
+#include "kvi_dict.h"
 #include <qdatetime.h>
 #include <qobject.h>
 
@@ -58,7 +58,7 @@ public:
 protected:
 	KviPtrList<KviDccBox>         * m_pBoxList;
 	KviPtrList<KviWindow>         * m_pDccWindowList;
-	QDict<KviDccZeroPortTag>      * m_pZeroPortTags;
+	KviDict<KviDccZeroPortTag>      * m_pZeroPortTags;
 public:
 	KviDccZeroPortTag * addZeroPortTag();
 	KviDccZeroPortTag * findZeroPortTag(const QString &szTag);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 94e0350f6..608859677 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -337,9 +337,12 @@ void KviDccChat::ownMessage(const QString &text)
 					}
 					break;
 					default: // also case KviCryptEngine::EncryptError
+					{
+						QString szErr = cryptSessionInfo()->pEngine->lastError();
 						output(KVI_OUT_SYSTEMERROR,
-							__tr2qs_ctx("The crypto engine was not able to encrypt the current message (%Q): %s, no data was sent to the remote end","dcc"),
-							&text,cryptSessionInfo()->pEngine->lastError());
+							__tr2qs_ctx("The crypto engine was not able to encrypt the current message (%Q): %Q, no data was sent to the remote end","dcc"),
+							&text,&szErr);
+					}
 					break;
 				}
 				return;
@@ -437,9 +440,12 @@ bool KviDccChat::event(QEvent *e)
 								break;
 								
 								default: // also case KviCryptEngine::DecryptError
+								{
+									QString szErr = cinf->pEngine->lastError();
 									output(KVI_OUT_SYSTEMERROR,
-										__tr2qs_ctx("The following message appears to be encrypted, but the crypto engine failed to decode it: %s","dcc"),
-										cinf->pEngine->lastError());
+										__tr2qs_ctx("The following message appears to be encrypted, but the crypto engine failed to decode it: %Q","dcc"),
+										&szErr);
+								}
 								break;
 							}
 						}
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index 0b7c12c23..c123d98f1 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -315,7 +315,7 @@ public:
 	~KviVoiceConference();
 public:
 	KviPtrList<KviVoiceLink> * m_pLinks;
-	QDict<KviVoiceLink> * 
+	KviDict<KviVoiceLink> * 
 	SOCKET m_hUdpSocket;
 	QString m_szLastError;