- 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, 20 deletions

diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp
index eb3ec3b19..0a347a2cb 100644
--- a/src/modules/window/UserWindow.cpp
+++ b/src/modules/window/UserWindow.cpp
@@ -31,8 +31,8 @@
 extern KviPointerList<UserWindow> * g_pUserWindowList;
 
 
-UserWindow::UserWindow(KviMainWindow * pFrm, const char * pcName, QString &szIcon, KviConsoleWindow * pConsole, int iCreationFlags)
-: KviWindow(KviWindow::UserWindow,pFrm,pcName,pConsole)
+UserWindow::UserWindow(const char * pcName, QString &szIcon, KviConsoleWindow * pConsole, int iCreationFlags)
+: KviWindow(KviWindow::UserWindow,pcName,pConsole)
 {
 	g_pUserWindowList->append(this);
 
@@ -41,25 +41,12 @@ UserWindow::UserWindow(KviMainWindow * pFrm, const char * pcName, QString &szIco
 	m_szPlainTextCaption = pcName;
 	fillSingleColorCaptionBuffers(m_szPlainTextCaption);
 
-	// Register ourselves
-	//connection()->registerChannel(this);
-	// Central splitter
-//	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
-	// Spitted vertially on the left
-//	m_pVertSplitter = new QSplitter(QSplitter::Vertical,m_pSplitter,
-//		"vertical_splitter");
-	// With the IRC view over
-	m_pIrcView = new KviIrcView(this,pFrm,this);
-	//	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
-	// The userlist on the right
-//	m_pUserListView = new KviUserListView(m_pSplitter,connection()->userDataBase(),this,
-//								AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view");
-	// And finally the input line on the bottom
+	m_pIrcView = new KviIrcView(this,this);
+
 	if(iCreationFlags & HasInput)
 		m_pInput = new KviInput(this,0);
 	else
 		m_pInput = 0;
-	//	applyOptions();
 
 	if(context())
 		context()->registerContextWindow(this);
diff --git a/src/modules/window/UserWindow.h b/src/modules/window/UserWindow.h
index 4ebc0e3a0..de66b099f 100644
--- a/src/modules/window/UserWindow.h
+++ b/src/modules/window/UserWindow.h
@@ -33,7 +33,7 @@ class UserWindow : public KviWindow
 public:
 	enum CreationFlags { HasInput = 1 };
 public:
-	UserWindow(KviMainWindow * pFrm, const char * pcName, QString & szIcon, KviConsoleWindow * pConsole = 0, int iCreationFlags = 0);
+	UserWindow(const char * pcName, QString & szIcon, KviConsoleWindow * pConsole = 0, int iCreationFlags = 0);
 	~UserWindow();
 protected:
 	QString m_szIcon;
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 3e07730f5..67a47aa5b 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1173,13 +1173,12 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	}
 
 	UserWindow * pWnd = new UserWindow(
-		c->window()->frame(),
 		szCaption.toUtf8().data(),
 		szIcon,
 		pConsole,
 		iFlags);
 
-	c->window()->frame()->addWindow(pWnd,!szFlags.contains('m'));
+	g_pMainWindow->addWindow(pWnd,!szFlags.contains('m'));
 	if(szFlags.contains('m'))
 		pWnd->minimize();