Yet more renaming and cleanups

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

75 files changed, 280 insertions, 281 deletions

diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp
index 6f809151f..f3003d997 100644
--- a/src/kvirc/kernel/KviAction.cpp
+++ b/src/kvirc/kernel/KviAction.cpp
@@ -259,7 +259,7 @@ void KviAction::activeWindowChanged()
 			{
 				if(m_uFlags & WindowOnlyIfUsersSelected)
 				{
-					bool bEnabled = ((KviConsole *)g_pActiveWindow)->selectedCount() > 0;
+					bool bEnabled = ((KviConsoleWindow *)g_pActiveWindow)->selectedCount() > 0;
 					if(bEnabled != isEnabled())
 						setEnabled(bEnabled);
 				} else {
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 8d1612d20..4ba1310eb 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -925,7 +925,7 @@ void KviApplication::ipcMessage(char * pcMessage)
 {
 	if(!g_pFrame)
 		return;
-	KviConsole * pConsole = g_pFrame->firstConsole();
+	KviConsoleWindow * pConsole = g_pFrame->firstConsole();
 	if(!pConsole)
 		return;
 	if(_OUTPUT_VERBOSE)
@@ -962,14 +962,14 @@ void KviApplication::setAvatarFromOptions()
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			((KviConsole *)it.current())->setAvatarFromOptions();
+			((KviConsoleWindow *)it.current())->setAvatarFromOptions();
 		}
 		++it;
 	}
 
 }
 
-void KviApplication::setAvatarOnFileReceived(KviConsole * pConsole, const QString & szRemoteUrl, const QString & szNick, const QString & szUser, const QString & szHost)
+void KviApplication::setAvatarOnFileReceived(KviConsoleWindow * pConsole, const QString & szRemoteUrl, const QString & szNick, const QString & szUser, const QString & szHost)
 {
 	if(!m_pPendingAvatarChanges)
 	{
@@ -992,7 +992,7 @@ void KviApplication::setAvatarOnFileReceived(KviConsole * pConsole, const QStrin
 	m_pPendingAvatarChanges->append(pAvatar);
 }
 
-KviPendingAvatarChange * KviApplication::findPendingAvatarChange(KviConsole * pConsole, const QString & szNick, const QString & szRemoteUrl)
+KviPendingAvatarChange * KviApplication::findPendingAvatarChange(KviConsoleWindow * pConsole, const QString & szNick, const QString & szRemoteUrl)
 {
 	if(!m_pPendingAvatarChanges)
 		return 0;
@@ -1592,7 +1592,7 @@ unsigned int KviApplication::windowCount()
 	return g_pGlobalWindowDict->count();
 }
 
-KviConsole * KviApplication::findConsole(QString & szServer, QString & szNick)
+KviConsoleWindow * KviApplication::findConsole(QString & szServer, QString & szNick)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1600,26 +1600,26 @@ KviConsole * KviApplication::findConsole(QString & szServer, QString & szNick)
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			if(((KviConsole *)it.current())->isConnected())
+			if(((KviConsoleWindow *)it.current())->isConnected())
 			{
 				if(!szServer.isEmpty())
 				{
 					if(KviQString::equalCI(szServer,
-						((KviConsole *)it.current())->connection()->currentServerName()))
+						((KviConsoleWindow *)it.current())->connection()->currentServerName()))
 					{
 						if(!szNick.isEmpty())
 						{
 							if(KviQString::equalCI(szNick,
-								((KviConsole *)it.current())->connection()->currentNickName()))
-									return ((KviConsole *)it.current());
-						} else return ((KviConsole *)it.current());
+								((KviConsoleWindow *)it.current())->connection()->currentNickName()))
+									return ((KviConsoleWindow *)it.current());
+						} else return ((KviConsoleWindow *)it.current());
 					}
 				} else {
 					if(!szNick.isEmpty())
 					{
 						if(KviQString::equalCI(szNick,
-							((KviConsole *)it.current())->connection()->currentNickName()))
-								return ((KviConsole *)it.current());
+							((KviConsoleWindow *)it.current())->connection()->currentNickName()))
+								return ((KviConsoleWindow *)it.current());
 					}
 				}
 			}
@@ -1637,8 +1637,8 @@ void KviApplication::restartLagMeters()
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			if(((KviConsole *)it.current())->connection())
-				((KviConsole *)it.current())->connection()->restartLagMeter();
+			if(((KviConsoleWindow *)it.current())->connection())
+				((KviConsoleWindow *)it.current())->connection()->restartLagMeter();
 		}
 		++it;
 	}
@@ -1652,8 +1652,8 @@ void KviApplication::restartNotifyLists()
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			if(((KviConsole *)it.current())->connection())
-				((KviConsole *)it.current())->connection()->restartNotifyList();
+			if(((KviConsoleWindow *)it.current())->connection())
+				((KviConsoleWindow *)it.current())->connection()->restartNotifyList();
 		}
 		++it;
 	}
@@ -1667,13 +1667,13 @@ void KviApplication::resetAvatarForMatchingUsers(KviRegisteredUser * pUser)
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			((KviConsole *)it.current())->resetAvatarForMatchingUsers(pUser);
+			((KviConsoleWindow *)it.current())->resetAvatarForMatchingUsers(pUser);
 		}
 		++it;
 	}
 }
 
-KviConsole * KviApplication::findConsole(unsigned int uIrcContextId)
+KviConsoleWindow * KviApplication::findConsole(unsigned int uIrcContextId)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1681,19 +1681,19 @@ KviConsole * KviApplication::findConsole(unsigned int uIrcContextId)
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			if(((KviConsole *)it.current())->context()->id() == uIrcContextId)
-				return ((KviConsole *)it.current());
+			if(((KviConsoleWindow *)it.current())->context()->id() == uIrcContextId)
+				return ((KviConsoleWindow *)it.current());
 		}
 		++it;
 	}
 	return 0;
 }
 
-KviConsole * KviApplication::topmostConnectedConsole()
+KviConsoleWindow * KviApplication::topmostConnectedConsole()
 {
 	// check the foreground window console
 
-	KviConsole * pConsole = activeConsole();
+	KviConsoleWindow * pConsole = activeConsole();
 	if(!pConsole)
 		return 0;
 	if(pConsole->isConnected())
@@ -1707,8 +1707,8 @@ KviConsole * KviApplication::topmostConnectedConsole()
 	{
 		if(it.current()->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			if(((KviConsole *)it.current())->isConnected())
-				return (KviConsole *)(it.current());
+			if(((KviConsoleWindow *)it.current())->isConnected())
+				return (KviConsoleWindow *)(it.current());
 		}
 		++it;
 	}
@@ -1745,7 +1745,7 @@ void KviApplication::unregisterWindow(KviWindow * pWnd)
 	g_pGlobalWindowDict->remove(pWnd->id());
 }
 
-KviConsole * KviApplication::activeConsole()
+KviConsoleWindow * KviApplication::activeConsole()
 {
 	if(!g_pFrame)
 		return 0;
@@ -1893,7 +1893,7 @@ void KviApplication::fillRecentServersPopup(KviTalPopupMenu * pMenu)
 	}
 }
 
-void KviApplication::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole)
+void KviApplication::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsoleWindow * pConsole)
 {
 	pMenu->clear();
 	int iId;
@@ -1917,7 +1917,7 @@ void KviApplication::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsol
 	}
 }
 
-void KviApplication::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole)
+void KviApplication::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsoleWindow * pConsole)
 {
 	pMenu->clear();
 	QStringList * pList = recentChannelsForNetwork(pConsole->currentNetworkName());
diff --git a/src/kvirc/kernel/KviApplication.h b/src/kvirc/kernel/KviApplication.h
index 2f1787358..f8dccd6dc 100644
--- a/src/kvirc/kernel/KviApplication.h
+++ b/src/kvirc/kernel/KviApplication.h
@@ -55,7 +55,7 @@
 
 class KviTalPopupMenu;
 class KviTalListBox;
-class KviConsole;
+class KviConsoleWindow;
 class KviConfigurationFile;
 class KviRegisteredUser;
 class KviIrcConnection;
@@ -67,7 +67,7 @@ class QStringList;
 
 typedef struct _KviPendingAvatarChange
 {
-	KviConsole * pConsole;
+	KviConsoleWindow * pConsole;
 	QString      szRemoteUrl;
 	QString      szNick;
 	QString      szUser;
@@ -270,10 +270,10 @@ public:
 	// KviApplication.cpp : Window stuff
 	KviWindow       * findWindow(const QString &windowId);
 	KviWindow       * findWindowByCaption(const QString &windowCaption,int iContextId=-1);
-	KviConsole      * findConsole(unsigned int ircContextId);
-	KviConsole      * findConsole(QString & servr,QString & nick);
-	KviConsole      * topmostConnectedConsole();
-	KviConsole      * activeConsole();
+	KviConsoleWindow      * findConsole(unsigned int ircContextId);
+	KviConsoleWindow      * findConsole(QString & servr,QString & nick);
+	KviConsoleWindow      * topmostConnectedConsole();
+	KviConsoleWindow      * activeConsole();
 	bool              windowExists(KviWindow *wnd);
 	bool              connectionExists(KviIrcConnection *cnn);
 	unsigned int      windowCount();
@@ -288,8 +288,8 @@ public:
 #endif
 
 	// KviApplication.cpp : DCC (and CTCP AVATAR & SOUND) related stuff
-	void setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemoteUrl,const QString &szNick,const QString &szUser,const QString &szHost);
-	KviPendingAvatarChange * findPendingAvatarChange(KviConsole * pConsole,const QString &szNick,const QString &szRemoteUrl);
+	void setAvatarOnFileReceived(KviConsoleWindow * pConsole,const QString &szRemoteUrl,const QString &szNick,const QString &szUser,const QString &szHost);
+	KviPendingAvatarChange * findPendingAvatarChange(KviConsoleWindow * pConsole,const QString &szNick,const QString &szRemoteUrl);
 	void fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,const QString &szLocalFileName,const QString &szNick = QString(),const QString &szError = QString(),bool bQuiet = false);
 
 	void setAvatarFromOptions();
