compilation fixes for r4869

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

2 files changed, 49 insertions, 49 deletions

diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 39e28a690..34e01caca 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -651,13 +651,13 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 #ifdef COMPILE_CRYPT_SUPPORT
 	if(cryptSessionInfo())
 	{
-		if(cryptSessionInfo()->bDoEncrypt)
+		if(cryptSessionInfo()->m_bDoEncrypt)
 		{
 			if(*d != KVI_TEXT_CRYPTESCAPE)
 			{
 				KviStr encrypted;
-				cryptSessionInfo()->pEngine->setMaxEncryptLen(-1);
-				switch(cryptSessionInfo()->pEngine->encrypt(d,encrypted))
+				cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
+				switch(cryptSessionInfo()->m_pEngine->encrypt(d,encrypted))
 				{
 					case KviCryptEngine::Encrypted:
 					{
@@ -684,7 +684,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 					break;
 					default: // also case KviCryptEngine::EncryptError
 					{
-						QString szErr = cryptSessionInfo()->pEngine->lastError();
+						QString szErr = cryptSessionInfo()->m_pEngine->lastError();
 						output(KVI_OUT_SYSTEMERROR,
 							__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);
@@ -794,10 +794,10 @@ bool KviDccVideo::event(QEvent *e)
 #ifdef COMPILE_CRYPT_SUPPORT
 					if(KviCryptSessionInfo * cinf = cryptSessionInfo())
 					{
-						if(cinf->bDoDecrypt)
+						if(cinf->m_bDoDecrypt)
 						{
 							KviStr decryptedStuff;
-							switch(cinf->pEngine->decrypt(d.ptr(),decryptedStuff))
+							switch(cinf->m_pEngine->decrypt(d.ptr(),decryptedStuff))
 							{
 								case KviCryptEngine::DecryptOkWasEncrypted:
 								case KviCryptEngine::DecryptOkWasEncoded:
@@ -814,7 +814,7 @@ bool KviDccVideo::event(QEvent *e)
 
 								default: // also case KviCryptEngine::DecryptError
 								{
-									QString szErr = cinf->pEngine->lastError();
+									QString szErr = cinf->m_pEngine->lastError();
 									output(KVI_OUT_SYSTEMERROR,
 										__tr2qs_ctx("The following message appears to be encrypted, but the crypto engine failed to decode it: %Q","dcc"),
 										&szErr);
diff --git a/src/modules/rijndael/libkvirijndael_cryptopp.cpp b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
index 96375cc71..9df64fb7a 100644
--- a/src/modules/rijndael/libkvirijndael_cryptopp.cpp
+++ b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
@@ -497,69 +497,69 @@ static bool rijndael_module_init(KviModule * m)
 	// FIXME: Maybe convert this repeated code to a function eh ?
 	
 	KviCryptEngineDescription * d = new KviCryptEngineDescription;
-	d->szName = "Rijndael128Hex";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(128);
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_szName = "Rijndael128Hex";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(128);
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocRijndael128HexEngine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocRijndael128HexEngine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	d = new KviCryptEngineDescription;
-	d->szName = "Rijndael192Hex";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(192);
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_szName = "Rijndael192Hex";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(192);
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocRijndael192HexEngine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocRijndael192HexEngine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	d = new KviCryptEngineDescription;
-	d->szName = "Rijndael256Hex";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(256);
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_szName = "Rijndael256Hex";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(256);
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocRijndael256HexEngine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocRijndael256HexEngine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	d = new KviCryptEngineDescription;
-	d->szName = "Rijndael128Base64";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(128);
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_szName = "Rijndael128Base64";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(128);
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocRijndael128Base64Engine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocRijndael128Base64Engine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	d = new KviCryptEngineDescription;
-	d->szName = "Rijndael192Base64";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(192);
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_szName = "Rijndael192Base64";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(192);
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocRijndael192Base64Engine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocRijndael192Base64Engine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	d = new KviCryptEngineDescription;
-	d->szName = "Rijndael256Base64";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(256);
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_szName = "Rijndael256Base64";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(256);
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocRijndael256Base64Engine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocRijndael256Base64Engine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	d = new KviCryptEngineDescription;
-	d->szName = "Mircryption";
-	d->szAuthor = "Kai Wasserbäch";
-	d->szDescription = __tr2qs("Popular cryptographic engine based on the\n" \
+	d->m_szName = "Mircryption";
+	d->m_szAuthor = "Kai Wasserbäch";
+	d->m_szDescription = __tr2qs("Popular cryptographic engine based on the\n" \
 		"old Blowfish encryption algorithm.\n" \
 		"The text is first encrypted with Blowfish \n" \
 		"and then base64 encoded.\n" \
@@ -572,10 +572,10 @@ static bool rijndael_module_init(KviModule * m)
 		"if you want to use CBC mode you must prefix\n" \
 		"your key(s) with \"cbc:\".\n\n" \
 		"This is the Crypto++ based version, not relying on embedded code\n");
-	d->iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
+	d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
 	KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
-	d->allocFunc = allocMircryptionEngine;
-	d->deallocFunc = deallocRijndaelCryptEngine;
+	d->m_allocFunc = allocMircryptionEngine;
+	d->m_deallocFunc = deallocRijndaelCryptEngine;
 	m->registerCryptEngine(d);
 	
 	return true;