- 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

2 files changed, 6 insertions, 6 deletions

diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 49dfbaa3a..140050fdc 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -34,8 +34,8 @@
 
 
 
-KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName)
-: KviWindow(KviWindow::ScriptObject,pParent,szName)
+KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(const QString &szName)
+: KviWindow(KviWindow::ScriptObject,szName)
 {
 	m_pCentralWidget = 0;
 	m_pIcon = 0;
@@ -116,11 +116,11 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_window)
 		g_pMainWindow->closeWindow(((KviKvsScriptWindowWindow *)widget()));
 KVSO_END_CONSTRUCTOR(KvsObject_window)
 
-bool KvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
+bool KvsObject_window::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
-	KviKvsScriptWindowWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),getName());
+	KviKvsScriptWindowWindow * w = new KviKvsScriptWindowWindow(getName());
 	setObject(w);
-	pContext->window()->frame()->addWindow(w,false);
+	g_pMainWindow->addWindow(w,false);
 	w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts...
 
 	return true;
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h
index b074f1e32..c118c5c89 100644
--- a/src/modules/objects/KvsObject_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -34,7 +34,7 @@ class KviKvsScriptWindowWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName);
+	KviKvsScriptWindowWindow(const QString &szName);
 	~KviKvsScriptWindowWindow();
 protected:
 	KvsObject_widget * m_pCentralWidgetObject;