renamed a global pointer;

more work on KDE notifier;


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

27 files changed, 76 insertions, 76 deletions

diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index aab1f7835..b4c058318 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -71,8 +71,8 @@ static bool actioneditor_module_can_unload(KviModule *)
 
 static bool actioneditor_module_cleanup(KviModule *)
 {
-	if(g_pActionEditorWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pActionEditorWindow);
+	if(g_pActionEditorWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pActionEditorWindow);
 	g_pActionEditorWindow = 0;
 	return true;
 }
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index aa7adfb3c..460463cff 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -350,9 +350,9 @@ void AddonManagementDialog::display(bool bTopLevel)
 				m_pInstance->setParent(0);
 			}
 		} else {
-			if(m_pInstance->parent() != g_pFrame->splitter())
+			if(m_pInstance->parent() != g_pMainWindow->splitter())
 			{
-				m_pInstance->setParent(g_pFrame->splitter());
+				m_pInstance->setParent(g_pMainWindow->splitter());
 			}
 		}
 	} else {
@@ -360,7 +360,7 @@ void AddonManagementDialog::display(bool bTopLevel)
 		{
 			m_pInstance = new AddonManagementDialog(0);
 		} else {
-			m_pInstance = new AddonManagementDialog(g_pFrame->splitter());
+			m_pInstance = new AddonManagementDialog(g_pMainWindow->splitter());
 		}
 	}
 	m_pInstance->show();
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index ffa63d704..2819371df 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -75,8 +75,8 @@ static bool aliaseditor_module_can_unload(KviModule * )
 
 static bool aliaseditor_module_cleanup(KviModule *)
 {
-	if(g_pAliasEditorWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pAliasEditorWindow);
+	if(g_pAliasEditorWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pAliasEditorWindow);
 	g_pAliasEditorWindow = 0;
 	return true;
 }
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index ddcad53bc..f6a2bc75c 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -202,7 +202,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 
 	if(szAvatar.isEmpty())
 	{
-		KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pFrame,QString(),c->window()->connection());
+		KviAsyncAvatarSelectionDialog * d = new KviAsyncAvatarSelectionDialog(g_pMainWindow,QString(),c->window()->connection());
 		d->show();
 		return true;
 	}
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index a45256029..9090f67b8 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -74,8 +74,8 @@ static bool classeditor_module_can_unload(KviModule *)
 
 static bool classeditor_module_cleanup(KviModule *)
 {
-	if(g_pClassEditorWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pClassEditorWindow);
+	if(g_pClassEditorWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pClassEditorWindow);
 	g_pClassEditorWindow = 0;
 	return true;
 }
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index 75f4fee08..3b68b7660 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -472,7 +472,7 @@ static bool context_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 {
 	KviKvsArray * pArray = new KviKvsArray();
 
-	KviPointerList<KviWindow> * pWinList = g_pFrame->windowList();
+	KviPointerList<KviWindow> * pWinList = g_pMainWindow->windowList();
 	int idx = 0;
 	for(KviWindow * pWnd = pWinList->first();pWnd;pWnd = pWinList->next())
 	{
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 8e9e1b0a3..920756e21 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1228,7 +1228,7 @@ void DccFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 void DccFileTransfer::configureBandwidth()
 {
 	if(m_pBandwidthDialog)return;
-	m_pBandwidthDialog = new DccFileTransferBandwidthDialog(g_pFrame,this);
+	m_pBandwidthDialog = new DccFileTransferBandwidthDialog(g_pMainWindow,this);
 	connect(m_pBandwidthDialog,SIGNAL(destroyed()),this,SLOT(bandwidthDialogDestroyed()));
 	m_pBandwidthDialog->setModal(true);
 	m_pBandwidthDialog->show();
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 6ed7b541a..ff2366ef9 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -46,7 +46,7 @@ static bool editor_module_cleanup(KviModule *)
 {
 	/*
 	 * This causes 2 crashes: one in KviApplication destructor (closing windows needs
-	 * g_pFrame, that is deleted before this unloading routine) and the second in
+	 * g_pMainWindow, that is deleted before this unloading routine) and the second in
 	 * the codetester window (it deletes us in its denstructor, and we tries to back-delete it)
 	 * So it's commented out by now..
 	 */
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index 5f69b618f..cbde52a4c 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -73,8 +73,8 @@ static bool eventeditor_module_can_unload(KviModule *)
 
 static bool eventeditor_module_cleanup(KviModule *)
 {
-	if(g_pEventEditorWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pEventEditorWindow);
+	if(g_pEventEditorWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pEventEditorWindow);
 	g_pEventEditorWindow = 0;
 	return true;
 }
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index b73fef112..18575bd21 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -193,7 +193,7 @@ void FileTransferWidget::paintEvent(QPaintEvent * event)
 		p->restore();
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = g_pFileTransferWindow->mdiParent() ? viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(g_pFileTransferWindow, rect.topLeft());
+		QPoint pnt = g_pFileTransferWindow->mdiParent() ? viewport()->mapTo(g_pMainWindow, rect.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(g_pFileTransferWindow, rect.topLeft());
 		p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt);
 	} else {
 #endif
@@ -561,7 +561,7 @@ void FileTransferWindow::openFilePopupActivated(int id)
 			KUrl url;
 			url.setPath(tmp);
 			lst.append(url);
-			KRun::run(*((*itOffers).data()),lst,g_pFrame);
+			KRun::run(*((*itOffers).data()),lst,g_pMainWindow);
 			break;
 		}
 		idx++;
@@ -599,7 +599,7 @@ void FileTransferWindow::openLocalFileTerminal()
 		tmp.prepend("konsole --workdir=\"");
 		tmp.append("\"");
 
-		KRun::runCommand(tmp,g_pFrame);
+		KRun::runCommand(tmp,g_pMainWindow);
 	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
@@ -656,7 +656,7 @@ void FileTransferWindow::openLocalFile()
 		url.setPath(tmp);
 		lst.append(url);
 
-		KRun::run(*offer, lst, g_pFrame);
+		KRun::run(*offer, lst, g_pMainWindow);
 	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
@@ -684,7 +684,7 @@ void FileTransferWindow::openLocalFileWith()
 		KUrl url;
 		url.setPath(tmp);
 		lst.append(url);
-		KRun::displayOpenWithDialog(lst,g_pFrame);
+		KRun::displayOpenWithDialog(lst,g_pMainWindow);
 	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
@@ -730,7 +730,7 @@ void FileTransferWindow::openLocalFileFolder()
 		KUrl url;
 		url.setPath(tmp);
 		lst.append(url);
-		KRun::run(*offer,lst,g_pFrame);
+		KRun::run(*offer,lst,g_pMainWindow);
 	#endif //COMPILE_KDE_SUPPORT
 #endif
 }
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 680960929..fde213de0 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -55,8 +55,8 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 			}
 		}
 