@@ -310,8 +310,8 @@ public:
 
 	void addRecentServer(const QString& server);
 	void fillRecentServersPopup(KviTalPopupMenu * m);
-	void fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole);
-	void fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole);
+	void fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsoleWindow * pConsole);
+	void fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsoleWindow * pConsole);
 //
 	void autoConnectToServers();
 
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index 74c2ae9d9..0a02d0754 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -762,7 +762,7 @@ KviJoinChannelAction::KviJoinChannelAction(QObject * pParent)
 
 void KviJoinChannelAction::popupAboutToShow()
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c) return;
 
 	g_pApp->fillRecentChannelsPopup(m_pPopup,c);
@@ -775,7 +775,7 @@ void KviJoinChannelAction::popupAboutToShow()
 
 void KviJoinChannelAction::popupActivated(int id)
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)return;
 
 	QString szItemText = m_pPopup->text(id);
@@ -817,7 +817,7 @@ KviChangeNickAction::KviChangeNickAction(QObject * pParent)
 
 void KviChangeNickAction::popupAboutToShow()
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)return;
 
 	g_pApp->fillRecentNicknamesPopup(m_pPopup,c);
@@ -831,7 +831,7 @@ void KviChangeNickAction::popupAboutToShow()
 
 void KviChangeNickAction::popupActivated(int id)
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)return;
 
 	QString text = m_pPopup->text(id);
@@ -878,7 +878,7 @@ void KviConnectToServerAction::popupAboutToShow()
 
 void KviConnectToServerAction::popupActivated(int id)
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)return;
 
 	QString szItemText = m_pPopup->text(id);
@@ -918,7 +918,7 @@ KviChangeUserModeAction::KviChangeUserModeAction(QObject * pParent)
 
 void KviChangeUserModeAction::popupAboutToShow()
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)return;
 
 	m_pPopup->clear();
@@ -946,7 +946,7 @@ void KviChangeUserModeAction::popupAboutToShow()
 
 void KviChangeUserModeAction::popupActivated(int id)
 {
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)return;
 
 	QString text = m_pPopup->text(id);
diff --git a/src/kvirc/kernel/KviIrcConnection.h b/src/kvirc/kernel/KviIrcConnection.h
index e0a03dc2a..6c5b1f31c 100644
--- a/src/kvirc/kernel/KviIrcConnection.h
+++ b/src/kvirc/kernel/KviIrcConnection.h
@@ -40,7 +40,7 @@
 
 class QTimer;
 class QTextCodec;
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcNetworkData;
 class KviIrcServer;
 class KviProxy;
@@ -74,7 +74,7 @@ class KviCString;
 * \brief An abstraction of a connection to an IRC server
 *
 * This class deals with the high-level logic of a connection to an IRC server.
-* It's always attached to a KviIrcContext and thus to a KviConsole window.
+* It's always attached to a KviIrcContext and thus to a KviConsoleWindow window.
 * The connection has a KviIrcConnectionTarget object which specifies the
 * data of the server that needs to be contacted and a KviUserIdentity object
 * which specifies the user data to use.
@@ -92,7 +92,7 @@ class KviCString;
 */
 class KVIRC_API KviIrcConnection : public QObject
 {
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviIrcContext;
 	friend class KviIrcLink;
 	friend class KviIrcServerParser;
@@ -101,7 +101,7 @@ protected:
 	/**
 	* \brief Creates a KviIrcConnection object.
 	*
-	* This is actually used only by KviConsole.
+	* This is actually used only by KviConsoleWindow.
 	*
 	* pContext must not be NULL and is kept as shallow pointer (that is, it's
 	* not owned and must persists for the entire life of KviIrcConnection:
@@ -120,7 +120,7 @@ protected:
 	KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarget * pTarget,KviUserIdentity * pIdentity);
 
 	/**
-	* \brief Destroys a KviIrcConnection object. KviConsole uses this.
+	* \brief Destroys a KviIrcConnection object. KviConsoleWindow uses this.
 	*/
 	~KviIrcConnection();
 public:
@@ -135,7 +135,7 @@ public:
 		Connected   /**< We're connected to an IRC server */
 	};
 private:
-	KviConsole                           * m_pConsole;              // shallow, never null
+	KviConsoleWindow                           * m_pConsole;              // shallow, never null
 	KviIrcContext                        * m_pContext;              // shallow, never null
 
 	State                                  m_eState;
@@ -182,9 +182,9 @@ public:
 	* \brief Returns a pointer to the owning console
 	*
 	* The pointer is never NULL
-	* \return KviConsole *
+	* \return KviConsoleWindow *
 	*/
-	inline KviConsole * console(){ return m_pConsole; };
+	inline KviConsoleWindow * console(){ return m_pConsole; };
 
 	/**
 	* \brief Returns a pointer to the owning KviIrcContext.
diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.h b/src/kvirc/kernel/KviIrcConnectionServerInfo.h
index d51989b90..bfda78993 100644
--- a/src/kvirc/kernel/KviIrcConnectionServerInfo.h
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.h
@@ -157,7 +157,7 @@ public:
 
 class KVIRC_API KviIrcConnectionServerInfo
 {
-	friend class KviConsole; // for now
+	friend class KviConsoleWindow; // for now
 	friend class KviIrcServerParser;
 	friend class KviIrcConnection;
 protected:
diff --git a/src/kvirc/kernel/KviIrcConnectionStatistics.h b/src/kvirc/kernel/KviIrcConnectionStatistics.h
index 9b211d5ca..84ad1521f 100644
--- a/src/kvirc/kernel/KviIrcConnectionStatistics.h
+++ b/src/kvirc/kernel/KviIrcConnectionStatistics.h
@@ -31,7 +31,7 @@
 
 class KVIRC_API KviIrcConnectionStatistics
 {
-	friend class KviConsole; // to be removed
+	friend class KviConsoleWindow; // to be removed
 	friend class KviIrcConnection;
 public:
 	KviIrcConnectionStatistics();
diff --git a/src/kvirc/kernel/KviIrcConnectionTarget.h b/src/kvirc/kernel/KviIrcConnectionTarget.h
index a07baa91d..03188cc7c 100644
--- a/src/kvirc/kernel/KviIrcConnectionTarget.h
+++ b/src/kvirc/kernel/KviIrcConnectionTarget.h
@@ -81,7 +81,7 @@ public:
 #if 0
 	const QString & networkName();
 
-	// this allows to force the network name: it should be used only by KviConsole
+	// this allows to force the network name: it should be used only by KviConsoleWindow
 	// but it's KviIrcServerParser (KviIrcServerParser_numericHandlers.cpp) that first
 	// gets the new network name... thus we make it public
 	// to remove one level of indirection.
diff --git a/src/kvirc/kernel/KviIrcConnectionTargetResolver.h b/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
index ddc6021b0..e8254ca3f 100644
--- a/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
@@ -29,7 +29,7 @@
 
 #include <QObject>
 
-class KviConsole;
+class KviConsoleWindow;
 class KviDnsResolver;
 class KviIrcConnection;
 class KviIrcConnectionTarget;
@@ -49,7 +49,7 @@ public:
 private:
 	KviIrcConnection             * m_pConnection;       // shallow, never null
 	KviIrcConnectionTarget       * m_pTarget;           // shallow, never null
-	KviConsole                   * m_pConsole;          // shallow, never null
+	KviConsoleWindow                   * m_pConsole;          // shallow, never null
 	Status                         m_eStatus;
 	State                          m_eState;
 
diff --git a/src/kvirc/kernel/KviIrcConnectionUserInfo.h b/src/kvirc/kernel/KviIrcConnectionUserInfo.h
index 233e1a6b2..2aaa33138 100644
--- a/src/kvirc/kernel/KviIrcConnectionUserInfo.h
+++ b/src/kvirc/kernel/KviIrcConnectionUserInfo.h
@@ -32,7 +32,7 @@ class KVIRC_API KviIrcConnectionUserInfo
 {
 	friend class KviIrcConnection;
 	friend class KviIrcServerParser;
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 protected:
 	KviIrcConnectionUserInfo();
 	~KviIrcConnectionUserInfo(){};
diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp
index e517ad317..75fee3881 100644
--- a/src/kvirc/kernel/KviIrcContext.cpp
+++ b/src/kvirc/kernel/KviIrcContext.cpp
@@ -67,7 +67,7 @@ extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
 
-KviIrcContext::KviIrcContext(KviConsole * pConsole)
+KviIrcContext::KviIrcContext(KviConsoleWindow * pConsole)
 : QObject(0)
 {
 	m_uId = g_uNextIrcContextId;
diff --git a/src/kvirc/kernel/KviIrcContext.h b/src/kvirc/kernel/KviIrcContext.h
index 6348cdc55..cbd73b4df 100644
--- a/src/kvirc/kernel/KviIrcContext.h
+++ b/src/kvirc/kernel/KviIrcContext.h
@@ -38,7 +38,7 @@ class KviAsynchronousConnectionData;
 class KviIrcDataStreamMonitor;
 class KviWindow;
 class QTimer;
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcNetwork;
 class KviIrcServer;
 /*
@@ -51,20 +51,20 @@ class KviIrcServer;
 	Each irc context has its own unique numeric identifier. The identifiers start
 	from 1 so 0 is an invalid irc context id (this is useful in the scripting engine).
 
-	The irc context is created in the KviConsole constructor and destroyed
-	in the KviConsole destructor. No other class can allocate KviIrcContext objects.
+	The irc context is created in the KviConsoleWindow constructor and destroyed
+	in the KviConsoleWindow destructor. No other class can allocate KviIrcContext objects.
 */
 
 class KVIRC_API KviIrcContext : public QObject
 {
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviChannelWindow;
 	friend class KviQueryWindow;
 	friend class KviIrcConnection;
 	friend class KviIrcContextToolBar;
 	Q_OBJECT
 protected:
-	KviIrcContext(KviConsole * pConsole); // only KviConsole can create this
+	KviIrcContext(KviConsoleWindow * pConsole); // only KviConsoleWindow can create this
 public:
 	~KviIrcContext();
 public:
@@ -76,7 +76,7 @@ public:
 		Connected     // connection() != 0
 	};
 protected:
