aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/http
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2008-01-15 00:44:02 +0000
committerGravatar Szymon Tomasz Stefanek2008-01-15 00:44:02 +0000
commitf366793158b096ece7ca23a742c5ae9ed8688f65 (patch)
tree7cf67714b1af2a4e9e520b8c8b8ba1b77332fb20 /src/modules/http
parentmodified Makefiles to accept new Croatian translation files (diff)
downloadKVIrc-f366793158b096ece7ca23a742c5ae9ed8688f65.tar.gz
KVIrc-f366793158b096ece7ca23a742c5ae9ed8688f65.tar.bz2
KVIrc-f366793158b096ece7ca23a742c5ae9ed8688f65.zip
More alternate port to Qt4: no longer relying on Qt collection classes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1085 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/http')
-rw-r--r--src/modules/http/httpfiletransfer.cpp10
-rw-r--r--src/modules/http/httpfiletransfer.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 18ccb5b7d..2b9b34f11 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -37,7 +37,7 @@
#include "kvi_tal_popupmenu.h"
#include <qpainter.h>
-static KviPtrList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
+static KviPointerList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
static QPixmap * g_pHttpIcon = 0;
@@ -60,7 +60,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
connect(m_pHttpRequest,SIGNAL(status(const QString &)),this,SLOT(statusMessage(const QString &)));
connect(m_pHttpRequest,SIGNAL(terminated(bool)),this,SLOT(transferTerminated(bool)));
- connect(m_pHttpRequest,SIGNAL(header(KviAsciiDict<KviStr> *)),this,SLOT(headersReceived(KviAsciiDict<KviStr> *)));
+ connect(m_pHttpRequest,SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *)));
connect(m_pHttpRequest,SIGNAL(resolvingHost(const QString &)),this,SLOT(resolvingHost(const QString &)));
connect(m_pHttpRequest,SIGNAL(requestSent(const QStringList &)),this,SLOT(requestSent(const QStringList &)));
connect(m_pHttpRequest,SIGNAL(contactingHost(const QString &)),this,SLOT(contactingHost(const QString &)));
@@ -337,7 +337,7 @@ QString KviHttpFileTransfer::tipText()
void KviHttpFileTransfer::init()
{
if(g_pHttpFileTransfers)return;
- g_pHttpFileTransfers = new KviPtrList<KviHttpFileTransfer>;
+ g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>;
g_pHttpFileTransfers->setAutoDelete(false);
QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png");
@@ -462,13 +462,13 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
}
}
-void KviHttpFileTransfer::headersReceived(KviAsciiDict<KviStr> *h)
+void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviStr> *h)
{
if(!h)return;
KviWindow * out = transferWindow();
if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[HTTP %d]: Response headers:","http"),id());
- KviAsciiDictIterator<KviStr> it(*h);
+ KviPointerHashTableIterator<const char *,KviStr> it(*h);
while(KviStr * s = it.current())
{
QString szHeader = it.currentKey();
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 0a556a6bf..88dea71d6 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -87,7 +87,7 @@ public:
protected slots:
void statusMessage(const QString &txt);
void transferTerminated(bool bSuccess);
- void headersReceived(KviAsciiDict<KviStr> *h);
+ void headersReceived(KviPointerHashTable<const char *,KviStr> *h);
void requestSent(const QStringList &sl);
void resolvingHost(const QString &hostname);