3 files changed, 11 insertions, 11 deletions
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