From 70332308a84c5bf326e3554cd7a511877dba5435 Mon Sep 17 00:00:00 2001 From: Noldor Date: Tue, 24 Aug 2010 09:21:04 +0000 Subject: Fixed claseeditor compilation git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4931 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/classeditor/classeditor.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'src/modules/classeditor/classeditor.cpp') diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp index cbaa0ec1a..9eb794066 100644 --- a/src/modules/classeditor/classeditor.cpp +++ b/src/modules/classeditor/classeditor.cpp @@ -433,28 +433,33 @@ void KviClassEditor::oneTimeSetup() void KviClassEditor::createFullClass(KviKvsObjectClass * pClass, KviClassEditorTreeWidgetItem * pClassItem, const QString & szClassName) { - KviPointerHashTableIterator it(* pClass->getHandlers()); - KviClassEditorTreeWidgetItem * pFunctionItem = 0; + KviPointerHashTableIterator it(* pClass->getHandlers()); + QStringList szFunctionsList; + while(it.current()) + { + szFunctionsList.append(it.currentKey()); + ++it; + } + szFunctionsList.sort(); + KviClassEditorTreeWidgetItem *pFunctionItem; m_pClasses->insert(szClassName,pClassItem); KviKvsObjectClass * pParentClass = pClass->parentClass(); pClassItem->setInheritsClass(pParentClass->name()); - while(it.current()) + for(int i=0;ilookupFunctionHandler(it.currentKey()); - - if(pClass->isScriptHandler(it.currentKey()) && !pHandler->isClone()) + KviKvsObjectFunctionHandler *pHandler=pClass->lookupFunctionHandler(szFunctionsList.at(i)); + if (pClass->isScriptHandler(szFunctionsList.at(i)) && !pHandler->isClone()) { - pFunctionItem = findFunction(it.currentKey(), pClassItem); - if(!pFunctionItem) - pFunctionItem = new KviClassEditorTreeWidgetItem(pClassItem,KviClassEditorTreeWidgetItem::Method,it.currentKey()); + pFunctionItem=findFunction(szFunctionsList.at(i), pClassItem); + if(!pFunctionItem) pFunctionItem = new KviClassEditorTreeWidgetItem(pClassItem,KviClassEditorTreeWidgetItem::Method,szFunctionsList.at(i)); pClass->getFunctionCode(szCode,*pHandler); pFunctionItem->setBuffer(szCode); pFunctionItem->setReminder(pClass->reminder(pHandler)); if(pHandler->flags() & KviKvsObjectFunctionHandler::Internal) pFunctionItem->setInternalFunction(true); } - ++it; + //++it; } } @@ -808,8 +813,6 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem szLabelText += ""; m_pClassNameLabel->setText(szLabelText); - //m_pinheritsClassNameLabel->setText(szLabelText); - szLabelText = __tr2qs_ctx("Member Function","editor"); if(m_pLastEditedItem->isMethod()) { @@ -860,7 +863,8 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem { szBuffer += "Member Function: $" + szFunctionsList.at(i) + "
"; if(!lFunctions.find(szFunctionsList.at(i))->reminder().isEmpty()) - szBuffer += "Parameters reminder: " + lFunctions.find(szFunctionsList.at(i))->reminder() + "

"; + szBuffer+="Parameters reminder: "+lFunctions.find(szFunctionsList.at(i))->reminder()+"
"; + szBuffer+="
"; } m_pEditor->setUnHighlightedText(szBuffer); m_pEditor->setReadOnly(true); -- cgit v1.3.1-10-gc9f91