-	KviConsole                       * m_pConsole;             // shallow, never null
+	KviConsoleWindow                       * m_pConsole;             // shallow, never null
 	KviIrcConnection                 * m_pConnection;
 
 	unsigned int                       m_uId;                  // this irc context id
@@ -108,7 +108,7 @@ protected:
 public:
 	inline unsigned int id(){ return m_uId; };
 	// never null and always the same!
-	inline KviConsole * console(){ return m_pConsole; };
+	inline KviConsoleWindow * console(){ return m_pConsole; };
 	// never null and always the same
 	inline KviMainWindow * frame(){ return m_pFrame; };
 	// may be null and may change!
@@ -146,7 +146,7 @@ public:
 	void setAsynchronousConnectionData(KviAsynchronousConnectionData * d);
 	inline KviAsynchronousConnectionData * asynchronousConnectionData(){ return m_pAsynchronousConnectionData; };
 	void destroyAsynchronousConnectionData();
-	// used by KviConsole (for now) and KviUserParser
+	// used by KviConsoleWindow (for now) and KviUserParser
 	void connectToCurrentServer();
 
 	void beginAsynchronousConnect(unsigned int uDelayInMSecs);
@@ -162,9 +162,9 @@ public slots:
 protected:
 	// called by KviIrcContextToolBar: this will DIE in favor of connectOrDisconnect()
 	void connectButtonClicked();
-	// used by KviConsole (for now)
+	// used by KviConsoleWindow (for now)
 	void destroyConnection();
-	// for KviConsole (for now) . later will be used only internally
+	// for KviConsoleWindow (for now) . later will be used only internally
 	void setState(State eState);
 	// called by KviIrcConnection
 	void loginComplete();
