The big rename for modules. Still some details remaining.

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

4 files changed, 39 insertions, 39 deletions

diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
index b3a48e052..29ce4f8f1 100644
--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/http
 
 SET(kvihttp_MOC_HDRS
-	httpfiletransfer.h
+	HttpFileTransfer.h
 )
 
 SET(kvihttp_SRCS
 	libkvihttp.cpp
-	httpfiletransfer.cpp
+	HttpFileTransfer.cpp
 )
 
 SET(files
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index 2c48b49c2..2e63b1aa1 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : httpfiletransfer.h
+//   File : HttpFileTransfer.h
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "httpfiletransfer.h"
+#include "HttpFileTransfer.h"
 
 #include "KviApplication.h"
 #include "kvi_out.h"
@@ -37,11 +37,11 @@
 
 #include <QPainter>
 
-static KviPointerList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
+static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = 0;
 static QPixmap * g_pHttpIcon = 0;
 
 
-KviHttpFileTransfer::KviHttpFileTransfer()
+HttpFileTransfer::HttpFileTransfer()
 : KviFileTransfer()
 {
 	init(); // ensure we're initialized
@@ -71,7 +71,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 	m_szStatusString = __tr2qs_ctx("Initializing","http");
 }
 
-KviHttpFileTransfer::~KviHttpFileTransfer()
+HttpFileTransfer::~HttpFileTransfer()
 {
 	g_pHttpFileTransfers->removeRef(this);
 	delete m_pHttpRequest;
@@ -82,34 +82,34 @@ KviHttpFileTransfer::~KviHttpFileTransfer()
 	}
 }
 
-void KviHttpFileTransfer::autoClean()
+void HttpFileTransfer::autoClean()
 {
 	killTimer(m_TimerId);
 	die();
 }
 
-QString KviHttpFileTransfer::localFileName()
+QString HttpFileTransfer::localFileName()
 {
 	return m_pHttpRequest->fileName();
 }
 
-void KviHttpFileTransfer::abort()
+void HttpFileTransfer::abort()
 {
 	m_pHttpRequest->abort();
 }
 
-void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m)
+void HttpFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 {
 	int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
 }
 
-bool KviHttpFileTransfer::active()
+bool HttpFileTransfer::active()
 {
 	return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Downloading));
 }
 
-void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
+void HttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 {
 	int width = rect.width(), height = rect.height();
 	QString txt;
@@ -288,13 +288,13 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 	}
 }
 
-int KviHttpFileTransfer::displayHeight(int iLineSpacing)
+int HttpFileTransfer::displayHeight(int iLineSpacing)
 {
 	int iH = (iLineSpacing * 3) + 10;
 	return iH >= 70 ? iH : 70;
 }
 
-QString KviHttpFileTransfer::tipText()
+QString HttpFileTransfer::tipText()
 {
 	QString s;
 	s = QString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>HTTP Transfer (ID %1)</b></font></td></tr>").arg(id());
@@ -330,10 +330,10 @@ QString KviHttpFileTransfer::tipText()
 	return s;
 }
 
-void KviHttpFileTransfer::init()
+void HttpFileTransfer::init()
 {
 	if(g_pHttpFileTransfers)return;
-	g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>;
+	g_pHttpFileTransfers = new KviPointerList<HttpFileTransfer>;
 	g_pHttpFileTransfers->setAutoDelete(false);
 
 	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false);
@@ -343,10 +343,10 @@ void KviHttpFileTransfer::init()
 		g_pHttpIcon = 0;
 }
 
-void KviHttpFileTransfer::done()
+void HttpFileTransfer::done()
 {
 	if(!g_pHttpFileTransfers)return;
-	while(KviHttpFileTransfer * t = g_pHttpFileTransfers->first())
+	while(HttpFileTransfer * t = g_pHttpFileTransfers->first())
 		delete t;
 	delete g_pHttpFileTransfers;
 	g_pHttpFileTransfers = 0;
@@ -357,13 +357,13 @@ void KviHttpFileTransfer::done()
 	}
 }
 
-unsigned int KviHttpFileTransfer::runningTransfers()
+unsigned int HttpFileTransfer::runningTransfers()
 {
 	if(!g_pHttpFileTransfers)return 0;
 	return g_pHttpFileTransfers->count();
 }
 
