- 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/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index a74b2bc92..19ba52ef0 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1368,8 +1368,8 @@ void PopupEditorWidget::getUniquePopupName(MenuTreeWidgetItem *item,QString &buf
 }
 
 
-PopupEditorWindow::PopupEditorWindow(KviMainWindow * lpFrm)
-: KviWindow(KviWindow::ScriptEditor,lpFrm,"popupeditor",0)
+PopupEditorWindow::PopupEditorWindow()
+: KviWindow(KviWindow::ScriptEditor,"popupeditor",0)
 {
 	g_pPopupEditorWindow = this;
 
diff --git a/src/modules/popupeditor/PopupEditorWindow.h b/src/modules/popupeditor/PopupEditorWindow.h
index cb2873502..2e31a96ad 100644
--- a/src/modules/popupeditor/PopupEditorWindow.h
+++ b/src/modules/popupeditor/PopupEditorWindow.h
@@ -186,7 +186,7 @@ class PopupEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	PopupEditorWindow(KviMainWindow * lpFrm);
+	PopupEditorWindow();
 	~PopupEditorWindow();
 protected:
 	PopupEditorWidget * m_pEditor;
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index e405e44e3..9fb5beb5c 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -46,12 +46,12 @@ PopupEditorWindow * g_pPopupEditorWindow = 0;
 		Opens the script popup editor dialog.
 */
 
-static bool popupeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
+static bool popupeditor_kvs_cmd_open(KviKvsModuleCommandCall *)
 {
 	if(!g_pPopupEditorWindow)
 	{
-		g_pPopupEditorWindow = new PopupEditorWindow(c->window()->frame());
-		c->window()->frame()->addWindow(g_pPopupEditorWindow);
+		g_pPopupEditorWindow = new PopupEditorWindow();
+		g_pMainWindow->addWindow(g_pPopupEditorWindow);
 	}
 
 	g_pPopupEditorWindow->setFocus();