-		g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pFrame);
-		g_pFrame->addWindow(g_pFileTransferWindow,!bCreateMinimized);
+		g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pMainWindow);
+		g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pFileTransferWindow->minimize();
 		return g_pFileTransferWindow;
 	}
@@ -133,8 +133,8 @@ static bool filetransferwindow_module_init(KviModule * m)
 
 static bool filetransferwindow_module_cleanup(KviModule *)
 {
-	if(g_pFileTransferWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pFileTransferWindow);
+	if(g_pFileTransferWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pFileTransferWindow);
 	g_pFileTransferWindow = 0;
 	return true;
 }
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 85d485128..af49c3e62 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -108,7 +108,7 @@ void KviIOGraphWindow::paintEvent(QPaintEvent * e)
 		p.restore();
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = mdiParent() ? mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : rect.topLeft();
+		QPoint pnt = mdiParent() ? mapTo(g_pMainWindow, rect.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : rect.topLeft();
 		p.drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt);
 	} else {
 #endif
@@ -300,8 +300,8 @@ static KviModuleExtension * iograph_extension_alloc(KviModuleExtensionAllocStruc
 			}
 		}
 
-		g_pIOGraphWindow = new KviIOGraphWindow(s->pDescriptor,g_pFrame,"IOGraph Window");
-		g_pFrame->addWindow(g_pIOGraphWindow,!bCreateMinimized);
+		g_pIOGraphWindow = new KviIOGraphWindow(s->pDescriptor,g_pMainWindow,"IOGraph Window");
+		g_pMainWindow->addWindow(g_pIOGraphWindow,!bCreateMinimized);
 
 		if(bCreateMinimized)g_pIOGraphWindow->minimize();
 		return g_pIOGraphWindow;
@@ -342,8 +342,8 @@ static bool iograph_module_init(KviModule *m)
 
 static bool iograph_module_cleanup(KviModule *)
 {
-	if(g_pIOGraphWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pIOGraphWindow);
+	if(g_pIOGraphWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pIOGraphWindow);
 	g_pIOGraphWindow = 0;
 	return true;
 }
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 720abb57c..62b25f3a1 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -159,7 +159,7 @@ LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lp
 	w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
 	layout->addWidget(w,11,1);
 
