- Happy new year!

 - Some parts of kvirc still refered to KviMainWindow as frame(), m_pFrm, etc.. => fixed
 - Some parts of kvirc were still coded as if more than one KviMainWindows could exists => fixed, this involved changing KviWindows's ctor and removing KviWindow::frame(), thus the big change
 - The trayicon module still called itself (and was called) dockextension, and was built to support more than one KviMainWindows => renamed and fixed
 - Modified KviWindow::hasAttention so that is can be used everywhere instead of mixing different ways to check if a notificationm should popup
 - should fix #1221 and hopefully introduce little to no bugs



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

5 files changed, 9 insertions, 9 deletions

diff --git a/src/modules/term/TermWidget.cpp b/src/modules/term/TermWidget.cpp
index 21bcf2549..31c740901 100644
--- a/src/modules/term/TermWidget.cpp
+++ b/src/modules/term/TermWidget.cpp
@@ -46,7 +46,7 @@
 	extern KviPointerList<TermWidget> * g_pTermWidgetList;
 	extern KviPointerList<TermWindow> * g_pTermWindowList;
 
-	TermWidget::TermWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
+	TermWidget::TermWidget(QWidget * par,bool bIsStandalone)
 	: QFrame(par)
 	{
 		setObjectName("term_widget");
diff --git a/src/modules/term/TermWidget.h b/src/modules/term/TermWidget.h
index fc917a5c1..ed12e90b1 100644
--- a/src/modules/term/TermWidget.h
+++ b/src/modules/term/TermWidget.h
@@ -41,7 +41,7 @@
 		Q_OBJECT
 		Q_PROPERTY( int KviProperty_ChildFocusOwner READ dummy )
 	public:
-		TermWidget(QWidget * par,KviMainWindow * lpFrm,bool bIsStandalone = false);
+		TermWidget(QWidget * par,bool bIsStandalone = false);
 		~TermWidget();
 	private:
 		KviTalHBox   * m_pHBox;
diff --git a/src/modules/term/TermWindow.cpp b/src/modules/term/TermWindow.cpp
index 590f06cec..e72a8195b 100644
--- a/src/modules/term/TermWindow.cpp
+++ b/src/modules/term/TermWindow.cpp
@@ -36,12 +36,12 @@
 	extern KviPointerList<TermWidget> * g_pTermWidgetList;
 	extern KviIconManager * g_pIconManager;
 
-	TermWindow::TermWindow(KviMainWindow * lpFrm,const char * name)
-	: KviWindow(KviWindow::Terminal,lpFrm,name)
+	TermWindow::TermWindow(const char * name)
+	: KviWindow(KviWindow::Terminal,name)
 	{
 		g_pTermWindowList->append(this);
 		m_pTermWidget = 0;
-		m_pTermWidget = new TermWidget(this,lpFrm);
+		m_pTermWidget = new TermWidget(this);
 		// Ensure proper focusing
 	//	setFocusHandler(m_pTermWidget->konsoleWidget(),this);
 	}
diff --git a/src/modules/term/TermWindow.h b/src/modules/term/TermWindow.h
index a199173f0..a0f5367c6 100644
--- a/src/modules/term/TermWindow.h
+++ b/src/modules/term/TermWindow.h
@@ -36,7 +36,7 @@
 	{
 		Q_OBJECT
 	public:
-		TermWindow(KviMainWindow * lpFrm,const char * name);
+		TermWindow(const char * name);
 		~TermWindow();
 	protected:
 		TermWidget * m_pTermWidget;
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 8d7cebb4d..b87024a27 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -69,10 +69,10 @@ static bool term_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	c->module()->lock(); // multiple locks are allowed
 	if(c->hasSwitch('m',"mdi"))
 	{
-		TermWindow *w = new TermWindow(c->window()->frame(),"Terminal emulator");
-		c->window()->frame()->addWindow(w);
+		TermWindow *w = new TermWindow("Terminal emulator");
+		g_pMainWindow->addWindow(w);
 	} else {
-		TermWidget *w = new TermWidget(c->window()->frame()->splitter(), c->window()->frame(),true);
+		TermWidget *w = new TermWidget(g_pMainWindow->splitter(), true);
 		w->show();
 	}
 #else