From 9c6eba79e4dc8e086cd1d41deca2b03c1ee96fce Mon Sep 17 00:00:00 2001 From: Noldor Date: Wed, 24 Mar 2010 12:27:41 +0000 Subject: More worl on classeditor git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4210 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/classeditor/classeditor.cpp | 92 ++++++--------------------------- src/modules/classeditor/classeditor.h | 32 ++---------- 2 files changed, 18 insertions(+), 106 deletions(-) (limited to 'src/modules') diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp index 988047e9e..31d7849a7 100644 --- a/src/modules/classeditor/classeditor.cpp +++ b/src/modules/classeditor/classeditor.cpp @@ -277,13 +277,13 @@ KviClassEditorTreeWidgetItem * KviClassEditor::findItem(const QString & szFullNa } return (KviClassEditorTreeWidgetItem *)pItem; } - +/* bool KviClassEditor::itemExists(const QString & szFullName) { if (findItem(szFullName)) return true; else return false; } - +*/ KviClassEditorTreeWidgetItem * KviClassEditor::createFullItem(const QString & szFullName) { QStringList lNamespaces=szFullName.split("::"); @@ -416,88 +416,29 @@ void KviClassEditor::classRefresh(const QString & szName) m_pEditor->setText(class->code()); } -void KviClassEditor::itemRenamed(QTreeWidgetItem * it, int col) -{ - if(it!=m_pLastEditedItem) return; - ((KviClassEditorTreeWidgetItem *)it)->setName(it->text(col)); - QString szNam = buildFullItemName((KviClassEditorTreeWidgetItem *)it); - QString szLabelText; - if(((KviClassEditorTreeWidgetItem *)it)->isNamespace()) - szLabelText = __tr2qs_ctx("Namespace","editor"); - else - szLabelText = __tr2qs_ctx("Class","editor"); - szLabelText += ": "; - szLabelText += szNam; - szLabelText += ""; - m_pClassNameLabel->setText(szLabelText); -} */ bool KviClassEditor::hasSelectedItems() { return m_pTreeWidget->selectedItems().count() ? 1 : 0; } - +/* bool KviClassEditor::itemExists(QTreeWidgetItem * pSearchFor) { if(!pSearchFor) return false; if(m_pClasses->findRef((KviClassEditorTreeWidgetItem*) pSearchFor)) return true; else return false; } - -/* -void KviClassEditor::appendAllItems(KviPointerList * l, KviClassEditorTreeWidgetItem::Type eType) -{ - for (int i=0;itopLevelItemCount();i++) - { - if (((KviClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->type()==eType) - { - l->append(((KviClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))); - } - else - { - appendAllItemsRecursive(l,m_pTreeWidget->topLevelItem(i),eType); - } - } -} - -void KviClassEditor::appendAllItemsRecursive(KviPointerList * l, QTreeWidgetItem * pStartFrom, KviClassEditorTreeWidgetItem::Type eType) -{ - for (int i=0;ichildCount();i++) - { - if (((KviClassEditorTreeWidgetItem *)pStartFrom->child(i))->type()==eType) - { - l->append((KviClassEditorTreeWidgetItem *)pStartFrom->child(i)); - } - else - { - appendAllItemsRecursive(l,pStartFrom->child(i),eType); - } - } -} */ + bool KviClassEditor::classExists(QString & szFullItemName) { if (m_pClasses->find(szFullItemName)) return true; else return false; } -bool KviClassEditor::namespaceExists(QString & szFullItemName) -{ - /*KviPointerList l; - l.setAutoDelete(false); - appendAllItems(&l,KviClassEditorTreeWidgetItem::Namespace); - for(KviClassEditorTreeWidgetItem * it = l.first();it;it = l.next()) - { - if (KviQString::equalCI(buildFullItemName(it),szFullItemName)) - { - return true; - } - }*/ - return false; -} void KviClassEditor::renameFunction() { KviClassEditorTreeWidgetItem *pFunction=m_pLastEditedItem; @@ -528,10 +469,10 @@ void KviClassEditor::renameFunction() for(unsigned int i=0;isetClassNotBuilt(true); activateItem(pFunction); - KviKvsObjectClass *pClass; +/* KviKvsObjectClass *pClass; pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName); - //if (pClass) KviKvsKernel::instance()->objectController()->deleteClass(pClass); - + if (pClass) KviKvsKernel::instance()->objectController()->deleteClass(pClass); +*/ } bool KviClassEditor::functionExists(const QString &szFunctionName, KviClassEditorTreeWidgetItem *pClass) { @@ -1138,17 +1079,12 @@ void KviClassEditor::loadProperties(KviConfig * cfg) activateItem(it); } -void KviClassEditor::appendSelectedClassItems(KviPointerList * l) +void KviClassEditor::appendSelectedItems(KviPointerList * l) { QList list=m_pTreeWidget->selectedItems(); for(int i=0;iisClass()) - l->append((KviClassEditorTreeWidgetItem *)list.at(i)); - else - { - appendSelectedClassItemsRecursive(l,list.at(i)); - } + l->append((KviClassEditorTreeWidgetItem *)list.at(i)); } } void KviClassEditor::appendSelectedClassItemsRecursive(KviPointerList * l,QTreeWidgetItem * pStartFrom) @@ -1190,7 +1126,7 @@ void KviClassEditor::appendAllClassItemsRecursive(KviPointerListchildCount() > 0) @@ -1212,10 +1148,12 @@ bool KviClassEditor::removeItem(KviClassEditorTreeWidgetItem *it,bool * pbYesToA { if(it->isClass()) KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the class \"%Q\" ?","editor"),&szName); - else { + else + if(it->isNamespace()) + { KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the namespace \"%Q\" ?","editor"),&szName); szMsg += "
"; - szMsg += __tr2qs_ctx("Please note that all the children items will be deleted too.","editor"); + szMsg += __tr2qs_ctx("Please note that all the children classes/functions will be deleted too.","editor"); } g_pClassEditorModule->lock(); @@ -1260,7 +1198,7 @@ void KviClassEditor::removeSelectedItems() } -*/ + bool KviClassEditor::askForClassName(QString &szClassName,QString &szInheritsClassName, bool bEdit) { diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h index 9d95a197f..db217723c 100644 --- a/src/modules/classeditor/classeditor.h +++ b/src/modules/classeditor/classeditor.h @@ -133,7 +133,6 @@ public: bool m_bSaving; public: //bool modified(){ return m_bModified; }; - //void setInheritedClassesNotBuilt(const QString &szInheritsClassName); void saveProperties(KviConfig *); void loadProperties(KviConfig *); void loadUnbuildedFunctions(); @@ -145,8 +144,6 @@ public: void exportClasses(bool,bool=false); void exportSelectionInSinglesFiles(KviPointerList *l); - - //static void splitFullClassOrNamespaceName(const QString &szFullName,QStringList &lNamespaces,QString &szName); void cutItem(KviClassEditorTreeWidgetItem *pItem); protected slots: @@ -166,7 +163,7 @@ protected slots: void exportSelectedSepFiles(); void exportSelected(); /* - void removeSelectedItems(); + @@ -174,7 +171,6 @@ protected slots: void slotCollapseNamespaces(); void slotFindWord(const QString &); void slotReplaceAll(const QString &before,const QString &after); - void itemRenamed(QTreeWidgetItem *it,int col); void classRefresh(const QString &szName); */ @@ -184,13 +180,11 @@ protected: /* void recursiveCollapseNamespaces(KviClassEditorTreeWidgetItem * it); void recursiveSearchReplace(const QString &szSearch,KviClassEditorTreeWidgetItem * it,bool bReplace=false,const QString &szReplace="n"); - void recursiveCommit(KviClassEditorTreeWidgetItem * it); */ void getExportClassBuffer(QString &buffer,KviClassEditorTreeWidgetItem * it); void oneTimeSetup(); void saveLastEditedItem(); - //void getUniqueItemName(KviClassEditorTreeWidgetItem *item,QString &buffer,KviClassEditorTreeWidgetItem::Type eType); void appendSelectedClassItems(KviPointerList * l); void appendSelectedClassItemsRecursive(KviPointerList * l,QTreeWidgetItem * pStartFrom); void appendAllClassItems(KviPointerList * l); @@ -204,34 +198,14 @@ protected: bool askForFunction(QString &szFunctionName,bool * bInternal, const QString &szClassName); void searchInheritedClasses(const QString szClass,KviPointerList & pInheritsedClasses); bool classExists(QString &szFullItemName); - //void renameClassOrNamespace(); void renameClass(KviClassEditorTreeWidgetItem *pClassItem); void renameNamespace(KviClassEditorTreeWidgetItem *pNamespaceItem); -bool namespaceExists(QString &szFullItemName); + void removeSelectedItems(); -/* bool removeItem(KviClassEditorTreeWidgetItem *it,bool * pbYesToAll,bool bDeleteEmptyTree); void removeItemChildren(KviClassEditorTreeWidgetItem *it); - - - - - - - + void appendSelectedItems(KviPointerList * l); void appendAllItems(KviPointerList * l,KviClassEditorTreeWidgetItem::Type); - void appendAllItemsRecursive(KviPointerList * l,QTreeWidgetItem * pStartFrom,KviClassEditorTreeWidgetItem::Type); - - - - KviClassEditorTreeWidgetItem * createFullItemRecursive(QTreeWidgetItem *pCurrent,QStringList & lNameSpaces,int & iLevel); - KviClassEditorTreeWidgetItem * findItemRecursive(QTreeWidgetItem *it,QStringList & lNameSpaces,int & iLevel); - - */ - // bool itemExistsRecursive(QTreeWidgetItem *pSearchFor,QTreeWidgetItem * pSearchAt); - bool itemExists(QTreeWidgetItem *pSearchFor); - bool itemExists(const QString &szFullName); - void buildFullItemPath(KviClassEditorTreeWidgetItem * it,QString &szBuffer); QString buildFullClassName(KviClassEditorTreeWidgetItem * it); KviClassEditorTreeWidgetItem * createFullItem(const QString &szFullName); -- cgit v1.3.1-10-gc9f91