-void KviHttpFileTransfer::requestSent(const QStringList &requestHeaders)
+void HttpFileTransfer::requestSent(const QStringList &requestHeaders)
 {
 	m_szStatusString = __tr2qs_ctx("Request sent, waiting for reply...","http");
 	displayUpdate();
@@ -383,25 +383,25 @@ void KviHttpFileTransfer::requestSent(const QStringList &requestHeaders)
 	m_lRequest = requestHeaders;
 }
 
-void KviHttpFileTransfer::connectionEstabilished()
+void HttpFileTransfer::connectionEstabilished()
 {
 	m_szStatusString = __tr2qs_ctx("Connection established, sending request","http");
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::resolvingHost(const QString &hostname)
+void HttpFileTransfer::resolvingHost(const QString &hostname)
 {
 	m_szStatusString = __tr2qs_ctx("Resolving host %1","http").arg(hostname);
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::contactingHost(const QString &ipandport)
+void HttpFileTransfer::contactingHost(const QString &ipandport)
 {
 	m_szStatusString = __tr2qs_ctx("Contacting host %1","http").arg(ipandport);
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::receivedResponse(const QString &response)
+void HttpFileTransfer::receivedResponse(const QString &response)
 {
 	m_lHeaders.clear();
 	m_lHeaders.append(response);
@@ -411,14 +411,14 @@ void KviHttpFileTransfer::receivedResponse(const QString &response)
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::statusMessage(const QString &txt)
+void HttpFileTransfer::statusMessage(const QString &txt)
 {
 	KviWindow * out = transferWindow();
 	if(out && (!m_bNoOutput))
 		out->output(KVI_OUT_GENERICSTATUS,"[HTTP %d]: %Q",id(),&txt);
 }
 
-void KviHttpFileTransfer::transferTerminated(bool bSuccess)
+void HttpFileTransfer::transferTerminated(bool bSuccess)
 {
 	KviWindow * out = transferWindow();
 
@@ -464,7 +464,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 	}
 }
 
-void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCString> *h)
+void HttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCString> *h)
 {
 	if(!h)return;
 	KviWindow * out = transferWindow();
@@ -482,12 +482,12 @@ void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCS
 	}
 }
 
-bool KviHttpFileTransfer::startDownload()
+bool HttpFileTransfer::startDownload()
 {
 	m_eGeneralStatus = Connecting;
 	return m_pHttpRequest->start();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_httpfiletransfer.moc"
+#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 6369087e2..b89c465b9 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/HttpFileTransfer.h
@@ -2,7 +2,7 @@
 #define _HTTPFILETRANSFER_H_
 //=============================================================================
 //
-//   File : httpfiletransfer.h
+//   File : HttpFileTransfer.h
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVIrc irc client distribution
@@ -35,13 +35,13 @@
 class QPainter;
 class KviTalPopupMenu;
 
-class KviHttpFileTransfer : public KviFileTransfer
+class HttpFileTransfer : public KviFileTransfer
 {
 	enum GeneralStatus { Initializing, Connecting, Downloading, Success, Failure };
 	Q_OBJECT
 public:
-	KviHttpFileTransfer();
-	~KviHttpFileTransfer();
+	HttpFileTransfer();
+	~HttpFileTransfer();
 private:
 	int m_TimerId;
 	KviHttpRequest * m_pHttpRequest;
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index c6ffb1eed..41e096220 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "httpfiletransfer.h"
+#include "HttpFileTransfer.h"
 
 #include "KviModule.h"
 #include "KviCString.h"
@@ -63,7 +63,7 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 		}
 	}
 
-	KviHttpFileTransfer * hft = new KviHttpFileTransfer();
+	HttpFileTransfer * hft = new HttpFileTransfer();
 
 	bool bHead = c->switches()->find('h',"head");
 
@@ -303,7 +303,7 @@ static bool http_kvs_cmd_asyncGet(KviKvsModuleCallbackCommandCall * c)
 
 static bool http_module_init(KviModule * m)
 {
-	KviHttpFileTransfer::init();
+	HttpFileTransfer::init();
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"get",http_kvs_cmd_get);
 	KVSM_REGISTER_CALLBACK_COMMAND(m,"asyncGet",http_kvs_cmd_asyncGet);
@@ -313,13 +313,13 @@ static bool http_module_init(KviModule * m)
 
 static bool http_module_cleanup(KviModule *)
 {
-	KviHttpFileTransfer::done();
+	HttpFileTransfer::done();
 	return true;
 }
 
 static bool http_module_can_unload(KviModule *)
 {
-	return (KviHttpFileTransfer::runningTransfers() == 0);
+	return (HttpFileTransfer::runningTransfers() == 0);
 }
 
 KVIRC_MODULE(