aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/http
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/http')
-rw-r--r--src/modules/http/httpfiletransfer.cpp12
-rw-r--r--src/modules/http/httpfiletransfer.h6
-rw-r--r--src/modules/http/libkvihttp.cpp8
3 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index adfcd1c06..7c53191b8 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -4,7 +4,7 @@
// Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
//
// This config is part of the KVirc irc client distribution
-// Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2003-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
@@ -26,7 +26,7 @@
#include "kvi_app.h"
#include "kvi_out.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
#include "kvi_window.h"
#include "kvi_iconmanager.h"
#include "kvi_netutils.h"
@@ -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(KviPointerHashTable<const char *,KviStr> *)),this,SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *)));
+ connect(m_pHttpRequest,SIGNAL(header(KviPointerHashTable<const char *,KviCString> *)),this,SLOT(headersReceived(KviPointerHashTable<const char *,KviCString> *)));
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 &)));
@@ -458,14 +458,14 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
}
}
-void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviStr> *h)
+void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCString> *h)
{
if(!h)return;
KviWindow * out = transferWindow();
if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSTATUS,__tr2qs_ctx("[HTTP %d]: Response headers:","http"),id());
- KviPointerHashTableIterator<const char *,KviStr> it(*h);
- while(KviStr * s = it.current())
+ KviPointerHashTableIterator<const char *,KviCString> it(*h);
+ while(KviCString * s = it.current())
{
QString szHeader = it.currentKey();
szHeader += ": ";
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 735c53d7a..af904a47a 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -6,7 +6,7 @@
// Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
//
// This config is part of the KVirc irc client distribution
-// Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2003-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
@@ -26,7 +26,7 @@
#include "kvi_filetransfer.h"
#include "kvi_http.h"
-#include "kvi_time.h"
+#include "KviTimeUtils.h"
#include "kvi_kvs_variant.h"
#include <QStringList>
@@ -85,7 +85,7 @@ public:
protected slots:
void statusMessage(const QString &txt);
void transferTerminated(bool bSuccess);
- void headersReceived(KviPointerHashTable<const char *,KviStr> *h);
+ void headersReceived(KviPointerHashTable<const char *,KviCString> *h);
void requestSent(const QStringList &sl);
void resolvingHost(const QString &hostname);
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index b29423271..1abcba578 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -4,7 +4,7 @@
// Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
//
// This config is part of the KVirc irc client distribution
-// Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
+// Copyright (C) 2003-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
@@ -25,13 +25,13 @@
#include "httpfiletransfer.h"
#include "kvi_module.h"
-#include "kvi_string.h"
+#include "KviCString.h"
#include "kvi_app.h"
-#include "kvi_locale.h"
+#include "KviLocale.h"
#include "kvi_filedialog.h"
#include "kvi_window.h"
#include "kvi_error.h"
-#include "kvi_cmdformatter.h"
+#include "KviCommandFormatter.h"
static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback)
{