killed some defines;

more work on KDE notifier;
improved hungarian notation;


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

31 files changed, 56 insertions, 55 deletions

diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 4c1549174..9621b834f 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -861,7 +861,7 @@ void ActionEditor::commit()
 
 
 ActionEditorWindow::ActionEditorWindow(KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"actioneditor",0)
+: KviWindow(KviWindow::ScriptEditor,lpFrm,"actioneditor",0)
 {
 	g_pActionEditorWindow = this;
 	setFixedCaption(__tr2qs_ctx("Action Editor","editor"));
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index a200f2f59..a3924d71d 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -1174,7 +1174,7 @@ void AliasEditorWidget::commit()
 
 
 AliasEditorWindow::AliasEditorWindow(KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"aliaseditor",0)
+: KviWindow(KviWindow::ScriptEditor,lpFrm,"aliaseditor",0)
 {
 	g_pAliasEditorWindow = this;
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 59187f8a7..50ac8a84e 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -40,8 +40,8 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS
 {
 	if(szChan.isEmpty())
 	{
-		if(c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)return (KviChannelWindow *)(c->window());
-		if(c->window()->type() == KVI_WINDOW_TYPE_DEADCHANNEL)return (KviChannelWindow *)(c->window());
+		if(c->window()->type() == KviWindow::Channel)return (KviChannelWindow *)(c->window());
+		if(c->window()->type() == KviWindow::DeadChannel)return (KviChannelWindow *)(c->window());
 		if(!bNoWarnings) c->warning(__tr2qs("The current window is not a channel"));
 	} else {
 		KviWindow * w = g_pApp->findWindow(szChan);
@@ -50,7 +50,7 @@ static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QS
 			if(!bNoWarnings) c->warning(__tr2qs("Can't find the window with id '%Q'"),&szChan);
 			return 0;
 		}
-		if(w->type() == KVI_WINDOW_TYPE_CHANNEL)return (KviChannelWindow *)w;
+		if(w->type() == KviWindow::Channel)return (KviChannelWindow *)w;
 		if(!bNoWarnings) c->warning(__tr2qs("The specified window (%Q) is not a channel"),&szChan);
 	}
 	return 0;
@@ -151,7 +151,7 @@ static bool chan_kvs_fnc_isdead(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
 	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
-	if (ch) c->returnValue()->setBoolean((ch->type() == KVI_WINDOW_TYPE_DEADCHANNEL));
+	if (ch) c->returnValue()->setBoolean((ch->type() == KviWindow::DeadChannel));
 	return true;
 }
 
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index 573f4889c..a3f6ee7cc 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -1816,7 +1816,7 @@ void ClassEditorWidget::searchInheritedClasses(const QString szClass, KviPointer
 }
 
 ClassEditorWindow::ClassEditorWindow(KviMainWindow * pFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,pFrm,"classeditor",0)
+: KviWindow(KviWindow::ScriptEditor,pFrm,"classeditor",0)
 {
 	g_pClassEditorWindow = this;
 
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index 13bcfc60b..9bd25da69 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -82,7 +82,7 @@ void CodeTesterWidget::execute()
 }
 
 CodeTesterWindow::CodeTesterWindow(KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"codetester",0)
+: KviWindow(KviWindow::ScriptEditor,lpFrm,"codetester",0)
 {
 	g_pCodeTesterWindowList->append(this);
 
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index 3b68b7660..9fd5dbf42 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -476,7 +476,7 @@ static bool context_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	int idx = 0;
 	for(KviWindow * pWnd = pWinList->first();pWnd;pWnd = pWinList->next())
 	{
-		if(pWnd->type() == KVI_WINDOW_TYPE_CONSOLE)
+		if(pWnd->type() == KviWindow::Console)
 		{
 			pArray->set(idx,new KviKvsVariant((kvs_int_t)((KviConsoleWindow *)pWnd)->context()->id()));
 			idx++;
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index 9d3641183..0d0fea505 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -82,7 +82,7 @@ extern DccBroker * g_pDccBroker;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 DccChatWindow::DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-: DccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc)
+: DccWindow(KviWindow::DccChat,pFrm,name,dcc)
 {
 	m_pButtonBox = new KviTalHBox(this);
 
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 4c1149e3e..a20d0489c 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -416,7 +416,7 @@ exit_dcc:
 }
 
 DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-: DccWindow(KVI_WINDOW_TYPE_DCCVIDEO,pFrm,name,dcc)
+: DccWindow(KviWindow::DccVideo,pFrm,name,dcc)
 {
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index d67cc9db2..24ddcbd73 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -638,7 +638,7 @@ exit_dcc:
 
 
 DccVoiceWindow::DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
-: DccWindow(KVI_WINDOW_TYPE_DCCVOICE,pFrm,name,dcc)
+: DccWindow(KviWindow::DccVoice,pFrm,name,dcc)
 {
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
diff --git a/src/modules/dcc/DccWindow.cpp b/src/modules/dcc/DccWindow.cpp
index e6da3fa12..4989fa5c2 100644
--- a/src/modules/dcc/DccWindow.cpp
+++ b/src/modules/dcc/DccWindow.cpp
@@ -26,8 +26,8 @@
 
 #include "KviTalHBox.h"
 
-DccWindow::DccWindow(int type,KviMainWindow * lpFrm,const char * name,DccDescriptor * d)
-: KviWindow(type,lpFrm,name, d->console())
+DccWindow::DccWindow(KviWindow::Type eType,KviMainWindow * lpFrm,const char * name,DccDescriptor * d)
+: KviWindow(eType,lpFrm,name, d->console())
 {
 	m_pDescriptor = d;
 	m_pDescriptor->setWindow(this);
diff --git a/src/modules/dcc/DccWindow.h b/src/modules/dcc/DccWindow.h
index 544b17e10..40c479cbf 100644
--- a/src/modules/dcc/DccWindow.h
+++ b/src/modules/dcc/DccWindow.h
@@ -28,13 +28,14 @@
 #include "DccMarshal.h"
 
 #include "KviWindow.h"
+
 class DccThread;
 
 class DccWindow : public KviWindow, public DccMarshalOutputContext
 {
 	Q_OBJECT
 public:
-	DccWindow(int type,KviMainWindow * lpFrm,const char * name,DccDescriptor * d);
+	DccWindow(KviWindow::Type eType,KviMainWindow * lpFrm,const char * name,DccDescriptor * d);
 	~DccWindow();
 protected:
 	DccDescriptor       * m_pDescriptor;
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index d01febc7f..a7354c7e4 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -514,7 +514,7 @@ void EventEditor::exportAllEvents()
 
 
 EventEditorWindow::EventEditorWindow(KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"eventeditor",0)
+: KviWindow(KviWindow::ScriptEditor,lpFrm,"eventeditor",0)
 {
 	g_pEventEditorWindow = this;
 
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 18575bd21..60dd9af8e 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -238,7 +238,7 @@ QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QMo
 }
 
 FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"file transfer window",0), KviModuleExtension(d)
+: KviWindow(KviWindow::Tool,lpFrm,"file transfer window",0), KviModuleExtension(d)
 {
 	g_pFileTransferWindow = this;
 	setAutoFillBackground(false);
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index e104b5e95..8adc29c70 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -48,7 +48,7 @@ extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
 bool g_bIndexingDone = FALSE;
 HelpWindow::HelpWindow(KviMainWindow * lpFrm,const char * name)
-: KviWindow(KVI_WINDOW_TYPE_HELP,lpFrm,name)
+: KviWindow(KviWindow::Help,lpFrm,name)
 {
 	g_pHelpWindowList->append(this);
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index af49c3e62..e679edf2b 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -43,7 +43,7 @@
 KviIOGraphWindow* g_pIOGraphWindow = 0;
 
 KviIOGraphWindow::KviIOGraphWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm,const char * name)
-: KviWindow(KVI_WINDOW_TYPE_IOGRAPH,lpFrm,name), KviModuleExtension(d)
+: KviWindow(KviWindow::IOGraph,lpFrm,name), KviModuleExtension(d)
 {
 	m_pIOGraph = new KviIOGraphWidget(this);
 	setAutoFillBackground(false);
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index e9a340ec0..eb92bc761 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -46,7 +46,7 @@
 extern KviPointerList<LinksWindow> * g_pLinksWindowList;
 
 LinksWindow::LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
-: KviWindow(KVI_WINDOW_TYPE_LINKS,lpFrm,"links",lpConsole), KviExternalServerDataParser()
+: KviWindow(KviWindow::Links,lpFrm,"links",lpConsole), KviExternalServerDataParser()
 {
 	g_pLinksWindowList->append(this);
 
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 3f61f73ac..c45601b51 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -158,7 +158,7 @@ void ChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewIt
 }
 
 ListWindow::ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole)
-: KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole), KviExternalServerDataParser()
+: KviWindow(KviWindow::List,lpFrm,"list",lpConsole), KviExternalServerDataParser()
 {
 	g_pListWindowList->append(this);
 
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 62b25f3a1..8f98a90ba 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -66,7 +66,7 @@
 extern LogViewWindow * g_pLogViewWindow;
 
 LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)
+: KviWindow(KviWindow::LogView,lpFrm,"logview"), KviModuleExtension(d)
 {
 	g_pLogViewWindow = this;
 //	m_pLogViewWidget = new KviLogViewWidget(this);
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 8e797f0eb..9037a5404 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,7 +34,7 @@
 
 
 KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTOBJECT,pParent,szName)
+: KviWindow(KviWindow::ScriptObject,pParent,szName)
 {
 	m_pCentralWidget = 0;
 
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index a45f828a7..538813fb2 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1369,7 +1369,7 @@ void PopupEditorWidget::getUniquePopupName(MenuTreeWidgetItem *item,QString &buf
 
 
 PopupEditorWindow::PopupEditorWindow(KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"popupeditor",0)
+: KviWindow(KviWindow::ScriptEditor,lpFrm,"popupeditor",0)
 {
 	g_pPopupEditorWindow = this;
 
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 0f1ba2b37..277c69715 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -466,7 +466,7 @@ void RawEditorWidget::exportAllEvents()
 
 
 RawEditorWindow::RawEditorWindow(KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"raweditor",0)
+: KviWindow(KviWindow::ScriptEditor,lpFrm,"raweditor",0)
 {
 	g_pRawEditorWindow = this;
 
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index d404eb7fa..5725475bb 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -208,7 +208,7 @@ SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem()
 
 
 SharedFilesWindow::SharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0), KviModuleExtension(d)
+: KviWindow(KviWindow::Tool,lpFrm,"shared files window",0), KviModuleExtension(d)
 {
 	g_pSharedFilesWindow = this;
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
diff --git a/src/modules/socketspy/SocketSpyWindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp
index 056de8a83..1c62d949c 100644
--- a/src/modules/socketspy/SocketSpyWindow.cpp
+++ b/src/modules/socketspy/SocketSpyWindow.cpp
@@ -35,7 +35,7 @@
 extern KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList;
 
 SocketSpyWindow::SocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
-: KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole), KviIrcDataStreamMonitor(lpConsole->context())
+: KviWindow(KviWindow::SocketSpy,lpFrm,"socket_spy",lpConsole), KviIrcDataStreamMonitor(lpConsole->context())
 {
 	g_pSocketSpyWindowList->append(this);
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index cf7fda625..2109d48c4 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -64,7 +64,7 @@ static KviWindow * spaste_kvs_find_window(QString &win, KviKvsModuleCommandCall
 		c->warning(__tr("Window with ID '%Q' not found"),&win);
 		return 0;
 	}
-	if((w->type() == KVI_WINDOW_TYPE_CHANNEL) || (w->type() == KVI_WINDOW_TYPE_QUERY) || (w->type() == KVI_WINDOW_TYPE_DCCCHAT))return w;
+	if((w->type() == KviWindow::Channel) || (w->type() == KviWindow::Query) || (w->type() == KviWindow::DccChat))return w;
 	c->warning(__tr2qs("The specified window (%Q) is not a channel/query/DCC chat"),&win);
 	return 0;
 }
@@ -213,7 +213,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 
 	if(!iId) //Delete all spaste's from the current window
 	{
-		if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
+		if((c->window()->type() != KviWindow::Channel) && (c->window()->type() != KviWindow::Query) && (c->window()->type() != KviWindow::DccChat))
 		{
 			QString szWinId = c->window()->id();
 			c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
diff --git a/src/modules/term/TermWindow.cpp b/src/modules/term/TermWindow.cpp
index e5014a09e..590f06cec 100644
--- a/src/modules/term/TermWindow.cpp
+++ b/src/modules/term/TermWindow.cpp
@@ -37,7 +37,7 @@
 	extern KviIconManager * g_pIconManager;
 
 	TermWindow::TermWindow(KviMainWindow * lpFrm,const char * name)
-	: KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
+	: KviWindow(KviWindow::Terminal,lpFrm,name)
 	{
 		g_pTermWindowList->append(this);
 		m_pTermWidget = 0;
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index ffa6d8e12..dfaf2206b 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -57,7 +57,7 @@ static bool tmphighlight_kvs_cmd_addnick(KviKvsModuleCommandCall * c)
 	if( !c->window()->console() )return c->context()->errorNoIrcContext();
 	if( c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
 
-	if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(c->window()->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -95,7 +95,7 @@ static bool tmphighlight_kvs_cmd_removenick(KviKvsModuleCommandCall * c)
 	if( !c->window()->console() )return c->context()->errorNoIrcContext();
 	if( c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
 
-	if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(c->window()->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -148,7 +148,7 @@ static bool tmphighlight_kvs_cmd_addchannel(KviKvsModuleCommandCall * c)
 	if( !pWnd->console() )return c->context()->errorNoIrcContext();
 	if( pWnd->console()->isNotConnected() )return c->context()->errorNoIrcContext();
 
-	if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(pWnd->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -200,7 +200,7 @@ static bool tmphighlight_kvs_cmd_removechannel(KviKvsModuleCommandCall * c)
 	if( !pWnd->console() )return c->context()->errorNoIrcContext();
 	if( pWnd->console()->isNotConnected() )return c->context()->errorNoIrcContext();
 
-	if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(pWnd->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -238,7 +238,7 @@ static bool tmphighlight_kvs_fnc_isnickhighlighted(KviKvsModuleFunctionCall * c)
 	if( !c->window()->console() )return c->context()->errorNoIrcContext();
 	if( c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
 
-	if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(c->window()->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -288,7 +288,7 @@ static bool tmphighlight_kvs_fnc_ischannelhighlighted(KviKvsModuleFunctionCall *
 	if( !pWnd->console() )return c->context()->errorNoIrcContext();
 	if( pWnd->console()->isNotConnected() )return c->context()->errorNoIrcContext();
 
-	if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(pWnd->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index facd669bf..d370801a2 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -249,7 +249,7 @@ void TrayIcon::doAway(bool)
 		KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 		while(KviWindow * wnd = it.current())
 		{
-			if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
+			if(wnd->type()==KviWindow::Console)
 			{
 				KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 				if(pConsole->isConnected())
@@ -307,7 +307,7 @@ void TrayIcon::fillContextPopup()
 		int iNetCount=0;
 		while(KviWindow * wnd = it.current())
 		{
-			if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
+			if(wnd->type()==KviWindow::Console)
 			{
 				KviConsoleWindow* pConsole=(KviConsoleWindow*)wnd;
 				if(pConsole->isConnected())
@@ -476,13 +476,13 @@ void TrayIcon::grabActivityInfo()
 			unsigned int iLevel = b->highlightLevel();
 			switch(b->kviWindow()->type())
 			{
-				case KVI_WINDOW_TYPE_CONSOLE:
+				case KviWindow::Console:
 					if(m_iConsoles < iLevel) m_iConsoles = iLevel;
 				break;
-				case KVI_WINDOW_TYPE_CHANNEL:
+				case KviWindow::Channel:
 					if(m_iChannels < iLevel) m_iChannels = iLevel;
 				break;
-				case KVI_WINDOW_TYPE_QUERY:
+				case KviWindow::Query:
 					if(m_iQueries < iLevel) m_iQueries = iLevel;
 				break;
 				default:
@@ -503,13 +503,13 @@ void TrayIcon::grabActivityInfo()
 				if(iLevel>0)
 				switch(b->kviWindow()->type())
 				{
-					case KVI_WINDOW_TYPE_CONSOLE:
+					case KviWindow::Console:
 						if(m_iConsoles < iLevel) m_iConsoles = iLevel;
 					break;
-					case KVI_WINDOW_TYPE_CHANNEL:
+					case KviWindow::Channel:
 						if(m_iChannels < iLevel) m_iChannels = iLevel;
 					break;
-					case KVI_WINDOW_TYPE_QUERY:
+					case KviWindow::Query:
 						if(m_iQueries < iLevel) m_iQueries = iLevel;
 					break;
 					default:
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 7266b237a..921e5e12e 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -160,7 +160,7 @@ KviUrlAction::~KviUrlAction()
 // ---------------------------- CLASS URLDIALOG ------------------------begin //
 
 UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
-	:KviWindow(KVI_WINDOW_TYPE_TOOL,g_pMainWindow,"URL List")
+	:KviWindow(KviWindow::Tool,g_pMainWindow,"URL List")
 {
 	setAutoFillBackground(false);
 	
@@ -325,9 +325,9 @@ void UrlDialog::popup(QTreeWidgetItem *item, const QPoint &point)
 
 	for(KviWindow *w=g_pMainWindow->windowList()->first();w;w=g_pMainWindow->windowList()->next())
 	{
-		if ((w->type() == KVI_WINDOW_TYPE_CHANNEL) ||
-			(w->type() == KVI_WINDOW_TYPE_QUERY) ||
-			 (w->type() == KVI_WINDOW_TYPE_DCCCHAT))
+		if ((w->type() == KviWindow::Channel) ||
+			(w->type() == KviWindow::Query) ||
+			 (w->type() == KviWindow::DccChat))
 		{
 			m_pListPopup->addAction(w->plainTextCaption());
 		}
diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp
index cdef3ac84..34bc69672 100644
--- a/src/modules/userlist/libkviuserlist.cpp
+++ b/src/modules/userlist/libkviuserlist.cpp
@@ -103,7 +103,7 @@ static bool userlist_kvs_fnc_selected(KviKvsModuleFunctionCall * c)
 {
 	GET_KVS_FNC_WINDOW_ID
 
-	if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(pWnd->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs_ctx("The specified window is not a channel","kvs"));
 		c->returnValue()->setNothing();
@@ -127,7 +127,7 @@ static bool userlist_kvs_cmd_select(KviKvsModuleCommandCall * c)
 {
 	GET_KVS_WINDOW_ID_AND_NICK
 	
-	if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(pWnd->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs_ctx("The specified window is not a channel","kvs"));
 		return true;
@@ -141,7 +141,7 @@ static bool userlist_kvs_cmd_ensureVisible(KviKvsModuleCommandCall * c)
 {
 	GET_KVS_WINDOW_ID_AND_NICK
 	
-	if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
+	if(pWnd->type() != KviWindow::Channel)
 	{
 		c->warning(__tr2qs_ctx("The specified window is not a channel","kvs"));
 		return true;
diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp
index 72aef3925..ed1e0868d 100644
--- a/src/modules/window/UserWindow.cpp
+++ b/src/modules/window/UserWindow.cpp
@@ -32,7 +32,7 @@ extern KviPointerList<UserWindow> * g_pUserWindowList;
 
 
 UserWindow::UserWindow(KviMainWindow * pFrm, const char * pcName, int iIcon, KviConsoleWindow * pConsole, int iCreationFlags)
-: KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,pcName,pConsole)
+: KviWindow(KviWindow::UserWindow,pFrm,pcName,pConsole)
 {
 	g_pUserWindowList->append(this);
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index dfc105720..35bb2ba47 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -123,7 +123,7 @@ static bool window_kvs_cmd_clearOutput(KviKvsModuleCommandCall * c)
 	if(pWnd)
 	{
 		if(pWnd->view())pWnd->view()->clearBuffer();
-		if(pWnd->type() == KVI_WINDOW_TYPE_CHANNEL)
+		if(pWnd->type() == KviWindow::Channel)
 		{
 			KviChannelWindow *chan = (KviChannelWindow *)pWnd;
 			if(chan->messageView()) chan->messageView()->clearBuffer();
@@ -924,7 +924,7 @@ static bool window_kvs_cmd_listtypes(KviKvsModuleCommandCall * c)
 			[comment]# List all the windows in all irc contexts[/comment]
 			[cmd]echo[/cmd] $window.list(all,all)
 			[comment]# List all the DCC Send windows: They don't belong to any irc context[/comment]
-			[cmd]echo[/cmd] $window.list(dccsend,none)
+			[cmd]echo[/cmd] $window.list(dcctransfer,none)
 			[comment]# List all the user windows created with $window.open[/comment]
 			[comment]# They may either belong to an irc context or not[/comment]
 			[cmd]echo[/cmd] $window.list(userwnd,any)
@@ -1220,7 +1220,7 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if(pWnd->type() == KVI_WINDOW_TYPE_USERWINDOW)
+	if(pWnd->type() == KviWindow::UserWindow)
 	{
 		((UserWindow *)pWnd)->setWindowTitleStrings(szPlain);
 	} else {