Author: schubi2 Date: Fri Jun 20 10:57:29 2008 New Revision: 10418 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10418&view=rev Log: cleanup Modified: trunk/dialogsolver/src/solvertree.cpp trunk/dialogsolver/src/solvertree.h Modified: trunk/dialogsolver/src/solvertree.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.cpp?rev=10418&r1=10417&r2=10418&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.cpp (original) +++ trunk/dialogsolver/src/solvertree.cpp Fri Jun 20 10:57:29 2008 @@ -97,7 +97,7 @@ m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].item = *it; // we have found a root; collect all trees - buildTree ( m_Data, m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, *it, id); + buildTree ( m_Data->m_TreeDisplay, m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, *it, id); } } } @@ -123,7 +123,7 @@ } -void SolverTree::buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id) { +void SolverTree::buildTree ( ResTreeWidget *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id) { // generate the branches for items which will really be installed zypp::solver::detail::ItemCapKindList installList = resolver->installs (item); for (zypp::solver::detail::ItemCapKindList::const_iterator it = installList.begin(); @@ -133,14 +133,14 @@ QString idStr = QString( "%1" ).arg( id++ ); childList.append(ResGraphView::targetData(idStr)); - data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].item=it->item; - data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].dueto = *it; + data->m_RevGraphView->m_Tree[idStr].item=it->item; + data->m_RevGraphView->m_Tree[idStr].dueto = *it; alreadyHitItems.insert (item); // we have found a root; collect all trees if (alreadyHitItems.find(it->item) == alreadyHitItems.end()) - buildTree ( data, data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, it->item, id); + buildTree ( data, data->m_RevGraphView->m_Tree[idStr].targets, it->item, id); } } @@ -151,8 +151,8 @@ QString idStr = QString( "%1" ).arg( id++ ); childList.append(ResGraphView::targetData(idStr)); - data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].item=it->item; - data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].dueto = *it; + data->m_RevGraphView->m_Tree[idStr].item=it->item; + data->m_RevGraphView->m_Tree[idStr].dueto = *it; alreadyHitItems.insert (item); } Modified: trunk/dialogsolver/src/solvertree.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.h?rev=10418&r1=10417&r2=10418&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.h (original) +++ trunk/dialogsolver/src/solvertree.h Fri Jun 20 10:57:29 2008 @@ -22,6 +22,7 @@ #include "zypp/Resolver.h" #include "resgraphview.h" +#include "restreewidget.h" class StreeData; class QWidget; @@ -47,7 +48,7 @@ zypp::solver::detail::Resolver_Ptr resolver; StreeData*m_Data; PoolItemSet alreadyHitItems; - void buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id); + void buildTree ( ResTreeWidget *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id); }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org