From b538ec203da0ad5f6ea00dc4340dac7af0169b90 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 1 Jan 2012 16:43:23 +0000 Subject: - 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 --- src/modules/classeditor/ClassEditorWindow.cpp | 4 ++-- src/modules/classeditor/ClassEditorWindow.h | 3 +-- src/modules/classeditor/libkviclasseditor.cpp | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/modules/classeditor') diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index c7291e73d..2358ec2f0 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -1835,8 +1835,8 @@ void ClassEditorWidget::searchInheritedClasses(const QString szClass, KviPointer } } -ClassEditorWindow::ClassEditorWindow(KviMainWindow * pFrm) -: KviWindow(KviWindow::ScriptEditor,pFrm,"classeditor",0) +ClassEditorWindow::ClassEditorWindow() +: KviWindow(KviWindow::ScriptEditor,"classeditor",0) { g_pClassEditorWindow = this; diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h index 4b3ce0f1e..abb6ebb2c 100644 --- a/src/modules/classeditor/ClassEditorWindow.h +++ b/src/modules/classeditor/ClassEditorWindow.h @@ -474,10 +474,9 @@ class ClassEditorWindow : public KviWindow public: /** * \brief Constructs the class editor window - * \param pFrm The parent frame * \return ClassEditorWindow */ - ClassEditorWindow(KviMainWindow * pFrm); + ClassEditorWindow(); /** * \brief Destroys the class editor window diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp index 9090f67b8..8348caf14 100644 --- a/src/modules/classeditor/libkviclasseditor.cpp +++ b/src/modules/classeditor/libkviclasseditor.cpp @@ -46,12 +46,12 @@ KviModule * g_pClassEditorModule = 0; @description: Opens the script class editor dialog. */ -static bool classeditor_kvs_cmd_open(KviKvsModuleCommandCall * c) +static bool classeditor_kvs_cmd_open(KviKvsModuleCommandCall *) { if(!g_pClassEditorWindow) { - g_pClassEditorWindow = new ClassEditorWindow(c->window()->frame()); - c->window()->frame()->addWindow(g_pClassEditorWindow); + g_pClassEditorWindow = new ClassEditorWindow(); + g_pMainWindow->addWindow(g_pClassEditorWindow); } g_pClassEditorWindow->setFocus(); -- cgit v1.3.1-10-gc9f91