- 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

3 files changed, 6 insertions, 6 deletions

diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index 88f7fdab4..9e0573401 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -44,8 +44,8 @@
 
 extern KviPointerList<LinksWindow> * g_pLinksWindowList;
 
-LinksWindow::LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
-: KviWindow(KviWindow::Links,lpFrm,"links",lpConsole), KviExternalServerDataParser()
+LinksWindow::LinksWindow(KviConsoleWindow * lpConsole)
+: KviWindow(KviWindow::Links,"links",lpConsole), KviExternalServerDataParser()
 {
 	g_pLinksWindowList->append(this);
 
@@ -83,7 +83,7 @@ LinksWindow::LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
 	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,const QPoint &)),
 			this,SLOT(showHostPopup(QTreeWidgetItem *,const QPoint &)));
 
-	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
+	m_pIrcView = new KviIrcView(m_pVertSplitter,this);
 
 	m_pLinkList = new KviPointerList<KviLink>;
 	m_pLinkList->setAutoDelete(true);
diff --git a/src/modules/links/LinksWindow.h b/src/modules/links/LinksWindow.h
index 807596048..89c35b05e 100644
--- a/src/modules/links/LinksWindow.h
+++ b/src/modules/links/LinksWindow.h
@@ -61,7 +61,7 @@ class LinksWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
+	LinksWindow(KviConsoleWindow * lpConsole);
 	~LinksWindow();
 protected:
 	QSplitter               * m_pVertSplitter;
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index caf5c205d..fdf5da23a 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -66,8 +66,8 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!(c->window()->context()->linksWindow()))
 	{
-		LinksWindow *w = new LinksWindow(c->window()->frame(),c->window()->console());
-		c->window()->frame()->addWindow(w);
+		LinksWindow *w = new LinksWindow(c->window()->console());
+		g_pMainWindow->addWindow(w);
 	} else {
 		c->warning(__tr2qs("Links window alread open for this IRC context"));
 	}