classeditor fix

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

2 files changed, 9 insertions, 16 deletions

diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index dcab1e10f..ef8c1e187 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -66,7 +66,7 @@ extern KviClassEditorWindow * g_pClassEditorWindow;
 extern KviModule * g_pClassEditorModule;
 
 KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget,Type eType,const QString &szName)
-: QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType), m_pParentItem(0)
+: QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType)
 {
 	setName(szName);
 	m_cPos=0;
@@ -77,7 +77,7 @@ KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(QTreeWidget * pTreeWi
 }
 
 KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(KviClassEditorTreeWidgetItem * pParentItem,Type eType,const QString &szName)
-: QTreeWidgetItem(pParentItem), m_eType(eType), m_pParentItem(pParentItem)
+: QTreeWidgetItem(pParentItem), m_eType(eType)
 {
 	setName(szName);
 	m_cPos=0;
@@ -213,7 +213,7 @@ void KviClassEditor::buildFullItemPath(KviClassEditorTreeWidgetItem * it, QStrin
 {
 	if (!it) return;
 	szBuffer.prepend(it->name()+"::");
-	it=it->parentItem();
+	it=(KviClassEditorTreeWidgetItem*)it->parent();
 	while(it)
 	{
 		QString tmp = it->name();
@@ -222,7 +222,7 @@ void KviClassEditor::buildFullItemPath(KviClassEditorTreeWidgetItem * it, QStrin
 			szBuffer.prepend("::");
 			szBuffer.prepend(tmp);
 		}
-		it = it->parentItem();
+		it = (KviClassEditorTreeWidgetItem*)it->parent();
 	}
 }
 
@@ -501,9 +501,9 @@ bool KviClassEditor::namespaceExists(QString & szFullItemName)
 void KviClassEditor::renameFunction()
 {
 	KviClassEditorTreeWidgetItem *pFunction=m_pLastEditedItem;
-	QString szClassName = pFunction->parentItem()->name();
+	QString szClassName = ((KviClassEditorTreeWidgetItem*)pFunction->parent())->name();
 	QString szFunctionName = pFunction->name();
-	KviClassEditorTreeWidgetItem *pParentClass =  pFunction->parentItem();
+	KviClassEditorTreeWidgetItem *pParentClass = (KviClassEditorTreeWidgetItem*) pFunction->parent();
 
 	QString szNewFunctionName = szFunctionName;
 	bool bInternal;
@@ -623,7 +623,7 @@ void KviClassEditor::cutItem(KviClassEditorTreeWidgetItem *pItem)
 	}
 	else
 	{
-		KviClassEditorTreeWidgetItem *pParent=pItem->parentItem();
+		KviClassEditorTreeWidgetItem *pParent= (KviClassEditorTreeWidgetItem*)pItem->parent();
 		pParent->removeChild(pItem);
 	}
 }
@@ -1409,7 +1409,7 @@ void KviClassEditor::newNamespace()
 void KviClassEditor::newMemberFunction()
 {
        QString szFunctionName,szClassName;
-       if(m_pLastClickedItem->isMethod()) m_pLastClickedItem=m_pLastClickedItem->parentItem();
+       if(m_pLastClickedItem->isMethod()) m_pLastClickedItem= (KviClassEditorTreeWidgetItem*)m_pLastClickedItem->parent();
        szClassName=buildFullClassName(m_pLastClickedItem);
        bool bInternal;
        askForFunction(szFunctionName, &bInternal,szClassName);
@@ -1417,7 +1417,7 @@ void KviClassEditor::newMemberFunction()
        KviClassEditorTreeWidgetItem *it=newItem(szFunctionName,KviClassEditorTreeWidgetItem::Method);
        it->setInternalFunction(bInternal);
        activateItem(it);
-       it->parentItem()->setClassNotBuilt(true);
+       ((KviClassEditorTreeWidgetItem*)it->parent())->setClassNotBuilt(true);
 }
 
 KviClassEditorTreeWidgetItem *  KviClassEditor::newItem(QString &szName,KviClassEditorTreeWidgetItem::Type eType)
@@ -1687,7 +1687,6 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz
 {
         setObjectName(szName);
 
-        m_pParent = pParent;
         QPalette p = palette();
         p.setColor(foregroundRole(),QColor( 0, 0, 0 ));
         p.setColor(backgroundRole(),QColor( 236, 233, 216 ));
@@ -1806,7 +1805,6 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co
 {
         setObjectName(szName);
 
-        m_pParent = pParent;
         QPalette p = palette();
         p.setColor(foregroundRole(),QColor( 0, 0, 0 ));
         p.setColor(backgroundRole(),QColor( 236, 233, 216 ));
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index 9f3b68a7c..9d95a197f 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -68,7 +68,6 @@ public:
 	~KviClassEditorTreeWidgetItem(){};
 protected:
 	Type m_eType;
-        KviClassEditorTreeWidgetItem * m_pParentItem;
 	QString m_szName;
         QString m_szBuffer;
         bool m_bClassModified, m_bInternal;
@@ -88,8 +87,6 @@ public:
 	bool isClass(){ return m_eType == Class; };
 	bool isNamespace(){ return m_eType == Namespace; };
         bool isMethod(){ return m_eType == Method;};
-        void setParentItem(KviClassEditorTreeWidgetItem* it){ m_pParentItem=it; };
-        KviClassEditorTreeWidgetItem * parentItem(){ return m_pParentItem; };
         void setBuffer(const QString &szBuffer){ m_szBuffer = szBuffer; };
         const QString & buffer(){ return m_szBuffer; };
         const int & cursorPosition(){return m_cPos; };
@@ -279,7 +276,6 @@ protected:
         QPushButton * m_pNewClassButton;
         QLineEdit * m_pClassNameLineEdit;
 	QComboBox * m_pInheritsClassComboBox;
-        QWidget     * m_pParent;
 protected slots:
         void textChanged(const QString &);
 };
@@ -298,7 +294,6 @@ protected:
         QPushButton * m_pNewFunctionButton;
         QLineEdit * m_pFunctionNameLineEdit;
         QCheckBox * m_pInternalCheckBox;
-        QWidget     * m_pParent;
 protected slots:
         void textChanged(const QString &);
 };