-	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
+	m_pIrcView = new KviIrcView(m_pSplitter,g_pMainWindow,this);
 	m_pIrcView->setMaxBufferSize(INT_MAX);
 	m_pIrcView->setFocusPolicy(Qt::ClickFocus);
 
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index 7d0af7c04..66e63cefa 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -100,8 +100,8 @@ static KviModuleExtension * logview_extension_alloc(KviModuleExtensionAllocStruc
 			}
 		}
 
-		g_pLogViewWindow = new LogViewWindow(s->pDescriptor,g_pFrame);
-		g_pFrame->addWindow(g_pLogViewWindow,!bCreateMinimized);
+		g_pLogViewWindow = new LogViewWindow(s->pDescriptor,g_pMainWindow);
+		g_pMainWindow->addWindow(g_pLogViewWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pLogViewWindow->minimize();
 		return g_pLogViewWindow;
 	}
@@ -142,8 +142,8 @@ static bool logview_module_init(KviModule * m)
 
 static bool logview_module_cleanup(KviModule *)
 {
-	if(g_pLogViewWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pLogViewWindow);
+	if(g_pLogViewWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pLogViewWindow);
 	g_pLogViewWindow = 0;
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp
index 85835cac0..f3feb53ff 100644
--- a/src/modules/objects/KvsObject_dialog.cpp
+++ b/src/modules/objects/KvsObject_dialog.cpp
@@ -70,7 +70,7 @@ KVSO_END_CONSTRUCTOR(KvsObject_dialog)
 bool KvsObject_dialog::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	QWidget * w = g_pApp->activeModalWidget();
-	if(!w)w = g_pFrame;
+	if(!w)w = g_pMainWindow;
 	QDialog * d = new QDialog(parentScriptWidget() ? parentScriptWidget() : w);
 	d->setObjectName(getName());
 	//d->setModal(true);
diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index 8a9eb15a7..38a3246e0 100644
--- a/src/modules/objects/KvsObject_dockWindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -77,7 +77,7 @@ KVSO_END_DESTRUCTOR(KvsObject_dockWindow)
 
 bool KvsObject_dockWindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
-	QDockWidget * pWidget = new QDockWidget(g_pFrame);
+	QDockWidget * pWidget = new QDockWidget(g_pMainWindow);
 	pWidget->setObjectName(getName());
 	setObject(pWidget);
 	return true;
@@ -163,12 +163,12 @@ KVSO_CLASS_FUNCTION(dockWindow,dock)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("dock",KVS_PT_STRING,0,szDock)
 	KVSO_PARAMETERS_END(c)
-	g_pFrame->removeDockWidget(_pDockWindow);
+	g_pMainWindow->removeDockWidget(_pDockWindow);
 	if(szDock.indexOf('m',Qt::CaseInsensitive) == -1)_pDockWindow->setFloating(false);
-	if(szDock.indexOf('t',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow);
-	else if(szDock.indexOf('l',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::LeftDockWidgetArea,_pDockWindow);
-	else if(szDock.indexOf('r',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::RightDockWidgetArea,_pDockWindow);
-	else if(szDock.indexOf('b',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow);
+	if(szDock.indexOf('t',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('l',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::LeftDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('r',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::RightDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('b',Qt::CaseInsensitive) != -1)g_pMainWindow->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow);
 	else if(szDock.indexOf('f',Qt::CaseInsensitive) != -1)_pDockWindow->setFloating(true);
 	else if(szDock.indexOf('m',Qt::CaseInsensitive) != -1)qDebug("Sorry: no support for minimized dock widgets in Qt4");
 	else c->warning(__tr2qs_ctx("Invalid dock area specified","objects"));
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index c0598b7ae..83eeef790 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -1995,15 +1995,15 @@ KVSO_CLASS_FUNCTION(widget,insertIntoStatusBar)
 {
 	CHECK_INTERNAL_POINTER(widget())
              qDebug("instertinto");
-        if (g_pFrame->mainStatusBar())
-                g_pFrame->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0);
+        if (g_pMainWindow->mainStatusBar())
+                g_pMainWindow->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0);
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(widget,removeFromStatusBar)
 {
 	CHECK_INTERNAL_POINTER(widget())
-	g_pFrame->statusBar()->removeWidget(widget());
+	g_pMainWindow->statusBar()->removeWidget(widget());
 	return true;
 }
 
@@ -2020,7 +2020,7 @@ KVSO_CLASS_FUNCTION(widget,setWebView)
 	m_pWebview = new QWebView(widget());
 	m_pWebview->load(QUrl(szUrl));
 	m_pWebview->show();
-	//if (widget()) g_pFrame->statusBar()->removeWidget(widget());
+	//if (widget()) g_pMainWindow->statusBar()->removeWidget(widget());
 	return true;
 }
 #endif //COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 49d54f1c6..28435f1ce 100644
--- a/src/modules/options/OptionsWidget_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -79,7 +79,7 @@ void OptionsWidget_tray::setEnabled(bool)
 		else
 			m_pLevelsGroup->setEnabled(false);
 
-		g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW);
+		g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW);
 	} else {
 		m_pCloseInTray->setEnabled(false);
 		m_pEnableFlashing->setEnabled(false);
@@ -91,7 +91,7 @@ void OptionsWidget_tray::setEnabled(bool)
 		m_pLevelBasedNotify->setChecked(false);
 		m_pLevelsGroup->setChecked(false);
 
-		g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_HIDE);
+		g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_HIDE);
 	}
 }
 
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 6db24dc08..e405e44e3 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -72,8 +72,8 @@ static bool popupeditor_module_can_unload(KviModule *)
 
 static bool popupeditor_module_cleanup(KviModule *)
 {
-	if(g_pPopupEditorWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pPopupEditorWindow);
+	if(g_pPopupEditorWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pPopupEditorWindow);
 	g_pPopupEditorWindow = 0;
 	return true;
 }
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 2ebf9ebf1..350c3fbbe 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -71,8 +71,8 @@ static bool raweditor_module_can_unload(KviModule *)
 
 static bool raweditor_module_cleanup(KviModule *)
 {
-	if(g_pRawEditorWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pRawEditorWindow);
+	if(g_pRawEditorWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pRawEditorWindow);
 	g_pRawEditorWindow = 0;
 	return true;
 }
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 7235d5878..4045db69b 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -57,8 +57,8 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension
 			}
 		}
 
