aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc/chat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dcc/chat.cpp')
-rw-r--r--src/modules/dcc/chat.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index c1fdc03de..3ce235aaf 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -4,7 +4,7 @@
// Creation date : Tue Sep 20 09 2000 15:13:13 by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
-// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -36,24 +36,24 @@
#include "kvi_input.h"
#include "kvi_ircview.h"
#include "kvi_iconmanager.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
#include "kvi_error.h"
#include "kvi_out.h"
#include "kvi_netutils.h"
#include "kvi_console.h"
#include "kvi_frame.h"
-#include "kvi_malloc.h"
+#include "KviMemory.h"
#include "kvi_memmove.h"
-#include "kvi_thread.h"
+#include "KviThread.h"
#include "kvi_ircsocket.h"
#include "kvi_settings.h"
#include "kvi_socket.h"
#include "kvi_app.h"
-#include "kvi_parameterlist.h"
+#include "KviParameterList.h"
#include "kvi_ircconnection.h"
#include "kvi_ircconnectionuserinfo.h"
#include "kvi_kvs_eventtriggers.h"
-#include "kvi_mirccntrl.h"
+#include "KviMircCntrl.h"
#include "kvi_tal_vbox.h"
#include <QEvent>
@@ -62,7 +62,7 @@
#include <QTextDocument> //for Qt::escape
#ifdef COMPILE_CRYPT_SUPPORT
- #include "kvi_crypt.h"
+ #include "KviCryptEngine.h"
#include "kvi_cryptcontroller.h"
#endif
@@ -187,7 +187,7 @@ void KviDccChat::connectionInProgress()
if(m_pDescriptor->bSendRequest)
{
- KviStr ip;
+ KviCString ip;
if(!m_pDescriptor->szFakeIp.isEmpty())
{
ip = m_pDescriptor->szFakeIp;
@@ -201,7 +201,7 @@ void KviDccChat::connectionInProgress()
// try to get the IP that the IRC server can see
if(m_pDescriptor->console())
{
- KviStr tmp = m_pDescriptor->console()->connection() ? m_pDescriptor->console()->connection()->userInfo()->hostIp().toUtf8().data() : "";
+ KviCString tmp = m_pDescriptor->console()->connection() ? m_pDescriptor->console()->connection()->userInfo()->hostIp().toUtf8().data() : "";
if(tmp.hasData())
{
ip = tmp;
@@ -309,13 +309,13 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
{
if(*d != KVI_TEXT_CRYPTESCAPE)
{
- KviStr encrypted;
+ KviCString encrypted;
cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1);
switch(cryptSessionInfo()->m_pEngine->encrypt(d,encrypted))
{
case KviCryptEngine::Encrypted:
{
- KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
+ KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
if(bUserFeedback)
m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
@@ -325,7 +325,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
break;
case KviCryptEngine::Encoded:
{
- KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
+ KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
if(bUserFeedback)
{
@@ -348,7 +348,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
return;
} else {
d++; //eat the escape code
- KviStr buf(KviStr::Format,"%s\r\n",d);
+ KviCString buf(KviCString::Format,"%s\r\n",d);
QString tmp = text.right(text.length() - 1);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
@@ -361,7 +361,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
}
}
#endif
- KviStr buf(KviStr::Format,"%s\r\n",d);
+ KviCString buf(KviCString::Format,"%s\r\n",d);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
if(bUserFeedback)
@@ -393,7 +393,7 @@ void KviDccChat::ownAction(const QString &text)
QByteArray szData = encodeText(szTmpBuffer);
const char * d = szData.data();
if(!d)return;
- KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
+ KviCString buf(KviCString::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
output(KVI_OUT_ACTION,"%Q %Q",&(m_pDescriptor->szLocalNick),&szTmpBuffer);
} else {
@@ -420,8 +420,8 @@ bool KviDccChat::event(QEvent *e)
break;
case KVI_DCC_THREAD_EVENT_DATA:
{
- KviStr * encoded = ((KviThreadDataEvent<KviStr> *)e)->getData();
- KviStr d=KviStr(decodeText(encoded->ptr()));
+ KviCString * encoded = ((KviThreadDataEvent<KviCString> *)e)->getData();
+ KviCString d=KviCString(decodeText(encoded->ptr()));
if(d.firstCharIs(0x01))
{
d.cutLeft(1);
@@ -452,7 +452,7 @@ bool KviDccChat::event(QEvent *e)
{
if(cinf->m_bDoDecrypt)
{
- KviStr decryptedStuff;
+ KviCString decryptedStuff;
switch(cinf->m_pEngine->decrypt(d.ptr(),decryptedStuff))
{
case KviCryptEngine::DecryptOkWasEncrypted:
@@ -628,7 +628,7 @@ void KviDccChatThread::run()
}
if(bCanRead)
{
- data.buffer = (char *) kvi_realloc(data.buffer,(data.iLen + 512) * sizeof(char));
+ data.buffer = (char *) KviMemory::reallocate(data.buffer,(data.iLen + 512) * sizeof(char));
int readLen;
#ifdef COMPILE_SSL_SUPPORT
if(m_pSSL)
@@ -643,7 +643,7 @@ void KviDccChatThread::run()
if(readLen > 0)
{
data.iLen += readLen;
- data.buffer = (char *)kvi_realloc(data.buffer,data.iLen * sizeof(char));
+ data.buffer = (char *)KviMemory::reallocate(data.buffer,data.iLen * sizeof(char));
if(!handleIncomingData(&data,false))break; // non critical...
} else {
@@ -688,9 +688,9 @@ void KviDccChatThread::run()
#endif
if(data.iLen > 0)
{
- data.buffer = (char *)kvi_realloc(data.buffer,data.iLen * sizeof(char));
+ data.buffer = (char *)KviMemory::reallocate(data.buffer,data.iLen * sizeof(char));
} else {
- kvi_free(data.buffer);
+ KviMemory::free(data.buffer);
data.buffer = 0;
}
@@ -709,7 +709,7 @@ void KviDccChatThread::run()
out_of_the_loop:
- if(data.iLen)kvi_free(data.buffer);
+ if(data.iLen)KviMemory::free(data.buffer);
#ifdef COMPILE_SSL_SUPPORT
if(m_pSSL)
@@ -733,12 +733,12 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
{
if((*aux == '\n') || (*aux == '\0'))
{
- KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
+ KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_DATA);
// The left part is len chars long
int len = aux - data->buffer;
// qDebug("LEN = %d, iLen = %d",len,data->iLen);
//#warning "DO IT BETTER (the \r cutting)"
- KviStr * s = new KviStr(data->buffer,len);
+ KviCString * s = new KviCString(data->buffer,len);
if(s->lastCharIs('\r'))s->cutRight(1);
e->setData(s);
// but we cut also \n (or \0)
@@ -752,13 +752,13 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
// memmove the remaining part to the beginning
// aux points after \n or \0
kvi_memmove(data->buffer,aux,data->iLen);
- data->buffer = (char *)kvi_realloc(data->buffer,data->iLen);
+ data->buffer = (char *)KviMemory::reallocate(data->buffer,data->iLen);
end = data->buffer + data->iLen;
aux = data->buffer;
} else {
// no more data in the buffer
KVI_ASSERT(data->iLen == 0);
- kvi_free(data->buffer);
+ KviMemory::free(data->buffer);
data->buffer = end = aux = 0;
}
postEvent(parent(),e);
@@ -772,12 +772,12 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
if(data->iLen > 0)
{
// in the last part there are no NULL and \n chars
- KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_DATA);
- KviStr * s = new KviStr(data->buffer,data->iLen);
+ KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_DATA);
+ KviCString * s = new KviCString(data->buffer,data->iLen);
if(s->lastCharIs('\r'))s->cutRight(1);
e->setData(s);
data->iLen = 0;
- kvi_free(data->buffer);
+ KviMemory::free(data->buffer);
data->buffer = 0;
postEvent(parent(),e);
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 02:51:59 +0000