- 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/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index b005f4420..a35dab66a 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -173,8 +173,8 @@ void ChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewIt
 	}
 }
 
-ListWindow::ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole)
-: KviWindow(KviWindow::List,lpFrm,"list",lpConsole), KviExternalServerDataParser()
+ListWindow::ListWindow(KviConsoleWindow * lpConsole)
+: KviWindow(KviWindow::List,"list",lpConsole), KviExternalServerDataParser()
 {
 	g_pListWindowList->append(this);
 
@@ -261,7 +261,7 @@ ListWindow::ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole)
 
 	connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
 
-	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
+	m_pIrcView = new KviIrcView(m_pVertSplitter,this);
 
 	m_pConsole->context()->setListWindowPointer(this);
 	connect(m_pConsole->context(),SIGNAL(stateChanged()),this,SLOT(connectionStateChange()));
diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h
index 6decc0f8f..2c77e0453 100644
--- a/src/modules/list/ListWindow.h
+++ b/src/modules/list/ListWindow.h
@@ -93,7 +93,7 @@ class ListWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole);
+	ListWindow(KviConsoleWindow * lpConsole);
 	~ListWindow();
 protected:
 	QSplitter                                    * m_pVertSplitter;
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index 9491b5bac..9d8d6a2f7 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -55,8 +55,8 @@ static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!(c->window()->context()->listWindow()))
 	{
-		ListWindow * w = new ListWindow(c->window()->frame(),c->window()->console());
-		c->window()->frame()->addWindow(w);
+		ListWindow * w = new ListWindow(c->window()->console());
+		g_pMainWindow->addWindow(w);
 	} else {
 		c->warning(__tr2qs("List window already open for this IRC context"));
 	}