-		g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor,g_pFrame);
-		g_pFrame->addWindow(g_pSharedFilesWindow,!bCreateMinimized);
+		g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor,g_pMainWindow);
+		g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pSharedFilesWindow->minimize();
 		return g_pSharedFilesWindow;
 	}
@@ -131,8 +131,8 @@ static bool sharedfileswindow_module_init(KviModule * m)
 
 static bool sharedfileswindow_module_cleanup(KviModule *)
 {
-	if(g_pSharedFilesWindow && g_pFrame)
-		g_pFrame->closeWindow(g_pSharedFilesWindow);
+	if(g_pSharedFilesWindow && g_pMainWindow)
+		g_pMainWindow->closeWindow(g_pSharedFilesWindow);
 	g_pSharedFilesWindow = 0;
 	return true;
 }
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index 681ac076c..89844cc7d 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -380,14 +380,14 @@ namespace ThemeFunctions
 	{
 		if(bMaximizeFrame)
 		{
-			if(g_pFrame->isMaximized())
+			if(g_pMainWindow->isMaximized())
 				bMaximizeFrame = false;
 		}
 
 		if(bMaximizeFrame)
-			g_pFrame->showMaximized();
+			g_pMainWindow->showMaximized();
 
-		QPixmap pix = QPixmap::grabWidget(g_pFrame);
+		QPixmap pix = QPixmap::grabWidget(g_pMainWindow);
 		bool bResult = true;
 
 		if(pix.isNull())
@@ -398,7 +398,7 @@ namespace ThemeFunctions
 		}
 
 		if(bMaximizeFrame)
-			g_pFrame->showNormal();
+			g_pMainWindow->showNormal();
 		return bResult;
 	}
 }
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index a94b1ff04..3366ea871 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -235,9 +235,9 @@ void ThemeManagementDialog::display(bool bTopLevel)
 				m_pInstance->setParent(0);
 			}
 		} else {
-			if(m_pInstance->parent() != g_pFrame->splitter())
+			if(m_pInstance->parent() != g_pMainWindow->splitter())
 			{
-				m_pInstance->setParent(g_pFrame->splitter());
+				m_pInstance->setParent(g_pMainWindow->splitter());
 			}
 		}
 	} else {
@@ -245,7 +245,7 @@ void ThemeManagementDialog::display(bool bTopLevel)
 		{
 			m_pInstance = new ThemeManagementDialog(0);
 		} else {
-			m_pInstance = new ThemeManagementDialog(g_pFrame->splitter());
+			m_pInstance = new ThemeManagementDialog(g_pMainWindow->splitter());
 		}
 	}
 	m_pInstance->show();
