5 files changed, 11 insertions, 12 deletions
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index a9b1e6997..449430289 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -50,7 +50,7 @@ extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
 #define HIGHLIGHT_FLAGS QWebPage::HighlightAllOccurrences
 
-HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
+HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
 : QWidget(par)
 {
 	setObjectName("help_widget");
@@ -176,7 +176,7 @@ void HelpWidget::slotZoomOut()
 
 #else
 
-HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
+HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
 : QWidget(par)
 {
 	setObjectName("help_widget");
diff --git a/src/modules/help/HelpWidget.h b/src/modules/help/HelpWidget.h
index 79f27b766..748a9d6e9 100644
--- a/src/modules/help/HelpWidget.h
+++ b/src/modules/help/HelpWidget.h
@@ -45,7 +45,7 @@ class HelpWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	HelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false);
+	HelpWidget(QWidget *par, bool bIsStandalone = false);
 	~HelpWidget();
 private:
 #ifdef COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 21b5192d7..c3602f4a9 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -48,15 +48,15 @@ extern KviPointerList<HelpWindow> * g_pHelpWindowList;
 extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
 //bool g_bIndexingDone = FALSE;
-HelpWindow::HelpWindow(KviMainWindow * lpFrm,const char * name)
-: KviWindow(KviWindow::Help,lpFrm,name)
+HelpWindow::HelpWindow(const char * name)
+: KviWindow(KviWindow::Help,name)
 {
 	g_pHelpWindowList->append(this);
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("main_splitter");
 	m_pSplitter->setChildrenCollapsible(false);
 
-	m_pHelpWidget = new HelpWidget(m_pSplitter,lpFrm);
+	m_pHelpWidget = new HelpWidget(m_pSplitter);
 
 	m_pToolBar=new KviTalVBox(m_pSplitter);	
 	m_pTabWidget = new QTabWidget(m_pToolBar);
diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h
index ff5c1468f..cb7d4c62e 100644
--- a/src/modules/help/HelpWindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -48,7 +48,7 @@ class HelpWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	HelpWindow(KviMainWindow * lpFrm,const char * name);
+	HelpWindow(const char * name);
 	~HelpWindow();
 protected:
 	HelpWidget * m_pHelpWidget;
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index ff1f212a8..1162e97ee 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -177,7 +177,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!c->switches()->find('n',"new"))
 	{
-		HelpWidget * w = (HelpWidget *)c->window()->frame()->findChild<HelpWidget *>("help_widget");
+		HelpWidget * w = (HelpWidget *)g_pMainWindow->findChild<HelpWidget *>("help_widget");
 
 		if(w)
 		{
@@ -191,16 +191,15 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	}
 	if(c->switches()->find('m',"mdi"))
 	{
-		HelpWindow *w = new HelpWindow(c->window()->frame(),"Help browser");
+		HelpWindow *w = new HelpWindow("Help browser");
 		#ifdef COMPILE_WEBKIT_SUPPORT
 		w->textBrowser()->load(QUrl::fromLocalFile(f.absoluteFilePath()));
 		#else
 		w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath()));
 		#endif
-		c->window()->frame()->addWindow(w);
+		g_pMainWindow->addWindow(w);
 	} else {
-		HelpWidget *w = new HelpWidget(c->window()->frame()->splitter(),
-			c->window()->frame(),true);
+		HelpWidget *w = new HelpWidget(g_pMainWindow->splitter(), true);
 		#ifdef COMPILE_WEBKIT_SUPPORT
 		w->textBrowser()->load(QUrl::fromLocalFile(f.absoluteFilePath()));
 		#else