Author: schubi2 Date: Fri May 16 17:14:20 2008 New Revision: 10129 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10129&view=rev Log: compiling fixes Modified: trunk/dialogsolver/src/QZyppSolverDialog.cpp trunk/dialogsolver/src/QZyppSolverDialog.h trunk/dialogsolver/src/resgraphview.cpp trunk/dialogsolver/src/resgraphview.h trunk/dialogsolver/src/restreewidget.cpp trunk/dialogsolver/src/restreewidget.h trunk/dialogsolver/src/solvertree.cpp trunk/dialogsolver/src/solvertree.h Modified: trunk/dialogsolver/src/QZyppSolverDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/QZyppSolverDialog.cpp?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/QZyppSolverDialog.cpp (original) +++ trunk/dialogsolver/src/QZyppSolverDialog.cpp Fri May 16 17:14:20 2008 @@ -32,7 +32,7 @@ { } -void QZyppSolverDialog::selectItem(const zypp::PoolItem_Ref item) { +void QZyppSolverDialog::selectItem(const zypp::PoolItem item) { solvertree->selectItem(item); }; Modified: trunk/dialogsolver/src/QZyppSolverDialog.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/QZyppSolverDialog.h?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/QZyppSolverDialog.h (original) +++ trunk/dialogsolver/src/QZyppSolverDialog.h Fri May 16 17:14:20 2008 @@ -35,7 +35,7 @@ /** Selecting one item in the solvertree * \param \ref item which will be selected */ - void selectItem(const zypp::PoolItem_Ref item); + void selectItem(const zypp::PoolItem item); private: QZyppSolverDialog& Modified: trunk/dialogsolver/src/resgraphview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.cpp?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/resgraphview.cpp (original) +++ trunk/dialogsolver/src/resgraphview.cpp Fri May 16 17:14:20 2008 @@ -727,7 +727,7 @@ :resStatus(status) { } - bool operator()( PoolItem_Ref item ) // only transacts() items go here + bool operator()( PoolItem item ) // only transacts() items go here { item.status().resetTransact( resStatus );// clear any solver/establish transactions return true; Modified: trunk/dialogsolver/src/resgraphview.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.h?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/resgraphview.h (original) +++ trunk/dialogsolver/src/resgraphview.h Fri May 16 17:14:20 2008 @@ -74,7 +74,7 @@ typedef QValueList<targetData> tlist; struct keyData { - zypp::PoolItem_Ref item; + zypp::PoolItem item; tlist targets; }; @@ -87,7 +87,7 @@ void selectItem(const QString & itemString); signals: - void dispDetails(const QString&, const zypp::PoolItem_Ref); + void dispDetails(const QString&, const zypp::PoolItem); public slots: virtual void contentsMovingSlot(int,int); Modified: trunk/dialogsolver/src/restreewidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/restreewidget.cpp?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/restreewidget.cpp (original) +++ trunk/dialogsolver/src/restreewidget.cpp Fri May 16 17:14:20 2008 @@ -52,7 +52,7 @@ m_RevGraphView = new ResGraphView(m_Splitter, "m_RevGraphView" ); m_RevGraphView->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); - connect(m_RevGraphView,SIGNAL(dispDetails(const QString&, const zypp::PoolItem_Ref)),this,SLOT(setDetailText(const QString&, const zypp::PoolItem_Ref))); + connect(m_RevGraphView,SIGNAL(dispDetails(const QString&, const zypp::PoolItem)),this,SLOT(setDetailText(const QString&, const zypp::PoolItem))); descriptionBox = new QVBox( m_Splitter, "descriptionBox"); descriptionBox->setSpacing (5); @@ -111,7 +111,7 @@ QStringList stringList; for (it=m_RevGraphView->m_Tree.begin(); it!=m_RevGraphView->m_Tree.end();++it) { - zypp::PoolItem_Ref item = it.data().item; + zypp::PoolItem item = it.data().item; QString itemString = item->name() + "-" + item->edition().asString() + "." + item->arch().asString(); @@ -123,7 +123,7 @@ } } -void ResTreeWidget::setDetailText(const QString& _s, const zypp::PoolItem_Ref item) +void ResTreeWidget::setDetailText(const QString& _s, const zypp::PoolItem item) { if (resolver) { zypp::solver::detail::ItemCapKindList installList = resolver->installs (item); @@ -169,7 +169,7 @@ m_RevGraphView->selectItem (itemString ); } -void ResTreeWidget::selectItem(const zypp::PoolItem_Ref item) { +void ResTreeWidget::selectItem(const zypp::PoolItem item) { QString itemString = item->name() + "-" + item->edition().asString() + "." + item->arch().asString(); Modified: trunk/dialogsolver/src/restreewidget.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/restreewidget.h?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/restreewidget.h (original) +++ trunk/dialogsolver/src/restreewidget.h Fri May 16 17:14:20 2008 @@ -59,7 +59,7 @@ QSplitter* m_Splitter; ResGraphView* m_RevGraphView; zypp::solver::detail::Resolver_Ptr resolver; - void selectItem(const zypp::PoolItem_Ref item); + void selectItem(const zypp::PoolItem item); void dumpRevtree(); @@ -77,7 +77,7 @@ protected slots: - virtual void setDetailText(const QString&, const zypp::PoolItem_Ref); + virtual void setDetailText(const QString&, const zypp::PoolItem); void itemSelected( QListViewItem* item); void slotComboActivated( const QString &s ); Modified: trunk/dialogsolver/src/solvertree.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.cpp?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.cpp (original) +++ trunk/dialogsolver/src/solvertree.cpp Fri May 16 17:14:20 2008 @@ -112,7 +112,7 @@ delete m_Data; } -void SolverTree::selectItem(const zypp::PoolItem_Ref item) { +void SolverTree::selectItem(const zypp::PoolItem item) { m_Data->m_TreeDisplay->selectItem(item); } @@ -123,7 +123,7 @@ } -void SolverTree::buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem_Ref item, int &id) { +void SolverTree::buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id) { // generate the branches zypp::solver::detail::ItemCapKindList installList = resolver->installs (item); for (zypp::solver::detail::ItemCapKindList::const_iterator it = installList.begin(); Modified: trunk/dialogsolver/src/solvertree.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.h?rev=10129&r1=10128&r2=10129&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.h (original) +++ trunk/dialogsolver/src/solvertree.h Fri May 16 17:14:20 2008 @@ -37,14 +37,14 @@ bool isValid()const; QWidget*getView(); - void selectItem(const zypp::PoolItem_Ref item); + void selectItem(const zypp::PoolItem item); protected: bool m_Valid; zypp::solver::detail::Resolver_Ptr resolver; StreeData*m_Data; - void buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem_Ref item, int &id); + void buildTree ( StreeData *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