Yet more renaming and cleanup

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

10 files changed, 14 insertions, 14 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 5d4c8c4f8..d0934cc0f 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -968,7 +968,7 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
 			t->m_uResumePosition = filePos;
 
 			KviCString szBuffy;
-			KviServerParser::encodeCtcpParameter(filename,szBuffy);
+			KviIrcServerParser::encodeCtcpParameter(filename,szBuffy);
 
 			dcc->ctcpMsg->msg->console()->connection()->sendFmtData(
 					"PRIVMSG %s :%cDCC ACCEPT %s %s %u %s%c",
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 4beb89436..c7524883d 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -39,7 +39,7 @@
 	#include "kvi_ircview.h"
 	#include "kvi_iconmanager.h"
 	#include "KviLocale.h"
-	#include "kvi_error.h"
+	#include "KviError.h"
 	#include "kvi_out.h"
 	#include "KviNetUtils.h"
 	#include "kvi_console.h"
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index f34a45579..5e8f6bcf1 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -37,7 +37,7 @@
 #include "kvi_ircview.h"
 #include "kvi_iconmanager.h"
 #include "KviLocale.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "kvi_out.h"
 #include "KviNetUtils.h"
 #include "kvi_console.h"
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index b3ca78111..a2437ba2d 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -41,7 +41,7 @@
 #include "KviNetUtils.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
 #include "KviMircCntrl.h"
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 843eb1d83..0c3c28a00 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviNetUtils.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "kvi_options.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index d550c114c..60dd742f1 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -46,7 +46,7 @@
 #include "KviNetUtils.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
 #include "KviSharedFilesManager.h"
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 9aa155b74..9ea1dd74e 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -36,7 +36,7 @@
 #include "kvi_ircview.h"
 #include "kvi_iconmanager.h"
 #include "KviLocale.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "kvi_out.h"
 #include "KviNetUtils.h"
 #include "kvi_console.h"
@@ -1100,7 +1100,7 @@ void KviDccFileTransfer::startConnection()
 	if(m_pDescriptor->bResume && m_pDescriptor->bRecvFile)
 	{
 		QString fName;
-		KviServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName);
+		KviIrcServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName);
 		if(m_pDescriptor->isZeroPortRequest())
 		{
 		m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC RESUME %s %s %s %s%c",
@@ -1808,7 +1808,7 @@ void KviDccFileTransfer::connectionInProgress()
 		if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores))
 			tmp.replace(" ","_");
 
-		KviServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName);
+		KviIrcServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName);
 		// Zero port requests want DCC SEND as back-request
 		KviCString szReq;
 
@@ -2143,7 +2143,7 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,quint6
 	m_pDescriptor->szFileSize.setNum(filePos);
 
 	KviCString szBuffy;
-	KviServerParser::encodeCtcpParameter(filename,szBuffy);
+	KviIrcServerParser::encodeCtcpParameter(filename,szBuffy);
 
 	m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC ACCEPT %s %s %u%c",
 			m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(),
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index 61cb2f1eb..e10113d8a 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_debug.h"
 #include "kvi_window.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
 #include "KviNetUtils.h"
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index d7cb7e65b..d5f02b2ee 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -33,7 +33,7 @@
 #include "kvi_kvs_eventtriggers.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "KviNetUtils.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index df84c9127..315ae0f05 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -33,7 +33,7 @@
 #include "kvi_ircview.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_error.h"
+#include "KviError.h"
 #include "KviNetUtils.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
@@ -52,7 +52,7 @@
 	#include <unistd.h>
 	#include <errno.h>
 	#include <fcntl.h>
-	//#include "kvi_error.h"
+	//#include "KviError.h"
 	#include <sys/stat.h>   // for open()
 	#include <sys/ioctl.h>  // for ioctl()
 #endif