Yet more renaming and cleanups

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

28 files changed, 55 insertions, 55 deletions

diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 82eec83b7..79d108abc 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -152,7 +152,7 @@ KviChannelsJoinWindow::~KviChannelsJoinWindow()
 	g_pChannelsWindow = 0;
 }
 
-void KviChannelsJoinWindow::setConsole(KviConsole  * pConsole)
+void KviChannelsJoinWindow::setConsole(KviConsoleWindow  * pConsole)
 {
 	m_pConsole = pConsole;
 	fillListView();
@@ -272,7 +272,7 @@ void KviChannelsJoinWindow::editTextChanged(const QString &)
 void KviChannelsJoinWindow::enableJoin()
 {
 	QString szTmp = m_pChannelEdit->text();
-	KviConsole * c = g_pApp->topmostConnectedConsole();
+	KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
 	if(c)
 	{
 		if(szTmp.isEmpty())
@@ -311,7 +311,7 @@ void KviChannelsJoinWindow::joinClicked()
 	szCmd += " ";
 	szCmd += szPass;
 
-	KviConsole * c = g_pApp->topmostConnectedConsole();
+	KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
 	if(!c)
 		return; // no connection
 
@@ -336,7 +336,7 @@ void KviChannelsJoinWindow::regClicked()
 	QString szCmd = "regchan.add ";
 	szCmd += szTmp;
 
-	KviConsole * c = g_pApp->topmostConnectedConsole();
+	KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
 	if(!c)
 		return; // no connection
 
@@ -360,7 +360,7 @@ void KviChannelsJoinWindow::clearClicked()
 {
 	QString szCmd = "option stringlistRecentChannels";
 
-	KviConsole * c = g_pApp->topmostConnectedConsole();
+	KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
 	if(!c)
 		return; // no connection
 
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h
index 591a175b5..477e3f6e1 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/channelsjoinwindow.h
@@ -39,7 +39,7 @@
 class QCheckBox;
 class QPushButton;
 class QLineEdit;
-class KviConsole;
+class KviConsoleWindow;
 class KviTalGroupBox;
 
 /**
@@ -72,7 +72,7 @@ protected:
 	QPushButton      * m_pJoinButton;
 	QPushButton      * m_pRegButton;
 	QPushButton      * m_pClearButton;
-	KviConsole       * m_pConsole;
+	KviConsoleWindow       * m_pConsole;
 public:
 	virtual void closeEvent(QCloseEvent * e);
 
@@ -93,7 +93,7 @@ public:
 	* \param pConsole The source console
 	* \return void
 	*/
-	void setConsole(KviConsole * pConsole);
+	void setConsole(KviConsoleWindow * pConsole);
 protected slots:
 	/**
 	* \brief Called when the text changes
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index 087db8043..a9ddfde06 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -76,7 +76,7 @@ void KviCodeTester::execute()
 	QString parms = m_pParams->text();
 	QString buffer;
 	m_pEditor->getText(buffer);
-	KviConsole * con = g_pApp->activeConsole();
+	KviConsoleWindow * con = g_pApp->activeConsole();
 	//KviParameterList * l = new KviParameterList(parms.ptr());
 	KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms)));
 }
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index b35b88205..cbfb906ac 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -44,7 +44,7 @@
 	KVSM_PARAMETERS_BEGIN(c) \
 		KVSM_PARAMETER("irc_context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,iContextId) \
 	KVSM_PARAMETERS_END(c) \
-	KviConsole * pConsole = NULL; \
+	KviConsoleWindow * pConsole = NULL; \
 	if(c->parameterCount() > 0) \
 		pConsole = g_pApp->findConsole(iContextId); \
 	else \
@@ -478,7 +478,7 @@ static bool context_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	{
 		if(pWnd->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			pArray->set(idx,new KviKvsVariant((kvs_int_t)((KviConsole *)pWnd)->context()->id()));
+			pArray->set(idx,new KviKvsVariant((kvs_int_t)((KviConsoleWindow *)pWnd)->context()->id()));
 			idx++;
 		}
 	}
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()
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 6dfd00725..77b717c89 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -45,7 +45,7 @@
 
 extern KviPointerList<KviLinksWindow> * g_pLinksWindowList;
 
-KviLinksWindow::KviLinksWindow(KviMainWindow * lpFrm,KviConsole * lpConsole)
+KviLinksWindow::KviLinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LINKS,lpFrm,"links",lpConsole), KviExternalServerDataParser()
 {
 	g_pLinksWindowList->append(this);
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 4b64bf6b2..d31c3310a 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -61,7 +61,7 @@ class KviLinksWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviLinksWindow(KviMainWindow * lpFrm,KviConsole * lpConsole);
+	KviLinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
 	~KviLinksWindow();
 protected:
 	QSplitter               * m_pVertSplitter;
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index f3c451984..887124f3f 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -157,7 +157,7 @@ void KviChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 	}
 }
 
-KviListWindow::KviListWindow(KviMainWindow * lpFrm, KviConsole * lpConsole)
+KviListWindow::KviListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole), KviExternalServerDataParser()
 {
 	g_pListWindowList->append(this);
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 9274382ab..d26a51098 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -81,7 +81,7 @@ class KviListWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviListWindow(KviMainWindow * lpFrm, KviConsole * lpConsole);
+	KviListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole);
 	~KviListWindow();
 protected:
 	QSplitter                                    * m_pVertSplitter;
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index fd1f6913a..1762233eb 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -37,7 +37,7 @@ Idle* g_pIdle;
 
 #define GET_KVS_CONSOLE \
 	kvs_uint_t  uiWnd; \
-	KviConsole *wnd =0; \
+	KviConsoleWindow *wnd =0; \
 	KVSM_PARAMETERS_BEGIN(c) \
 		KVSM_PARAMETER("context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uiWnd) \
 	KVSM_PARAMETERS_END(c) \
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 3999ff5ae..9d6279395 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -5,7 +5,7 @@
 //   File : instances.cpp
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2010 Szymon Stefanek (stefanek@tin.it)
+//   Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index b201622a6..36e5fe964 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -8,7 +8,7 @@
 //   File : instances.h
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2008 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
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index b14b87314..189e20b72 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -48,10 +48,10 @@ cat >> instances.h <<EOF
 // so any change should go in that script
 //
 
-#include "kvi_optionswidget.h"
-#include "kvi_module.h"
-#include "kvi_pointerlist.h"
-#include "kvi_qstring.h"
+#include "KviOptionsWidget.h"
+#include "KviModule.h"
+#include "KviPointerList.h"
+#include "KviQString.h"
 
 typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
 
@@ -152,8 +152,8 @@ done
 #################################################################################
 cat >> instances.cpp <<EOF
 
-#include "kvi_locale.h"
-#include "kvi_iconmanager.h"
+#include "KviLocale.h"
+#include "KviIconManager.h"
 #include "instances.h"
 
 int g_iOptionWidgetInstances = 0;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 6a5f7e0f0..3132fde32 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1428,7 +1428,7 @@ void KviIrcServerOptionsWidget::recentServersPopupAboutToShow()
 
 void KviIrcServerOptionsWidget::recentServersPopupClicked(int id)
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)
 		return;
 
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 1b56e8e54..ff3136c85 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -34,7 +34,7 @@
 
 extern KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList;
 
-KviSocketSpyWindow::KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsole * lpConsole)
+KviSocketSpyWindow::KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole), KviIrcDataStreamMonitor(lpConsole->context())
 {
 	g_pSocketSpyWindowList->append(this);
diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
index 3fd4ece13..4b8f13fe5 100644
--- a/src/modules/socketspy/socketspywindow.h
+++ b/src/modules/socketspy/socketspywindow.h
@@ -28,13 +28,13 @@
 #include "KviCString.h"
 #include "KviIrcDataStreamMonitor.h"
 
-class KviConsole;
+class KviConsoleWindow;
 
 class KviSocketSpyWindow : public KviWindow, public KviIrcDataStreamMonitor
 {
 	Q_OBJECT
 public:
-	KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsole * lpConsole);
+	KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
 	~KviSocketSpyWindow();
 protected:
 	virtual QPixmap * myIconPtr();
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index bbacd6d30..b99aeb99e 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -154,7 +154,7 @@ static bool tmphighlight_kvs_cmd_addchannel(KviKvsModuleCommandCall * c)
 		return false;
 	}
 
-	((KviConsole *)pWnd->console())->addHighlightedChannel(pWnd->windowName());
+	((KviConsoleWindow *)pWnd->console())->addHighlightedChannel(pWnd->windowName());
 
 	return true;
 }
@@ -206,7 +206,7 @@ static bool tmphighlight_kvs_cmd_removechannel(KviKvsModuleCommandCall * c)
 		return false;
 	}
 
-	((KviConsole *)pWnd->console())->removeHighlightedChannel(pWnd->windowName());
+	((KviConsoleWindow *)pWnd->console())->removeHighlightedChannel(pWnd->windowName());
 
 	return true;
 }
@@ -294,7 +294,7 @@ static bool tmphighlight_kvs_fnc_ischannelhighlighted(KviKvsModuleFunctionCall *
 		return false;
 	}
 
-	c->returnValue()->setBoolean(((KviConsole *)pWnd->console())->isHighlightedChannel(pWnd->windowName()));
+	c->returnValue()->setBoolean(((KviConsoleWindow *)pWnd->console())->isHighlightedChannel(pWnd->windowName()));
 	return true;
 }
 
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index fc7896411..180213b0c 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -251,7 +251,7 @@ void KviTrayIcon::doAway(bool)
 		{
 			if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
 			{
-				KviConsole* pConsole=(KviConsole*)wnd;
+				KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 				if(pConsole->isConnected())
 				{
 					if(id==-2)
@@ -267,7 +267,7 @@ void KviTrayIcon::doAway(bool)
  			++it;
 		}
 	} else {
-		KviConsole* pConsole=g_pApp->findConsole((unsigned int)id);
+		KviConsoleWindow* pConsole=g_pApp->findConsole((unsigned int)id);
 		if(pConsole)
 		{
 			if(pConsole->isConnected())
@@ -309,7 +309,7 @@ void KviTrayIcon::fillContextPopup()
 		{
 			if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
 			{
-				KviConsole* pConsole=(KviConsole*)wnd;
+				KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 				if(pConsole->isConnected())
 				{
 					QAction* id;
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 66ecad7d2..e6590bf3a 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1156,7 +1156,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	int iFlags = 0;
 	if(szFlags.contains('i'))iFlags |= KviUserWindow::HasInput;
 
-	KviConsole * pConsole = 0;
+	KviConsoleWindow * pConsole = 0;
 	if(c->parameterList()->count() >= 3)
 	{
 		pConsole = g_pApp->findConsole(uCtx);
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 58c3c8f10..74cade69a 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -33,7 +33,7 @@
 extern KviPointerList<KviUserWindow> * g_pUserWindowList;
 
 
-KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags)
+KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags)
 : KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole)
 {
 	g_pUserWindowList->append(this);
diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h
index 7ba63d954..06664bcc1 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/userwindow.h
@@ -33,7 +33,7 @@ class KviUserWindow : public KviWindow
 public:
 	enum CreationFlags { HasInput = 1 };
 public:
-	KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsole * pConsole = 0,int iCreationFlags = 0);
+	KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole = 0,int iCreationFlags = 0);
 	~KviUserWindow();
 protected:
 	int m_iIcon;