diff options
| author |  Noldor | 2010-05-23 14:22:59 +0000 |
|---|---|---|
| committer | Noldor | 2010-05-23 14:22:59 +0000 |
| commit | 30a6c720476fe968653140bb183928f97d97f1db (patch) | |
| tree | 99d85a616f3357c604033d3ce4304836bd0d1401 /src/modules | |
| parent | Fix local directory selection in the setup dialog (diff) | |
| download | KVIrc-30a6c720476fe968653140bb183928f97d97f1db.tar.gz KVIrc-30a6c720476fe968653140bb183928f97d97f1db.tar.bz2 KVIrc-30a6c720476fe968653140bb183928f97d97f1db.zip | |
Some fixes in object classes inheritance
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4362 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/classeditor/classeditor.cpp | 3 | ||||
| -rw-r--r-- | src/modules/editor/scripteditor.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp index 74bfb8fa1..ff6a5ddc3 100644 --- a/src/modules/classeditor/classeditor.cpp +++ b/src/modules/classeditor/classeditor.cpp @@ -395,7 +395,8 @@ void KviClassEditor::createFullClass(KviKvsObjectClass *pClass, KviClassEditorTr { QString szCode; KviKvsObjectFunctionHandler *handler=pClass->lookupFunctionHandler(it.currentKey()); - if (pClass->isScriptHandler(it.currentKey())) + + if (pClass->isScriptHandler(it.currentKey()) && !handler->isClone()) { pFunctionItem=findFunction(it.currentKey(), pClassItem); if(!pFunctionItem) pFunctionItem = new KviClassEditorTreeWidgetItem(pClassItem,KviClassEditorTreeWidgetItem::Method,it.currentKey()); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index b8c5ec28e..18f49781a 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -679,8 +679,6 @@ void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) // 'found matches' highlighting KviScriptEditorWidget * pEditor = ((KviScriptEditorWidget *)textEdit()); QString szFind = pEditor->m_szFind; - debug("find %s",szFind.toUtf8().data()); - if (!szFind.isEmpty()) { index = szText.indexOf(szFind); @@ -691,8 +689,6 @@ void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText) index = szText.indexOf(szFind,index + length); } } - debug("exit loop"); - } |