Fix in classeditor

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4397 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 26 insertions, 2 deletions

diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 16df7836d..3aaa4773a 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -1100,7 +1100,26 @@ void KviClassEditor::appendSelectedClassItemsRecursive(KviPointerList<KviClassEd
 			appendSelectedClassItemsRecursive(l,pStartFrom->child(i));
 	}
 }
-
+void KviClassEditor::appendSelectedItems(KviPointerList<KviClassEditorTreeWidgetItem> * l)
+{
+	QList<QTreeWidgetItem *> list=m_pTreeWidget->selectedItems();
+	for(int i=0;i<list.count();i++)
+	{
+		if (((KviClassEditorTreeWidgetItem *)list.at(i))->isClass()||((KviClassEditorTreeWidgetItem *)list.at(i))->isMethod())
+			l->append((KviClassEditorTreeWidgetItem *)list.at(i));
+		else appendSelectedItemsRecursive(l,list.at(i));
+	}
+}
+void KviClassEditor::appendSelectedItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
+{
+	for (int i=0;i<pStartFrom->childCount();i++)
+	{
+		if (((KviClassEditorTreeWidgetItem *)pStartFrom->child(i))->isClass()||((KviClassEditorTreeWidgetItem *)pStartFrom->child(i))->isMethod())
+			l->append(((KviClassEditorTreeWidgetItem *)pStartFrom->child(i)));
+		else
+			appendSelectedItemsRecursive(l,pStartFrom->child(i));
+	}
+}
 void KviClassEditor::appendAllClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * l)
 {
 	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
@@ -1224,7 +1243,7 @@ void KviClassEditor::removeSelectedItems()
 {
 	KviPointerList<KviClassEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
-	appendSelectedClassItems(&l);
+	appendSelectedItems(&l);
 
 	bool bYesToAll = false;
 
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index fe21b8d9a..59849a0a1 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -173,6 +173,11 @@ protected:
 	void saveLastEditedItem();
 	void appendSelectedClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * l);
 	void appendSelectedClassItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
+	
+	void appendSelectedItems(KviPointerList<KviClassEditorTreeWidgetItem> * l);
+	void appendSelectedItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
+
+	
 	void appendAllClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * l);
 	void appendAllClassItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);