Yet more renaming and cleanups

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

8 files changed, 18 insertions, 18 deletions

diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h
index a7d958aea..48daa2ee4 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/broker.h
@@ -35,7 +35,7 @@
 #include <QDateTime>
 #include <QObject>
 
-class KviConsole;
+class KviConsoleWindow;
 class KviDccBroker;
 class KviWindow;
 class KviDccBox;
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 3a47d9075..ef0ec3a14 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -320,7 +320,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 						if(bUserFeedback)
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
 								m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-								m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+								m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 					}
 					break;
 					case KviCryptEngine::Encoded:
@@ -332,7 +332,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 							QString encr = decodeText(encrypted.ptr());
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 								m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-								m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+								m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsoleWindow::NoNotifications);
 						}
 					}
 					break;
@@ -355,7 +355,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 				if(bUserFeedback)
 					m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 						m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-						m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
+						m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsoleWindow::NoNotifications);
 				return;
 			}
 		}
@@ -367,7 +367,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 	if(bUserFeedback)
 		m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 			m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 }
 
 const QString & KviDccChat::localNick()
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index a669d1f30..fb27d5bda 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -44,7 +44,7 @@ KviDccDescriptor::KviDccDescriptor(const KviDccDescriptor & src)
 	copyFrom(src);
 }
 
-KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole)
+KviDccDescriptor::KviDccDescriptor(KviConsoleWindow * pConsole)
 {
 	m_pConsole   = pConsole;
 	m_pDccWindow = 0;
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index e150f80d7..34fe365cc 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -33,12 +33,12 @@ class KviDccFileTransfer;
 class KviDccDescriptor
 {
 public:
-	KviDccDescriptor(KviConsole * pConsole);
+	KviDccDescriptor(KviConsoleWindow * pConsole);
 	KviDccDescriptor(const KviDccDescriptor & src);
 
 	~KviDccDescriptor();
 protected:
-	KviConsole         * m_pConsole;
+	KviConsoleWindow         * m_pConsole;
 
 	// mIrc zero port reverse send/chat extension
 	KviCString               m_szZeroPortRequestTag;
@@ -52,8 +52,8 @@ protected:
 	bool                 m_bCreationEventTriggered;
 public:
 	// A console that this DCC is bound to (might be replaced while we wait for user acknowledge in dialogs)
-	KviConsole * console() const { return m_pConsole; };
-	void setConsole(KviConsole * c){ m_pConsole = c; };
+	KviConsoleWindow * console() const { return m_pConsole; };
+	void setConsole(KviConsoleWindow * c){ m_pConsole = c; };
 
 	KviDccWindow * window() const { return m_pDccWindow; };
 	void setWindow(KviDccWindow * w){ m_pDccWindow = w; };
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index a66ad1eab..6c5463eea 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1897,7 +1897,7 @@ bool KviDccFileTransfer::event(QEvent *e)
 				// File Upload/Download terminated, or something like this
 				if(KVI_OPTION_BOOL(KviOption_boolNotifyDccSendSuccessInConsole))
 				{
-					KviConsole *c;
+					KviConsoleWindow *c;
 					if(!g_pApp->windowExists(m_pDescriptor->console())) c=g_pApp->activeConsole();
 					else c=m_pDescriptor->console();
 					c->output(KVI_OUT_DCCMSG,__tr2qs_ctx("DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%s\r","dcc"),
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index 174a004b4..a10cb9069 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -34,7 +34,7 @@
 #include "KviQString.h"
 
 /*
-bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QString &szListenIp)
+bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsoleWindow * pConsole,QString &szListenIp)
 {
 	//
 	// Find an interface suitable for listening....
@@ -102,7 +102,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 }
 */
 
-bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pConsole,QString &szListenIp)
+bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsoleWindow * pConsole,QString &szListenIp)
 {
 	//
 	// Find an interface suitable for listening....
diff --git a/src/modules/dcc/utils.h b/src/modules/dcc/utils.h
index ee939b2a5..df7917b4c 100644
--- a/src/modules/dcc/utils.h
+++ b/src/modules/dcc/utils.h
@@ -30,7 +30,7 @@
 #include "KviKvsModuleInterface.h"
 
 #ifndef _UTILS_CPP_
-	extern bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pConsole,QString &szListenIp);
+	extern bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsoleWindow * pConsole,QString &szListenIp);
 #endif
 
 #endif //_UTILS_H_
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 234643b52..7327dcb60 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -687,7 +687,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 						if(bUserFeedback)
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
 								m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-								m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+								m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 					}
 					break;
 					case KviCryptEngine::Encoded:
@@ -699,7 +699,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 							QString encr = decodeText(encrypted.ptr());
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 								m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-								m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+								m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsoleWindow::NoNotifications);
 						}
 					}
 					break;
@@ -722,7 +722,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 				if(bUserFeedback)
 					m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 						m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-						m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
+						m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsoleWindow::NoNotifications);
 				return;
 			}
 		}
@@ -734,7 +734,7 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 	if(bUserFeedback)
 		m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 			m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
-			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 }
 
 const QString & KviDccVideo::localNick()