diff --git a/src/kvirc/kernel/KviIrcLink.cpp b/src/kvirc/kernel/KviIrcLink.cpp
index 546710f9b..163d46f25 100644
--- a/src/kvirc/kernel/KviIrcLink.cpp
+++ b/src/kvirc/kernel/KviIrcLink.cpp
@@ -272,7 +272,7 @@ void KviIrcLink::processData(char * buffer, int iLen)
 
 			if(m_pSocket->state() != KviIrcSocket::Connected)
 			{
-				// Disconnected in KviConsole::incomingMessage() call.
+				// Disconnected in KviConsoleWindow::incomingMessage() call.
 				// This may happen for several reasons (local event loop
 				// with the user hitting the disconnect button, a scripting
 				// handler event that disconnects explicitly)
diff --git a/src/kvirc/kernel/KviIrcLink.h b/src/kvirc/kernel/KviIrcLink.h
index 5c4f8f55e..a88fde846 100644
--- a/src/kvirc/kernel/KviIrcLink.h
+++ b/src/kvirc/kernel/KviIrcLink.h
@@ -35,7 +35,7 @@
 
 #include <QObject>
 
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcServer;
 class KviProxy;
 class KviIrcSocket;
@@ -70,7 +70,7 @@ protected:
 	/**
 	* \brief Constructs the IrcLink object
 	*
-	* Only KviConsole can create this.
+	* Only KviConsoleWindow can create this.
 	* pConsole must NOT be null;
 	* pServer is a shallow pointer: Connection makes a copy of it internally,
 	* must NOT be null;
@@ -88,7 +88,7 @@ protected:
 private:
 	KviIrcConnection               * m_pConnection;       // shallow, never null
 	KviIrcConnectionTarget         * m_pTarget;           // shallow, never null
-	KviConsole                     * m_pConsole;          // shallow, never null
+	KviConsoleWindow                     * m_pConsole;          // shallow, never null
 	KviIrcSocket                   * m_pSocket;           // owned, may be null!
 	KviMexLinkFilter               * m_pLinkFilter;       // owned, may be null!
 
@@ -120,9 +120,9 @@ public:
 	* \brief Returns the console
 	*
 	* Never null
-	* \return KviConsole *
+	* \return KviConsoleWindow *
 	*/
-	KviConsole * console(){ return m_pConsole; };
+	KviConsoleWindow * console(){ return m_pConsole; };
 
 	/**
 	* \brief Returns the state of the socket
diff --git a/src/kvirc/kernel/KviIrcSocket.cpp b/src/kvirc/kernel/KviIrcSocket.cpp
index d16d6cee2..9f8689b1f 100644
--- a/src/kvirc/kernel/KviIrcSocket.cpp
+++ b/src/kvirc/kernel/KviIrcSocket.cpp
@@ -1568,7 +1568,7 @@ void KviIrcSocket::processData(char * buffer,int)
 
 			if(m_state != Connected)
 			{
-				// Disconnected in KviConsole::incomingMessage() call.
+				// Disconnected in KviConsoleWindow::incomingMessage() call.
 				// This may happen for several reasons (local event loop
 				// with the user hitting the disconnect button, a scripting
 				// handler event that disconnects explicitly)
diff --git a/src/kvirc/kernel/KviIrcSocket.h b/src/kvirc/kernel/KviIrcSocket.h
index e9b3b50ce..927940cd5 100644
--- a/src/kvirc/kernel/KviIrcSocket.h
+++ b/src/kvirc/kernel/KviIrcSocket.h
@@ -46,7 +46,7 @@ class KviIrcConnection;
 class KviIrcConnectionTarget;
 class KviIrcLink;
 class KviSSL;
-class KviConsole;
+class KviConsoleWindow;
 class KviDataBuffer;
 
 /**
@@ -102,7 +102,7 @@ public:
 protected:
 	unsigned int           m_uId;
 	KviIrcLink           * m_pLink;
-	KviConsole           * m_pConsole;
+	KviConsoleWindow           * m_pConsole;
 	kvi_socket_t           m_sock;
 	SocketState            m_state;
 	QSocketNotifier      * m_pWsn;
@@ -125,9 +125,9 @@ protected:
 public:
 	/**
 	* \brief Returns the console
-	* \return KviConsole *
+	* \return KviConsoleWindow *
 	*/
-	KviConsole * console(){ return m_pConsole; };
+	KviConsoleWindow * console(){ return m_pConsole; };
 
 	/**
 	* \brief Returns the link
diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp
index 4f921b8f2..ba2a6f9a0 100644
--- a/src/kvirc/kernel/KviIrcUrl.cpp
+++ b/src/kvirc/kernel/KviIrcUrl.cpp
@@ -267,7 +267,7 @@ void KviIrcUrl::makeJoinCmd(const QStringList& chans, QString& szJoinCommand)
 		}
 }
 
-int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
+int KviIrcUrl::run(const QString& text,int contextSpec,KviConsoleWindow* pConsole)
 {
 	KviIrcUrlParts parts;
 	KviIrcUrl::split(text,parts);
diff --git a/src/kvirc/kernel/KviIrcUrl.h b/src/kvirc/kernel/KviIrcUrl.h
index 8b98bbfc3..b7958dcca 100644
--- a/src/kvirc/kernel/KviIrcUrl.h
+++ b/src/kvirc/kernel/KviIrcUrl.h
@@ -29,7 +29,7 @@
 #include "kvi_inttypes.h"
 
 class KviIrcServer;
-class KviConsole;
+class KviConsoleWindow;
 
 #include <QStringList>
 
@@ -69,7 +69,7 @@ namespace KviIrcUrl
 
 	extern KVIRC_API bool parse(const char * url,KviCString &cmdBuffer,int contextSpec = KVI_IRCURL_CONTEXT_FIRSTFREE);
 
-	extern KVIRC_API int  run(const QString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0);
+	extern KVIRC_API int  run(const QString& url,int contextSpec = FirstFreeContext,KviConsoleWindow* pConsole = 0);
 
 	extern KVIRC_API void split(QString url, KviIrcUrlParts& parts);
 	extern KVIRC_API void join(QString &url, KviIrcServer* server);
diff --git a/src/kvirc/kernel/KviNotifyList.h b/src/kvirc/kernel/KviNotifyList.h
index a06f99904..50d7fe3e8 100644
--- a/src/kvirc/kernel/KviNotifyList.h
+++ b/src/kvirc/kernel/KviNotifyList.h
@@ -34,14 +34,14 @@
 #include <QObject>
 #include <QTimer>
 
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcMessage;
 class KviIrcMask;
 class KviIrcConnection;
 
 class KVIRC_API KviNotifyListManager : public QObject
 {
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviConnectionInfo;
 	friend class KviIrcServerParser;
 	friend class KviIrcConnection;
@@ -50,7 +50,7 @@ protected:
 	KviNotifyListManager(KviIrcConnection * pConnection);
 	~KviNotifyListManager();
 protected:
-	KviConsole       * m_pConsole;
+	KviConsoleWindow       * m_pConsole;
 	KviIrcConnection * m_pConnection;
 protected:
 	virtual void start();
@@ -61,12 +61,12 @@ protected:
 	void notifyOnLine(const QString &nick,const QString &user = QString(),const QString &host = QString(),const QString &szReason = QString(),bool bJoin=true);
 	void notifyOffLine(const QString &nick,const QString &user = QString(),const QString &host = QString(),const QString &szReason = QString());
 public:
-	KviConsole * console(){ return m_pConsole;  };
+	KviConsoleWindow * console(){ return m_pConsole;  };
 };
 
 class KVIRC_API KviIsOnNotifyListManager : public KviNotifyListManager
 {
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviIrcServerParser;
 	friend class KviIrcConnection;
 	Q_OBJECT
@@ -114,7 +114,7 @@ private slots:
 
 class KVIRC_API KviStupidNotifyListManager : public KviNotifyListManager
 {
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviIrcServerParser;
 	friend class KviIrcConnection;
 	Q_OBJECT
@@ -139,7 +139,7 @@ private:
 
 class KVIRC_API KviWatchNotifyListManager : public KviNotifyListManager
 {
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviIrcServerParser;
 	friend class KviIrcConnection;
 	Q_OBJECT
diff --git a/src/kvirc/kernel/KviUserInput.cpp b/src/kvirc/kernel/KviUserInput.cpp
index c086990bc..3e64a1596 100644
--- a/src/kvirc/kernel/KviUserInput.cpp
+++ b/src/kvirc/kernel/KviUserInput.cpp
@@ -123,7 +123,7 @@ namespace KviUserInput
 					{
 						QByteArray data = pWindow->connection()->encodeText(buf);
 
-						if(((KviConsole *)pWindow)->connection()->sendData(data.data()))
+						if(((KviConsoleWindow *)pWindow)->connection()->sendData(data.data()))
 						{
 							pWindow->output(KVI_OUT_RAW,"[RAW]: %Q",&buf);
 							return;
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index c36aeb373..9a9ff2ddd 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -93,7 +93,7 @@ namespace KviKvsCoreFunctions
 		KVSCF_PARAMETERS_END
 
 		KviWindow * wnd;
-		KviConsole * cons;
+		KviConsoleWindow * cons;
 		if(KVSCF_pParams->count() > 0)
 		{
 			cons = g_pApp->findConsole(uContextId);
@@ -316,7 +316,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("irc_context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uCntx)
 		KVSCF_PARAMETERS_END
 
-		KviConsole * cns;
+		KviConsoleWindow * cns;
 
 		if(KVSCF_pParams->count() > 0)
 		{
@@ -615,7 +615,7 @@ namespace KviKvsCoreFunctions
 		{
 			if(KVSCF_pParams->count() > 1)
 			{
-				KviConsole * cons = g_pApp->findConsole(uContextId);
+				KviConsoleWindow * cons = g_pApp->findConsole(uContextId);
 				if(!cons)KVSCF_pContext->warning(__tr2qs_ctx("No such IRC context (%u)","kvs"),uContextId);
 				else {
 					if(cons->connection())
@@ -736,7 +736,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uContextId)
 		KVSCF_PARAMETERS_END
 
-		KviConsole * cons;
+		KviConsoleWindow * cons;
 		if(KVSCF_pParams->count() > 0)
 		{
 			cons = g_pApp->findConsole(uContextId);
@@ -792,7 +792,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("nick",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick)
 		KVSCF_PARAMETERS_END
 
-		KviConsole * cons;
+		KviConsoleWindow * cons;
 		if(!(szServer.isEmpty() && szNick.isEmpty()))
 		{
 			cons = g_pApp->findConsole(szServer,szNick);
@@ -1393,7 +1393,7 @@ namespace KviKvsCoreFunctions
 		Q_UNUSED(__pContext);
 		Q_UNUSED(__pParams);
 
-		KviConsole * c = g_pApp->topmostConnectedConsole();
+		KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
 		// FIXME: The window id's should be numeric!!!
 		KVSCF_pRetBuffer->setString(c ? c->id() : "0");
 		return true;
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
index 71b3f0aec..1a3a1f1a5 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
@@ -165,7 +165,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("irc_context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uCntx)
 		KVSCF_PARAMETERS_END
 
-		KviConsole * cns;
+		KviConsoleWindow * cns;
 
 		if(KVSCF_pParams->count() > 0)
 		{
@@ -488,7 +488,7 @@ namespace KviKvsCoreFunctions
 		{
 			if(KVSCF_pParams->count() > 1)
 			{
-				KviConsole * cons = g_pApp->findConsole(uContextId);
+				KviConsoleWindow * cons = g_pApp->findConsole(uContextId);
 				if(!cons)KVSCF_pContext->warning(__tr2qs_ctx("No such IRC context (%u)","kvs"),uContextId);
 				else {
 					if(cons->connection())
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index d01c92dae..75a23aef2 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -183,7 +183,7 @@ namespace KviKvsCoreFunctions
 			KVSCF_PARAMETER("irc_context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uCntx)
 		KVSCF_PARAMETERS_END
 
-		KviConsole * cns;
+		KviConsoleWindow * cns;
 
 		if(KVSCF_pParams->count() > 0)
 		{
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index 95a3fcc17..e82612f05 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -131,7 +131,7 @@ namespace KviKvsCoreSimpleCommands
 					{
 						if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
 						{
-							KviConsole* pConsole=(KviConsole*)wnd;
+							KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 							if(pConsole->isConnected())
 								pConsole->connection()->sendFmtData("AWAY");
 						}
@@ -154,7 +154,7 @@ namespace KviKvsCoreSimpleCommands
 			{
 				if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
 				{
-					KviConsole* pConsole=(KviConsole*)wnd;
+					KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 					if(pConsole->isConnected())
 						pConsole->connection()->sendFmtData("AWAY :%s",
 								pConsole->connection()->encodeText(szReason).data()
@@ -209,7 +209,7 @@ namespace KviKvsCoreSimpleCommands
 			{
 				if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
 				{
-					KviConsole* pConsole=(KviConsole*)wnd;
+					KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 					if(pConsole->isConnected())
 						pConsole->connection()->sendFmtData("AWAY");
 				}
@@ -1240,7 +1240,7 @@ namespace KviKvsCoreSimpleCommands
 
 		int type = KVI_OUT_NONE;
 		KviWindow * pWnd = KVSCSC_pWindow;
-		KviConsole * pConsole = pWnd->console();
+		KviConsoleWindow * pConsole = pWnd->console();
 		if(!pConsole)pConsole = g_pApp->activeConsole();
 
 		KviKvsVariant * v;
@@ -1283,9 +1283,9 @@ namespace KviKvsCoreSimpleCommands
 		}
 
 		int iFlags = 0;
-		if(KVSCSC_pSwitches->find('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting;
-		if(KVSCSC_pSwitches->find('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing;
-		if(KVSCSC_pSwitches->find('x',"no-notifier"))iFlags |= KviConsole::NoNotifier;
+		if(KVSCSC_pSwitches->find('n',"no-highlighting"))iFlags |= KviConsoleWindow::NoHighlighting;
+		if(KVSCSC_pSwitches->find('f',"no-flashing"))iFlags |= KviConsoleWindow::NoWindowFlashing;
+		if(KVSCSC_pSwitches->find('x',"no-notifier"))iFlags |= KviConsoleWindow::NoNotifier;
 
 		pConsole->outputPrivmsg(pWnd,type,
 				szNick,szUser,szHost,szText,
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
index 408bdf51f..5251f4be9 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
@@ -222,7 +222,7 @@ namespace KviKvsCoreSimpleCommands
 			KVSCSC_PARAMETER("port",KVS_PT_UINT,KVS_PF_OPTIONAL,uPort)
 		KVSCSC_PARAMETERS_END
 
-		KviConsole * console = 0;
+		KviConsoleWindow * console = 0;
 		if(KVSCSC_pSwitches->find('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole();
 		else {
 			if(KVSCSC_pSwitches->find('u',"unused-context"))
diff --git a/src/kvirc/kvs/KviKvsRunTimeContext.h b/src/kvirc/kvs/KviKvsRunTimeContext.h
index c255d6273..f39f21db6 100644
--- a/src/kvirc/kvs/KviKvsRunTimeContext.h
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.h
@@ -33,7 +33,7 @@
 #include "KviKvsSwitchList.h"
 
 class KviKvsScript;
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcContext;
 class KviIrcConnection;
 class KviKvsTreeNode;
@@ -137,7 +137,7 @@ public:
 	KviIrcContext * context()
 		{ return m_pWindow->context(); };
 	// quick access to the console that this script is bound to (it MAY be zero, if there is no console)
-	KviConsole * console()
+	KviConsoleWindow * console()
 		{ return m_pWindow->console(); };
 	// quick access to the connection: it MAY be zero!
 	KviIrcConnection * connection()
diff --git a/src/kvirc/sparser/KviIrcMessage.h b/src/kvirc/sparser/KviIrcMessage.h
index f67c4f49b..48cecf340 100644
--- a/src/kvirc/sparser/KviIrcMessage.h
+++ b/src/kvirc/sparser/KviIrcMessage.h
@@ -56,12 +56,12 @@ private:
 	KviCString                m_szPrefix;           // the extracted prefix string
 	KviCString                m_szCommand;          // the extracted command (may be numeric)
 	KviPointerList<KviCString>  * m_pParams;            // the list of parameters
-	KviConsole          * m_pConsole;           // the console we're attacched to
+	KviConsoleWindow          * m_pConsole;           // the console we're attacched to
 	KviIrcConnection    * m_pConnection;        // the connection we're attacched to
 	int                   m_iNumericCommand;    // the numeric of the command (0 if non numeric)
 	int                   m_iFlags;             // yes.. flags :D
 public:
-	KviConsole       * console(){ return m_pConsole; };
+	KviConsoleWindow       * console(){ return m_pConsole; };
 	KviIrcConnection * connection(){ return m_pConsole->connection(); };
 
 	bool               isNumeric(){ return (m_iNumericCommand >= 0); };
diff --git a/src/kvirc/sparser/KviIrcServerParser.h b/src/kvirc/sparser/KviIrcServerParser.h
index 739cd6b8d..8a6a810d8 100644
--- a/src/kvirc/sparser/KviIrcServerParser.h
+++ b/src/kvirc/sparser/KviIrcServerParser.h
@@ -84,7 +84,7 @@ typedef struct _KviDccRequest
 	KviCString           szParam5;
 	bool             bIPv6;
 	KviCtcpMessage * ctcpMsg;
-	KviConsole     * pConsole;
+	KviConsoleWindow     * pConsole;
 } KviDccRequest;
 
 typedef void (KviIrcServerParser::*ctcpParseProc)(KviCtcpMessage *);
@@ -114,7 +114,6 @@ public:
 	virtual void die(){ delete this; };
 };
 
-
 class KVIRC_API KviIrcServerParser : public QObject
 {
 	Q_OBJECT
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index bf4ec67a7..ba42582d1 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -195,7 +195,7 @@ void KviIrcServerParser::parseLiteralJoin(KviIrcMessage *msg)
 	}
 
 	// Now lookup the channel
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	KviChannelWindow * chan = msg->connection()->findChannel(channel);
 
 	bool bIsMe = IS_ME(msg,szNick);
@@ -312,7 +312,7 @@ void KviIrcServerParser::parseLiteralPart(KviIrcMessage *msg)
 	QString szChan = msg->connection()->decodeText(msg->safeParam(0));
 
 	// Now lookup the channel
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 
 	if(!chan)
@@ -408,7 +408,7 @@ void KviIrcServerParser::parseLiteralQuit(KviIrcMessage *msg)
 	QString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 
 	// NETSPLIT DETECTION STUFF
 	// this doesn't need to be decoded for the moment
@@ -553,7 +553,7 @@ void KviIrcServerParser::parseLiteralKick(KviIrcMessage *msg)
 	QString szChan = msg->connection()->decodeText(msg->safeParam(0));
 	QString victim = msg->connection()->decodeText(msg->safeParam(1));
 
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 
 	if(!chan){
@@ -711,7 +711,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 	QString szTarget = msg->connection()->decodeText(msg->safeParam(0));
 	QString szMsg = msg->connection()->decodeText(msg->safeTrailing());
 
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	KviRegisteredUser * u = msg->connection()->userDataBase()->registeredUser(szNick,szUser,szHost);
 	//Highlight it?
 
@@ -917,13 +917,13 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 					if(KVI_OPTION_BOOL(KviOption_boolFlashQueryWindowOnNewMessages))
 					{
 						// avoid double window flashing
-						iFlags |= KviConsole::NoWindowFlashing;
+						iFlags |= KviConsoleWindow::NoWindowFlashing;
 						query->demandAttention();
 					}
 					if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewQueryMessages))
 					{
 						// don't send the message to the notifier twice
-						iFlags |= KviConsole::NoNotifier;
+						iFlags |= KviConsoleWindow::NoNotifier;
 						QString szMsg = Qt::escape(szMsgText);
 						//qDebug("KviIrcServerParser_literalHandlers.cpp:908 debug: %s",szMsgText.data());
 						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
@@ -1070,7 +1070,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 	QString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	bool bIsServerNotice = false;
 
 	//Check is it's a server notice (szNick = irc.xxx.net)
@@ -1282,13 +1282,13 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 					if(KVI_OPTION_BOOL(KviOption_boolFlashQueryWindowOnNewMessages))
 					{
 						// avoid double window flashing
-						iFlags |= KviConsole::NoWindowFlashing;
+						iFlags |= KviConsoleWindow::NoWindowFlashing;
 						query->demandAttention();
 					}
 					if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewQueryMessages))
 					{
 						// don't send the message twice to the notifier
-						iFlags |= KviConsole::NoNotifier;
+						iFlags |= KviConsoleWindow::NoNotifier;
 						QString szMsg = Qt::escape(szMsgText);
 						//qDebug("KviIrcServerParser_literalHandlers.cpp:1262 debug: %s",szMsgText.data());
 						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
@@ -1464,7 +1464,7 @@ void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg)
 	// :source NICK <newnick>
 	QString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	QString szNewNick = msg->connection()->decodeText(msg->safeTrailing());
 
 	bool bIsMe = IS_ME(msg,szNick);
@@ -1588,7 +1588,7 @@ void KviIrcServerParser::parseLiteralInvite(KviIrcMessage *msg)
 	QString szTarget = msg->connection()->decodeText(msg->safeParam(0));
 	QString szChannel = msg->connection()->decodeText(msg->safeParam(1));
 
-	KviConsole * console = msg->console();
+	KviConsoleWindow * console = msg->console();
 	KviRegisteredUser * u = msg->connection()->userDataBase()->registeredUser(szNick,szUser,szHost);
 	//Ignore it?
 	if(u)
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 6026f7347..ae2c40615 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -83,7 +83,7 @@
 // FIXME: #warning "OnChannelFlood event...."
 
 
-KviChannelWindow::KviChannelWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szName)
+KviChannelWindow::KviChannelWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole, const QString & szName)
 : KviWindow(KVI_WINDOW_TYPE_CHANNEL,lpFrm,szName,lpConsole)
 {
 	// Init some member variables
@@ -1186,7 +1186,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 							return;
 						if(bUserFeedback)
 							m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
-									QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications);
+									QString(),QString(),QString(),szBuffer,KviConsoleWindow::NoNotifications);
 					break;
 					case KviCryptEngine::Encoded:
 					{
@@ -1197,7 +1197,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 							// ugly,but we must redecode here
 							QString szRedecoded = decodeText(encrypted.ptr());
 							m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-								QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications);
+								QString(),QString(),QString(),szRedecoded,KviConsoleWindow::NoNotifications);
 						}
 					}
 					break;
@@ -1291,7 +1291,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 			{
 				//feeedback the user
 				if(bUserFeedback)
-					m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications);
+					m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsoleWindow::NoNotifications);
 				userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
 			} else {
 				// skipped a part in this multi message.. we don't want to continue
@@ -1307,7 +1307,7 @@ void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 		if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))
 		{
 			if(bUserFeedback)
-				m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications);
+				m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsoleWindow::NoNotifications);
 			userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
 		}
 	}
diff --git a/src/kvirc/ui/KviChannelWindow.h b/src/kvirc/ui/KviChannelWindow.h
index 4d9173371..a76f7b00f 100644
--- a/src/kvirc/ui/KviChannelWindow.h
+++ b/src/kvirc/ui/KviChannelWindow.h
@@ -47,7 +47,7 @@
 #include <QToolButton>
 
 
-class KviConsole;
+class KviConsoleWindow;
 class KviTopicWidget;
 class KviIrcMask;
 class KviThemedLabel;
@@ -162,7 +162,7 @@ public:
 	* \param szName The name of the channel
 	* \return KviChannelWindow
 	*/
-	KviChannelWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szName);
+	KviChannelWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole, const QString & szName);
 
 	/**
 	* \brief Destroys the channel object
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 8e25cc4fe..ea23a966f 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -92,7 +92,7 @@
 extern KVIRC_API KviIrcServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 
-KviConsole::KviConsole(KviMainWindow * lpFrm,int iFlags)
+KviConsoleWindow::KviConsoleWindow(KviMainWindow * lpFrm,int iFlags)
 #ifdef COMPILE_ON_WINDOWS
 : KviWindow(KVI_WINDOW_TYPE_CONSOLE,lpFrm,__tr2qs("CONSOLE"),0)
 #else
@@ -152,7 +152,7 @@ KviConsole::KviConsole(KviMainWindow * lpFrm,int iFlags)
 	applyOptions();
 }
 
-void KviConsole::recentUrlsChanged()
+void KviConsoleWindow::recentUrlsChanged()
 {
 	QString cur = m_pAddressEdit->currentText();
 	m_pAddressEdit->clear();
@@ -174,14 +174,14 @@ void KviConsole::recentUrlsChanged()
 	}
 }
 
-bool KviConsole::connectionInProgress()
+bool KviConsoleWindow::connectionInProgress()
 {
 	if(context()->asynchronousConnectionData() != 0)return true;
 	if(context()->state() != KviIrcContext::Idle)return true;
 	return false;
 }
 
-KviConsole::~KviConsole()
+KviConsoleWindow::~KviConsoleWindow()
 {
 	// FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /QUIT $option() so the idents are parsed!"
 
@@ -198,7 +198,7 @@ KviConsole::~KviConsole()
 	delete m_pTmpHighLightedChannels;
 }
 
-void KviConsole::triggerCreationEvents()
+void KviConsoleWindow::triggerCreationEvents()
 {
 	if(m_iFlags & KVI_CONSOLE_FLAG_FIRSTINAPP) // this is the first context in the application
 	{
@@ -216,7 +216,7 @@ void KviConsole::triggerCreationEvents()
 	KVS_TRIGGER_EVENT_0(KviEvent_OnIrcContextCreated,this);
 }
 
-void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * matches)
+void KviConsoleWindow::completeChannel(const QString &word,KviPointerList<QString> * matches)
 {
 	// FIXME: first look in our context ?
 	/*
@@ -236,7 +236,7 @@ void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * m
 	}
 }
 
-void KviConsole::completeServer(const QString &word, KviPointerList<QString> * matches)
+void KviConsoleWindow::completeServer(const QString &word, KviPointerList<QString> * matches)
 {
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it)
 	{
@@ -253,7 +253,7 @@ void KviConsole::completeServer(const QString &word, KviPointerList<QString> * m
 	}
 }
 
-void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer)
+void KviConsoleWindow::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer)
 {
 	KviRegisteredMask *u = g_pRegisteredUserDataBase->findMatchingMask(nick,e->user(),e->host());
 
@@ -352,17 +352,17 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &
 	}
 }
 
-void KviConsole::toggleNotifyView()
+void KviConsoleWindow::toggleNotifyView()
 {
 	showNotifyList(!m_pNotifyListView->isVisible());
 }
 
-void KviConsole::executeInternalCommand(int index)
+void KviConsoleWindow::executeInternalCommand(int index)
 {
 	KviKvsScript::run(kvi_getInternalCommandBuffer(index),this);
 }
 
-void KviConsole::saveProperties(KviConfigurationFile *cfg)
+void KviConsoleWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	QList<int> sizes;
@@ -371,12 +371,12 @@ void KviConsole::saveProperties(KviConfigurationFile *cfg)
 	cfg->writeEntry("NotifyListViewVisible",m_pNotifyViewButton->isChecked());
 }
 
-void KviConsole::getBaseLogFileName(QString &buffer)
+void KviConsoleWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer=QString("CONSOLE%1").arg(context()->id());
 }
 
-void KviConsole::showNotifyList(bool bShow)
+void KviConsoleWindow::showNotifyList(bool bShow)
 {
 	if(!bShow)
 	{
@@ -388,7 +388,7 @@ void KviConsole::showNotifyList(bool bShow)
 	}
 }
 
-void KviConsole::loadProperties(KviConfigurationFile *cfg)
+void KviConsoleWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	int iWidth = width();
 	QList<int> def;
@@ -405,20 +405,20 @@ void KviConsole::loadProperties(KviConfigurationFile *cfg)
 	showNotifyList(cfg->readBoolEntry("NotifyListViewVisible",false));
 }
 
-void KviConsole::textViewRightClicked()
+void KviConsoleWindow::textViewRightClicked()
 {
 	KVS_TRIGGER_EVENT_0(KviEvent_OnConsolePopupRequest,this);
 }
 
 
-KviWindow * KviConsole::activeWindow()
+KviWindow * KviConsoleWindow::activeWindow()
 {
 	if(!g_pActiveWindow)return this;
 	if(g_pActiveWindow->console() == this)return g_pActiveWindow;
 	return this;
 }
 
-void KviConsole::ircUriChanged(const QString & text){
+void KviConsoleWindow::ircUriChanged(const QString & text){
 	if(KviIrcUrl::run(text,KviIrcUrl::CurrentContext,this) & KviIrcUrl::InvalidProtocol)
 	{
 		KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or irc6s:// URL's\n"
@@ -426,7 +426,7 @@ void KviConsole::ircUriChanged(const QString & text){
 	}
 }
 
-void KviConsole::updateUri()
+void KviConsoleWindow::updateUri()
 {
 	QString uri;
 	if(connection())
@@ -459,7 +459,7 @@ void KviConsole::updateUri()
 	}
 }
 
-void KviConsole::connectionAttached()
+void KviConsoleWindow::connectionAttached()
 {
 	//need to update URI
 	connect(m_pContext->connection(),SIGNAL(chanListChanged()),this,SLOT(updateUri()));
@@ -467,14 +467,14 @@ void KviConsole::connectionAttached()
 	m_pNotifyListView->setUserDataBase(connection()->userDataBase());
 }
 
-void KviConsole::connectionDetached()
+void KviConsoleWindow::connectionDetached()
 {
 	//need to update URI?
 	m_pNotifyListView->partAll();
 	m_pNotifyListView->setUserDataBase(0); // this is rather for crash tests
 }
 
-void KviConsole::closeEvent(QCloseEvent *e)
+void KviConsoleWindow::closeEvent(QCloseEvent *e)
 {
 	if(g_pFrame->consoleCount() > 1)
 	{
@@ -543,7 +543,7 @@ void KviConsole::closeEvent(QCloseEvent *e)
 }
 
 // internal helper for applyHighlighting
-int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger)
+int KviConsoleWindow::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger)
 {
 	if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && wnd!=g_pActiveWindow)
 		KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound))));
@@ -560,7 +560,7 @@ int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,c
 	return KVI_OUT_HIGHLIGHT;
 }
 
-void KviConsole::addHighlightedChannel(const QString & szChan)
+void KviConsoleWindow::addHighlightedChannel(const QString & szChan)
 {
 	if(m_pTmpHighLightedChannels->contains(szChan,Qt::CaseInsensitive))
 		return;
@@ -568,13 +568,13 @@ void KviConsole::addHighlightedChannel(const QString & szChan)
    		m_pTmpHighLightedChannels->append(szChan);
 }
 
-void KviConsole::removeHighlightedChannel(const QString & szChan)
+void KviConsoleWindow::removeHighlightedChannel(const QString & szChan)
 {
 	m_pTmpHighLightedChannels->removeOne(szChan);
 }
 
 // if it returns -1 you should just return and not display the message
-int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg)
+int KviConsoleWindow::applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg)
 {
 	QString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters);
 	QString szSource;
@@ -660,7 +660,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co
 }
 
 
-void KviConsole::outputPrivmsg(KviWindow *wnd,
+void KviConsoleWindow::outputPrivmsg(KviWindow *wnd,
 	int type,
 	const QString &daNick,
 	const QString &daUser,
@@ -852,7 +852,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
 	else wnd->outputNoFmt(type,szMessage);
 }
 
-void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &textLine)
+void KviConsoleWindow::avatarChangedUpdateWindows(const QString &nick,const QString &textLine)
 {
 	if(!connection())return; //ops...
 
@@ -876,7 +876,7 @@ void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &t
 	m_pNotifyListView->avatarChanged(nick); // recalc the item height here too!
 }
 
-void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine)
+void KviConsoleWindow::avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine)
 {
 	if(!connection())return; //ops...
 
@@ -909,7 +909,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr
 	avatarChangedUpdateWindows(nick,textLine);
 }
 
-void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host)
+void KviConsoleWindow::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host)
 {
 	// look it up in the cache
 	QString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName());
@@ -949,7 +949,7 @@ void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const
 	}
 }
 
-void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u)
+void KviConsoleWindow::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 {
 	if(!connection())return;
 
@@ -972,7 +972,7 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 	}
 }
 
-KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName)
+KviAvatar * KviConsoleWindow::setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName)
 {
 	if(!connection())return 0;
 	KviIrcUserEntry * e = connection()->userDataBase()->find(nick);
@@ -1004,7 +1004,7 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const
 	return 0;
 }
 
-KviAvatar * KviConsole::defaultAvatarFromOptions()
+KviAvatar * KviConsoleWindow::defaultAvatarFromOptions()
 {
 	QPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap();
 
@@ -1026,7 +1026,7 @@ KviAvatar * KviConsole::defaultAvatarFromOptions()
 	return 0;
 }
 
-KviAvatar * KviConsole::currentAvatar()
+KviAvatar * KviConsoleWindow::currentAvatar()
 {
 	if(!connection())
 		return 0;
@@ -1051,7 +1051,7 @@ KviAvatar * KviConsole::currentAvatar()
 	return a;
 }
 
-void KviConsole::setAvatarFromOptions()
+void KviConsoleWindow::setAvatarFromOptions()
 {
 	if(!connection())
 		return;
@@ -1065,7 +1065,7 @@ void KviConsole::setAvatarFromOptions()
 	avatarChanged(a,connection()->userInfo()->nickName(),QString(),QString(),QString());
 }
 
-void KviConsole::applyOptions()
+void KviConsoleWindow::applyOptions()
 {
 	m_pAddressEdit->applyOptions();
 	m_pNotifyListView->applyOptions();
@@ -1093,7 +1093,7 @@ void KviConsole::applyOptions()
 	}
 }
 
-void KviConsole::resizeEvent(QResizeEvent *)
+void KviConsoleWindow::resizeEvent(QResizeEvent *)
 {
 	int hght = m_pInput->heightHint();
 	int hght2 = m_pButtonBox->sizeHint().height();
@@ -1102,13 +1102,13 @@ void KviConsole::resizeEvent(QResizeEvent *)
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-QSize KviConsole::sizeHint() const
+QSize KviConsoleWindow::sizeHint() const
 {
 	QSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
-void KviConsole::fillStatusString()
+void KviConsoleWindow::fillStatusString()
 {
 	switch(context()->state())
 	{
@@ -1149,7 +1149,7 @@ void KviConsole::fillStatusString()
 	}
 }
 
-void KviConsole::fillCaptionBuffers()
+void KviConsoleWindow::fillCaptionBuffers()
 {
 	fillStatusString();
 
@@ -1159,12 +1159,12 @@ void KviConsole::fillCaptionBuffers()
 	m_szPlainTextCaption += QChar(']');
 }
 
-QPixmap * KviConsole::myIconPtr()
+QPixmap * KviConsoleWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(isConnected() ? KVI_SMALLICON_LINKS : KVI_SMALLICON_CONSOLE);
 }
 
-void KviConsole::getWindowListTipText(QString &buffer)
+void KviConsoleWindow::getWindowListTipText(QString &buffer)
 {
 	fillStatusString();
 
diff --git a/src/kvirc/ui/KviConsoleWindow.h b/src/kvirc/ui/KviConsoleWindow.h
index 553927a67..c75e2d3c4 100644
--- a/src/kvirc/ui/KviConsoleWindow.h
+++ b/src/kvirc/ui/KviConsoleWindow.h
@@ -74,7 +74,7 @@ class KviWindowToolPageButton;
 #define KVI_CONSOLE_FLAG_FIRSTINFRAME 2
 
 
-class KVIRC_API KviConsole : public KviWindow
+class KVIRC_API KviConsoleWindow : public KviWindow
 {
 	friend class KviMainWindow;
 	friend class KviIrcSocket;
@@ -83,9 +83,9 @@ class KVIRC_API KviConsole : public KviWindow
 	friend class KviIrcContext;
 	Q_OBJECT
 protected:
-	KviConsole(KviMainWindow * lpFrm,int iFlags);
+	KviConsoleWindow(KviMainWindow * lpFrm,int iFlags);
 public:
-	~KviConsole();
+	~KviConsoleWindow();
 protected:
 	int                                m_iFlags; // FIXME: make this a KviWindow property ?
 	// UI
@@ -221,23 +221,23 @@ protected slots:
 	void textViewRightClicked();
 };
 
-inline int KviConsole::selectedCount()
+inline int KviConsoleWindow::selectedCount()
 {
 	return m_pNotifyListView->selectedCount();
 }
 
-inline bool KviConsole::isIPv6Connection()
+inline bool KviConsoleWindow::isIPv6Connection()
 {
 	KVI_ASSERT(connection());
 	return connection()->target()->server()->isIPv6();
 }
 
-inline bool KviConsole::isNotConnected()
+inline bool KviConsoleWindow::isNotConnected()
 {
 	return (context()->state() == KviIrcContext::Idle);
 }
 
-inline QString KviConsole::currentNetworkName()
+inline QString KviConsoleWindow::currentNetworkName()
 {
 	return (connection() ? connection()->currentNetworkName() : QString());
 }
diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index 9b2a1963b..599f0d1dc 100644
--- a/src/kvirc/ui/KviIrcToolBar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -273,7 +273,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &)
 {
 	QString txt;
 
-	KviConsole * c = g_pActiveWindow->console();
+	KviConsoleWindow * c = g_pActiveWindow->console();
 
 	static QString b = "<b>";
 	static QString nb = "</b>";
@@ -348,7 +348,7 @@ void KviIrcContextDisplay::drawContents(QPainter * p)
 {
 	// The context indicator
 	KviWindow * wnd = g_pActiveWindow;
-	KviConsole * c = wnd ? wnd->console() : 0;
+	KviConsoleWindow * c = wnd ? wnd->console() : 0;
 
 	if(c)
 	{
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index fe6b9e429..2536985d1 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -2746,7 +2746,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect *
 	return 0;
 }
 
-KviConsole * KviIrcView::console()
+KviConsoleWindow * KviIrcView::console()
 {
 	return m_pKviWindow->console();
 }
diff --git a/src/kvirc/ui/KviIrcView.h b/src/kvirc/ui/KviIrcView.h
index 46d8eae7c..14d78dc63 100644
--- a/src/kvirc/ui/KviIrcView.h
+++ b/src/kvirc/ui/KviIrcView.h
@@ -41,7 +41,7 @@ class KviTalPopupMenu;
 
 class KviWindow;
 class KviMainWindow;
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcViewToolWidget;
 class KviIrcViewToolTip;
 class KviAnimatedPixmap;
@@ -164,7 +164,7 @@ public:
 	void findNext(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
 	void findPrev(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
 	KviWindow * parentKviWindow(){ return m_pKviWindow; };
-	KviConsole * console();
+	KviConsoleWindow * console();
 	// A null pixmap passed here unsets the private backgrdound.
 	void setPrivateBackgroundPixmap(const QPixmap &pixmap,bool bRepaint=true);
 	bool hasPrivateBackgroundPixmap(){ return (m_pPrivateBackgroundPixmap != 0); };
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index 44c61777e..6c50c66af 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -405,7 +405,7 @@ void KviMainWindow::saveWindowProperties(KviWindow * wnd,const QString &szSectio
 
 void KviMainWindow::closeWindow(KviWindow *wnd)
 {
-	if (wnd->inherits("KviConsole"))
+	if (wnd->inherits("KviConsoleWindow"))
 	{
 		if (consoleCount() <= 1)
 		{
@@ -581,13 +581,13 @@ void KviMainWindow::newConsole()
 	createNewConsole();
 }
 
-KviConsole * KviMainWindow::createNewConsole(bool bFirstInFrame)
+KviConsoleWindow * KviMainWindow::createNewConsole(bool bFirstInFrame)
 {
 	// the first console must be created BEFORE the toolbars visible
 	// at startup otherwise we cannot execute script code
 	// which is necessary for the actions that are going to be added
 	// to the toolbars
-	KviConsole * c = new KviConsole(this,bFirstInFrame ? KVI_CONSOLE_FLAG_FIRSTINFRAME : 0);
+	KviConsoleWindow * c = new KviConsoleWindow(this,bFirstInFrame ? KVI_CONSOLE_FLAG_FIRSTINFRAME : 0);
 	addWindow(c);
 
 	if(bFirstInFrame)
@@ -611,24 +611,24 @@ unsigned int KviMainWindow::consoleCount()
 	return count;
 }
 
-KviConsole * KviMainWindow::firstConsole()
+KviConsoleWindow * KviMainWindow::firstConsole()
 {
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())
 	{
-		if(wnd->type() == KVI_WINDOW_TYPE_CONSOLE)return (KviConsole *)wnd;
+		if(wnd->type() == KVI_WINDOW_TYPE_CONSOLE)return (KviConsoleWindow *)wnd;
 	}
 	KVI_ASSERT(false);
 	return 0; //should newer be here!.. but sometimes we are ?
 }
 
-KviConsole * KviMainWindow::firstNotConnectedConsole()
+KviConsoleWindow * KviMainWindow::firstNotConnectedConsole()
 {
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())
 	{
 		if(wnd->type() == KVI_WINDOW_TYPE_CONSOLE)
 		{
-			if(!((KviConsole *)wnd)->connectionInProgress())
-				return (KviConsole *)wnd;
+			if(!((KviConsoleWindow *)wnd)->connectionInProgress())
+				return (KviConsoleWindow *)wnd;
 		}
 	}
 	return 0;
@@ -780,7 +780,7 @@ void KviMainWindow::closeEvent(QCloseEvent *e)
 		{
 			if(w->type() == KVI_WINDOW_TYPE_CONSOLE)
 			{
-				if(((KviConsole *)w)->connectionInProgress())
+				if(((KviConsoleWindow *)w)->connectionInProgress())
 				{
 					bGotRunningConnection = true;
 					break;
diff --git a/src/kvirc/ui/KviMainWindow.h b/src/kvirc/ui/KviMainWindow.h
index b341daa6a..91bdced32 100644
--- a/src/kvirc/ui/KviMainWindow.h
+++ b/src/kvirc/ui/KviMainWindow.h
@@ -41,7 +41,7 @@ class KviMenuBar;
 class KviMdiChild;
 class KviMdiManager;
 class KviWindow;
-class KviConsole;
+class KviConsoleWindow;
 class KviWindowListBase;
 class QSplitter;
 class KviConfigurationFile;
@@ -78,7 +78,7 @@ public:
 class KVIRC_API KviMainWindow : public KviTalMainWindow //, public KviIrcContextManager
 {
 	friend class KviWindow;
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviApplication;
 	friend class KviIrcServerParser;
 	friend class KviMexToolBar;
@@ -138,16 +138,16 @@ public:
 	bool windowExists(KviWindow * wnd){ return (m_pWinList->findRef(wnd) != -1); };
 	// The number of consoles in this frame
 	unsigned int consoleCount();
-	// Creates a new console window. DON'T use the KviConsole constructor directly.
+	// Creates a new console window. DON'T use the KviConsoleWindow constructor directly.
 	// (The script creation events are triggered from here)
-	KviConsole * createNewConsole(bool bFirstInFrame = false);
+	KviConsoleWindow * createNewConsole(bool bFirstInFrame = false);
 	// Returns the first available console.
 	// There is almost always an available console.
 	// Exceptions are the startup and the shutdown (see activeWindow())
-	KviConsole * firstConsole();
+	KviConsoleWindow * firstConsole();
 	// Returns the first console that has no connection in progress
 	// This function CAN return 0 if all the consoles are connected
-	KviConsole * firstNotConnectedConsole();
+	KviConsoleWindow * firstNotConnectedConsole();
 	// this is explicitly dedicated to the DockExtension applets
 	void setDockExtension(KviDockExtension * e){ m_pDockExtension = e; };
 	// returns the dockExtension applet. Useful for calling refresh() when
diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index 04a51989c..b3a33a7ac 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -65,7 +65,7 @@
 #include <QList>
 #include <QByteArray>
 
-KviQueryWindow::KviQueryWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szNick)
+KviQueryWindow::KviQueryWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole, const QString & szNick)
 : KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,szNick,lpConsole)
 {
 	m_iFlags = 0;
@@ -592,7 +592,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 							return;
 						if(bUserFeedback)
 							m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
-								QString(),QString(),QString(),szBuffer,KviConsole::NoNotifications);
+								QString(),QString(),QString(),szBuffer,KviConsoleWindow::NoNotifications);
 					break;
 					case KviCryptEngine::Encoded:
 					{
@@ -603,7 +603,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 							// ugly,but we must redecode here
 							QString szRedecoded = decodeText(encrypted.ptr());
 							m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-								QString(),QString(),QString(),szRedecoded,KviConsole::NoNotifications);
+								QString(),QString(),QString(),szRedecoded,KviConsoleWindow::NoNotifications);
 						}
 					}
 					break;
@@ -699,7 +699,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 			{
 				//feeedback the user
 				if(bUserFeedback)
-					m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsole::NoNotifications);
+					m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szCurSubString,KviConsoleWindow::NoNotifications);
 				userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
 			} else {
 				// skipped a part in this multi message.. we don't want to continue
@@ -715,7 +715,7 @@ void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 		if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))
 		{
 			if(bUserFeedback)
-				m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsole::NoNotifications);
+				m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString(),QString(),QString(),szTmpBuffer,KviConsoleWindow::NoNotifications);
 			userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG);
 		}
 	}
diff --git a/src/kvirc/ui/KviQueryWindow.h b/src/kvirc/ui/KviQueryWindow.h
index 3820b4091..c2b8b4ceb 100644
--- a/src/kvirc/ui/KviQueryWindow.h
+++ b/src/kvirc/ui/KviQueryWindow.h
@@ -38,7 +38,7 @@
 #include "KviThemedLabel.h"
 #include "KviPointerHashTable.h"
 
-class KviConsole;
+class KviConsoleWindow;
 class KviConfigurationFile;
 class KviWindowToolPageButton;
 
@@ -62,7 +62,7 @@ public:
 	* \param szNick The nickname with who we open a query
 	* \return KviQueryWindow
 	*/
