aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/http
diff options
context:
space:
mode:
authorGravatar Elvio Basello2008-04-03 17:08:45 +0000
committerGravatar Elvio Basello2008-04-03 17:08:45 +0000
commit78e91f74862208e695afff14cdae3731e24d6a7f (patch)
tree1189c7ba230cb93aee2a81822a988aa5de43a88c /src/modules/http
parentMore kde4 porting (diff)
downloadKVIrc-78e91f74862208e695afff14cdae3731e24d6a7f.tar.gz
KVIrc-78e91f74862208e695afff14cdae3731e24d6a7f.tar.bz2
KVIrc-78e91f74862208e695afff14cdae3731e24d6a7f.zip
more code clean
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1381 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/http')
-rw-r--r--src/modules/http/httpfiletransfer.cpp6
-rw-r--r--src/modules/http/httpfiletransfer.h9
-rw-r--r--src/modules/http/libkvihttp.cpp10
3 files changed, 7 insertions, 18 deletions
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index bbc1dcfd8..0d412e202 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -31,11 +31,10 @@
#include "kvi_netutils.h"
#include "kvi_kvs_eventtriggers.h"
#include "kvi_console.h"
-
#include "kvi_kvs_script.h"
-
#include "kvi_tal_popupmenu.h"
-#include <qpainter.h>
+
+#include <QPainter>
static KviPointerList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
static QPixmap * g_pHttpIcon = 0;
@@ -489,4 +488,3 @@ bool KviHttpFileTransfer::startDownload()
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_httpfiletransfer.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 88dea71d6..95b1408d3 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -27,11 +27,10 @@
#include "kvi_filetransfer.h"
#include "kvi_http.h"
#include "kvi_time.h"
-
#include "kvi_kvs_variant.h"
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <QStringList>
+#include <QTimer>
class QPainter;
class KviTalPopupMenu;
@@ -61,7 +60,6 @@ private:
bool m_bNoOutput;
QTimer * m_pAutoCleanTimer;
-
QString m_szCompletionCallback;
public:
KviHttpRequest * request(){ return m_pHttpRequest; };
@@ -94,11 +92,8 @@ protected slots:
void contactingHost(const QString &ipandport);
void receivedResponse(const QString &response);
void connectionEstabilished();
-
void abort();
-
void autoClean();
};
-
#endif //!_HTTPFILETRANSFER_H_
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index 63553b8b8..017107422 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -22,10 +22,10 @@
//
//==================================================================================
+#include "httpfiletransfer.h"
+
#include "kvi_module.h"
#include "kvi_string.h"
-
-
#include "kvi_app.h"
#include "kvi_locale.h"
#include "kvi_filedialog.h"
@@ -33,9 +33,6 @@
#include "kvi_error.h"
#include "kvi_cmdformatter.h"
-#include "httpfiletransfer.h"
-
-
static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QString &szFileName,const QString &szCallback)
{
if(szUrl.isEmpty())
@@ -290,7 +287,6 @@ static bool http_kvs_cmd_asyncGet(KviKvsModuleCallbackCommandCall * c)
return http_kvs_complete_get(c,szUrl,szFileName,c->callback()->code());
}
-
static bool http_module_init(KviModule * m)
{
KviHttpFileTransfer::init();
@@ -314,7 +310,7 @@ static bool http_module_can_unload(KviModule *m)
KVIRC_MODULE(
"Http", // module name
- "1.0.0", // module version
+ "4.0.0", // module version
"Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
"HTTP interface for KVIrc",
http_module_init,