@@ -349,8 +349,8 @@ void ThemeManagementDialog::installFromFile()
 
 void ThemeManagementDialog::getMoreThemes()
 {
-	if(!g_pFrame)return;
-	g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_OPENURL_KVIRC_THEMES);
+	if(!g_pMainWindow)return;
+	g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_OPENURL_KVIRC_THEMES);
 }
 
 void ThemeManagementDialog::saveCurrentTheme()
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index e79fc482a..f5e7aed1e 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -537,9 +537,9 @@ void CustomizeToolBarsDialog::display(bool bTopLevel)
 				m_pInstance->setParent(0);
 			}
 		} else {
-			if(m_pInstance->parent() != g_pFrame->splitter())
+			if(m_pInstance->parent() != g_pMainWindow->splitter())
 			{
-				m_pInstance->setParent(g_pFrame->splitter());
+				m_pInstance->setParent(g_pMainWindow->splitter());
 			}
 		}
 	} else {
@@ -547,7 +547,7 @@ void CustomizeToolBarsDialog::display(bool bTopLevel)
 		{
 			m_pInstance = new CustomizeToolBarsDialog(0);
 		} else {
-			m_pInstance = new CustomizeToolBarsDialog(g_pFrame->splitter());
+			m_pInstance = new CustomizeToolBarsDialog(g_pMainWindow->splitter());
 		}
 	}
 	m_pInstance->show();
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 60e71993d..6dfa6c708 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -878,8 +878,8 @@ static bool torrent_module_init(KviModule *m)
 
 	TorrentInterface::select(0);
 
-	if (g_pFrame->mainStatusBar())
-		StatusBarApplet::selfRegister(g_pFrame->mainStatusBar());
+	if (g_pMainWindow->mainStatusBar())
+		StatusBarApplet::selfRegister(g_pMainWindow->mainStatusBar());
 
 
 	if(KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) == "auto")
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index acec41bd7..facd669bf 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -110,7 +110,7 @@ TrayIcon::TrayIcon(KviMainWindow * frm)
 	id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::TrayIcon)),__tr2qs("Un&dock"),this,SLOT(executeInternalCommand(bool)));
 	id->setData(KVI_INTERNALCOMMAND_TRAYICON_HIDE);
 
-	id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pFrame,SLOT(close()),QKeySequence(Qt::CTRL + Qt::Key_Q));
+	id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pMainWindow,SLOT(close()),QKeySequence(Qt::CTRL + Qt::Key_Q));
 
 	connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(fillContextPopup()));
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index d9bb68f6c..7266b237a 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -123,7 +123,7 @@ void UrlDialogTreeWidget::paintEvent(QPaintEvent * event)
 		p->restore();
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = ((KviWindow*)parent())->mdiParent() ? viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo((KviWindow*)parent(), rect.topLeft());
+		QPoint pnt = ((KviWindow*)parent())->mdiParent() ? viewport()->mapTo(g_pMainWindow, rect.topLeft() + g_pMainWindow->mdiManager()->scrollBarsOffset()) : viewport()->mapTo((KviWindow*)parent(), rect.topLeft());
 		p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt);
 	} else {
 #endif
@@ -160,7 +160,7 @@ KviUrlAction::~KviUrlAction()
 // ---------------------------- CLASS URLDIALOG ------------------------begin //
 
 UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
-	:KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List")
+	:KviWindow(KVI_WINDOW_TYPE_TOOL,g_pMainWindow,"URL List")
 {
 	setAutoFillBackground(false);
 	
@@ -323,7 +323,7 @@ void UrlDialog::popup(QTreeWidgetItem *item, const QPoint &point)
 	p.insertSeparator();
 	m_pListPopup = new KviTalPopupMenu(0,"list");
 
-	for(KviWindow *w=g_pFrame->windowList()->first();w;w=g_pFrame->windowList()->next())
+	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) ||
@@ -355,7 +355,7 @@ void UrlDialog::sayToWin(QAction * act)
 		KviQString::escapeKvs(&szWindow);
 		QString say=QString("PRIVMSG %1 %2").arg(szWindow, szUrl);
 		KviKvsScript::run(say,wnd);
-		g_pFrame->setActiveWindow(wnd);
+		g_pMainWindow->setActiveWindow(wnd);
 	} else {
 		QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),__tr2qs("Window not found."),QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
 	}
@@ -743,7 +743,7 @@ bool urllist()
 	if (tmpitem->dlg) return false;
 
 	tmpitem->dlg = new UrlDialog(g_pList);
-	g_pFrame->addWindow(tmpitem->dlg);
+	g_pMainWindow->addWindow(tmpitem->dlg);
 
 	for(KviUrl *tmp=g_pList->first();tmp;tmp=g_pList->next())
 	{