-	KviQueryWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szNick);
+	KviQueryWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole, const QString & szNick);
 
 	/**
 	* \brief Destroys the query object
diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp
index 502f2b6dd..e20ecbbe4 100644
--- a/src/kvirc/ui/KviTreeWindowList.cpp
+++ b/src/kvirc/ui/KviTreeWindowList.cpp
@@ -78,7 +78,7 @@ void KviTreeWindowListItem::captionChanged()
 	{
 		case KVI_WINDOW_TYPE_CONSOLE:
 		{
-			KviWindowListBase::getTextForConsole(szText,(KviConsole *)m_pWindow);
+			KviWindowListBase::getTextForConsole(szText,(KviConsoleWindow *)m_pWindow);
 		}
 		break;
 		case KVI_WINDOW_TYPE_CHANNEL:
@@ -157,14 +157,14 @@ QString KviTreeWindowListItem::key() const
 	{
 		if(iType==KVI_WINDOW_TYPE_CONSOLE)
 		{
-			ret.sprintf("%2d%4u",iType,((KviConsole*)m_pWindow)->context() ? ((KviConsole*)m_pWindow)->context()->id() : 9999);
+			ret.sprintf("%2d%4u",iType,((KviConsoleWindow*)m_pWindow)->context() ? ((KviConsoleWindow*)m_pWindow)->context()->id() : 9999);
 		} else {
 			ret.sprintf("%2d%s",iType,m_pWindow->windowName().toLower().toUtf8().data());
 		}
 	} else {
 		if(iType==KVI_WINDOW_TYPE_CONSOLE)
 		{
-			ret.sprintf("%2d%4u",iType,((KviConsole*)m_pWindow)->context() ? ((KviConsole*)m_pWindow)->context()->id() : 9999);
+			ret.sprintf("%2d%4u",iType,((KviConsoleWindow*)m_pWindow)->context() ? ((KviConsoleWindow*)m_pWindow)->context()->id() : 9999);
 		} else {
 			ret.sprintf("%2d%4d",iType,parent() ? parent()->indexOfChild((QTreeWidgetItem *)this) : 9999);
 		}
diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp
index 89518a53f..beeedbb98 100644
--- a/src/kvirc/ui/KviUserListView.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -505,7 +505,7 @@ bool KviUserListView::completeNickStandard(const QString & szBegin, const QStrin
 
 	// FIXME: completion should skip my own nick or place it as last entry in the chain (?)
 
-	//	if(KviConsole * c = m_pKviWindow->console())
+	//	if(KviConsoleWindow * c = m_pKviWindow->console())
 	//	{
 	//		if(kvi_strEqualCI(entry->m_szNick.ptr(),c->currentNickName())
 	//	}
diff --git a/src/kvirc/ui/KviUserListView.h b/src/kvirc/ui/KviUserListView.h
index a89b61d3c..d54809e90 100644
--- a/src/kvirc/ui/KviUserListView.h
+++ b/src/kvirc/ui/KviUserListView.h
@@ -55,7 +55,7 @@ class QLabel;
 class QScrollBar;
 class KviUserListView;
 class KviUserListViewArea;
-class KviConsole;
+class KviConsoleWindow;
 class KviWindow;
 
 #define KVI_USERLISTVIEW_GRIDTYPE_3DGRID 0
@@ -223,7 +223,7 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget
 	friend class KviUserListEntry;
 	friend class KviUserListViewArea;
 	friend class KviUserListToolTip;
-	friend class KviConsole;
+	friend class KviConsoleWindow;
 	friend class KviChannelWindow;
 	friend class KviQueryWindow;
 	Q_OBJECT
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index 73de67f8c..7aba5e14e 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -102,7 +102,7 @@ static QAction         * g_pMdiWindowSystemTextEncodingDefaultAction = 0;
 
 unsigned long int g_uUniqueWindowId = 1;
 
-KviWindow::KviWindow(int type,KviMainWindow * lpFrm,const QString &name,KviConsole * lpConsole)
+KviWindow::KviWindow(int type,KviMainWindow * lpFrm,const QString &name,KviConsoleWindow * lpConsole)
 		: QWidget(0)
 {
 	m_uId = g_uUniqueWindowId;
@@ -1387,7 +1387,7 @@ KviIrcContext * KviWindow::context()
 	{
 		if(console() == this)
 		{
-			return ((KviConsole*)this)->context();
+			return ((KviConsoleWindow*)this)->context();
 		} else {
 			return console()->context();
 		}
diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h
index 9c741c39e..e583399a8 100644
--- a/src/kvirc/ui/KviWindow.h
+++ b/src/kvirc/ui/KviWindow.h
@@ -60,7 +60,7 @@ class KviMainWindow;
 class KviWindowListItem;
 class KviConfigurationFile;
 class KviIrcView;
-class KviConsole;
+class KviConsoleWindow;
 class KviIrcConnection;
 class KviWindowToolPageButton;
 class KviTalPopupMenu;
@@ -141,12 +141,12 @@ class KVIRC_API KviWindow : public QWidget
 	Q_PROPERTY(int KviProperty_ChildFocusOwner READ type)
 	Q_OBJECT
 public:
-	KviWindow(int type,KviMainWindow * lpFrm,const QString &name,KviConsole * pConsole = 0);
+	KviWindow(int type,KviMainWindow * lpFrm,const QString &name,KviConsoleWindow * pConsole = 0);
 	virtual ~KviWindow();
 protected: // almost private: don't touch :D
 	QString                               m_szName;                  // the current window name (usually also the target)
 	KviMainWindow                            * m_pFrm;
-	KviConsole                          * m_pConsole;
+	KviConsoleWindow                          * m_pConsole;
 
 	int                                   m_iType;
 
@@ -202,7 +202,7 @@ public:
 	// The mdiParent widget: may be nulll if the window is undocked
 	inline KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); };
 	// The console that this window belongs to: may be null for windows that aren't bound to irc contexts
-	inline KviConsole * console(){ return m_pConsole; };
+	inline KviConsoleWindow * console(){ return m_pConsole; };
 	KviIrcContext * context();
 	// the current IRC connection (if any)
 	KviIrcConnection * connection();
diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp
index 92486c9d8..aa096504b 100644
--- a/src/kvirc/ui/KviWindowListBase.cpp
+++ b/src/kvirc/ui/KviWindowListBase.cpp
@@ -92,7 +92,7 @@ void KviWindowListBase::updateActivityMeter()
 
 }
 
-void KviWindowListBase::getTextForConsole(QString &szText,KviConsole * pConsole)
+void KviWindowListBase::getTextForConsole(QString &szText,KviConsoleWindow * pConsole)
 {
 	if(pConsole->isConnected())
 	{
@@ -130,7 +130,7 @@ void KviWindowListBase::switchWindow(bool bNext,bool bInContextOnly,bool bHighli
 {
 	if(!g_pActiveWindow)return;
 
-	KviConsole * cons = g_pActiveWindow->console();
+	KviConsoleWindow * cons = g_pActiveWindow->console();
 	KviWindowListItem * cur = g_pActiveWindow->windowListItem();
 	KviWindowListItem * it = cur;
 
@@ -390,7 +390,7 @@ void KviWindowListButton::drawButtonLabel(QPainter * pPainter)
 			QFont f = QFont(KVI_OPTION_FONT(KviOption_fontWindowList));
 			f.setBold(true);
 			pPainter->setFont(f);
-			KviWindowListBase::getTextForConsole(szText,(KviConsole *)m_pWindow);
+			KviWindowListBase::getTextForConsole(szText,(KviConsoleWindow *)m_pWindow);
 		}
 		break;
 		case KVI_WINDOW_TYPE_CHANNEL:
diff --git a/src/kvirc/ui/KviWindowListBase.h b/src/kvirc/ui/KviWindowListBase.h
index 793a4e787..a4fbad208 100644
--- a/src/kvirc/ui/KviWindowListBase.h
+++ b/src/kvirc/ui/KviWindowListBase.h
@@ -37,7 +37,7 @@ class QPixmap;
 class KviWindow;
 class KviMainWindow;
 class KviDynamicToolTip;
-class KviConsole;
+class KviConsoleWindow;
 
 //
 // KviWindowListItem
@@ -107,7 +107,7 @@ public:
 	virtual void updatePseudoTransparency(){};
 	virtual void applyOptions();
 	virtual void wheelEvent(QWheelEvent *e);
-	static void getTextForConsole(QString &szText,KviConsole * pConsole);
+	static void getTextForConsole(QString &szText,KviConsoleWindow * pConsole);
 	Qt::DockWidgetArea currentDockArea() { return currentArea; };
 protected slots:
 	virtual void updateActivityMeter();
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;