Author: sh-sh-sh
Date: Mon Jul 23 18:01:34 2007
New Revision: 39617
URL: http://svn.opensuse.org/viewcvs/yast?rev=39617&view=rev
Log:
consistent naming
Added:
trunk/qt/src/pkg/YQPkgRepoFilterView.cc
- copied, changed from r39600, trunk/qt/src/pkg/YQPkgInstSrcFilterView.cc
trunk/qt/src/pkg/YQPkgRepoFilterView.h
- copied, changed from r39600, trunk/qt/src/pkg/YQPkgInstSrcFilterView.h
trunk/qt/src/pkg/YQPkgRepoList.cc
- copied, changed from r39600, trunk/qt/src/pkg/YQPkgInstSrcList.cc
trunk/qt/src/pkg/YQPkgRepoList.h
- copied, changed from r39600, trunk/qt/src/pkg/YQPkgInstSrcList.h
Removed:
trunk/qt/src/pkg/YQPkgInstSrcFilterView.cc
trunk/qt/src/pkg/YQPkgInstSrcFilterView.h
trunk/qt/src/pkg/YQPkgInstSrcList.cc
trunk/qt/src/pkg/YQPkgInstSrcList.h
Modified:
trunk/qt/src/pkg/Makefile.am
trunk/qt/src/pkg/YQPackageSelector.cc
trunk/qt/src/pkg/YQPackageSelector.h
trunk/qt/src/pkg/YQPkgVersionsView.cc
trunk/qt/src/pkg/YQPkgVersionsView.h
Modified: trunk/qt/src/pkg/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/Makefile.am?rev=39617&r1=39616&r2=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/Makefile.am (original)
+++ trunk/qt/src/pkg/Makefile.am Mon Jul 23 18:01:34 2007
@@ -48,8 +48,8 @@
YQPkgDiskUsageWarningDialog.cc \
YQPkgFileListView.cc \
YQPkgGenericDetailsView.cc \
- YQPkgInstSrcFilterView.cc \
- YQPkgInstSrcList.cc \
+ YQPkgRepoFilterView.cc \
+ YQPkgRepoList.cc \
YQPkgLangList.cc \
YQPkgList.cc \
YQPkgObjList.cc \
@@ -86,8 +86,8 @@
YQPkgDiskUsageWarningDialog.moc \
YQPkgFileListView.moc \
YQPkgGenericDetailsView.moc \
- YQPkgInstSrcFilterView.moc \
- YQPkgInstSrcList.moc \
+ YQPkgRepoFilterView.moc \
+ YQPkgRepoList.moc \
YQPkgLangList.moc \
YQPkgList.moc \
YQPkgObjList.moc \
@@ -124,8 +124,8 @@
YQPkgDiskUsageWarningDialog.o YQPkgDiskUsageWarningDialog.lo: YQPkgDiskUsageWarningDialog.moc
YQPkgFileListView.o YQPkgFileListView.lo: YQPkgFileListView.moc
YQPkgGenericDetailsView.o YQPkgGenericDetailsView.lo: YQPkgGenericDetailsView.moc
-YQPkgInstSrcFilterView.o YQPkgInstSrcFilterView.lo: YQPkgInstSrcFilterView.moc
-YQPkgInstSrcList.o YQPkgInstSrcList.lo: YQPkgInstSrcList.moc
+YQPkgRepoFilterView.o YQPkgRepoFilterView.lo: YQPkgRepoFilterView.moc
+YQPkgRepoList.o YQPkgRepoList.lo: YQPkgRepoList.moc
YQPkgLangList.o YQPkgLangList.lo: YQPkgLangList.moc
YQPkgList.o YQPkgList.lo: YQPkgList.moc
YQPkgObjList.o YQPkgObjList.lo: YQPkgObjList.moc
@@ -161,8 +161,8 @@
YQPkgDiskUsageWarningDialog.moc: YQPkgDiskUsageWarningDialog.h
YQPkgFileListView.moc: YQPkgFileListView.h
YQPkgGenericDetailsView.moc: YQPkgGenericDetailsView.h
-YQPkgInstSrcFilterView.moc: YQPkgInstSrcFilterView.h
-YQPkgInstSrcList.moc: YQPkgInstSrcList.h
+YQPkgRepoFilterView.moc: YQPkgRepoFilterView.h
+YQPkgRepoList.moc: YQPkgRepoList.h
YQPkgLangList.moc: YQPkgLangList.h
YQPkgList.moc: YQPkgList.h
YQPkgObjList.moc: YQPkgObjList.h
Modified: trunk/qt/src/pkg/YQPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelector.cc?rev=39617&r1=39616&r2=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPackageSelector.cc (original)
+++ trunk/qt/src/pkg/YQPackageSelector.cc Mon Jul 23 18:01:34 2007
@@ -59,8 +59,8 @@
#include "YQPkgDiskUsageList.h"
#include "YQPkgDiskUsageWarningDialog.h"
#include "YQPkgFileListView.h"
-#include "YQPkgInstSrcFilterView.h"
-#include "YQPkgInstSrcList.h"
+#include "YQPkgRepoFilterView.h"
+#include "YQPkgRepoList.h"
#include "YQPkgLangList.h"
#include "YQPkgList.h"
#include "YQPkgPatchFilterView.h"
@@ -106,7 +106,7 @@
_detailsViews = 0;
_diskUsageList = 0;
_filters = 0;
- _instSrcFilterView = 0;
+ _repoFilterView = 0;
_langList = 0;
_patternList = 0;
_pkgChangeLogView = 0;
@@ -152,12 +152,12 @@
_patchList->filter();
}
}
- else if ( _instSrcFilterView && _instSourcesMode )
+ else if ( _repoFilterView && _instSourcesMode )
{
- if ( YQPkgInstSrcList::countEnabledSources() > 1 )
+ if ( YQPkgRepoList::countEnabledSources() > 1 )
{
- _filters->showPage( _instSrcFilterView );
- _instSrcFilterView->filter();
+ _filters->showPage( _repoFilterView );
+ _repoFilterView->filter();
}
else if ( _searchFilterView )
{
@@ -371,9 +371,9 @@
// Repository view
//
- _instSrcFilterView = new YQPkgInstSrcFilterView( parent );
- CHECK_PTR( _instSrcFilterView );
- _filters->addPage( _( "Repositories" ), _instSrcFilterView );
+ _repoFilterView = new YQPkgRepoFilterView( parent );
+ CHECK_PTR( _repoFilterView );
+ _filters->addPage( _( "Repositories" ), _repoFilterView );
//
@@ -843,7 +843,7 @@
connectFilter( _updateProblemFilterView, _pkgList, false );
connectFilter( _patternList, _pkgList );
connectFilter( _selList, _pkgList );
- connectFilter( _instSrcFilterView, _pkgList, false );
+ connectFilter( _repoFilterView, _pkgList, false );
connectFilter( _rpmGroupTagsFilterView, _pkgList, false );
connectFilter( _langList, _pkgList );
connectFilter( _statusFilterView, _pkgList, false );
@@ -855,9 +855,9 @@
_pkgList, SLOT ( message( const QString & ) ) );
}
- if ( _instSrcFilterView && _pkgList )
+ if ( _repoFilterView && _pkgList )
{
- connect( _instSrcFilterView, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ),
+ connect( _repoFilterView, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ),
_pkgList, SLOT ( addPkgItemDimmed ( ZyppSel, ZyppPkg ) ) );
}
Modified: trunk/qt/src/pkg/YQPackageSelector.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelector.h?rev=39617&r1=39616&r2=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPackageSelector.h (original)
+++ trunk/qt/src/pkg/YQPackageSelector.h Mon Jul 23 18:01:34 2007
@@ -46,7 +46,7 @@
class YQPkgDescriptionView;
class YQPkgDiskUsageList;
class YQPkgFileListView;
-class YQPkgInstSrcFilterView;
+class YQPkgRepoFilterView;
class YQPkgLangList;
class YQPkgList;
class YQPkgPatternList;
@@ -307,7 +307,7 @@
YQPkgDependenciesView * _pkgDependenciesView;
YQPkgDescriptionView * _pkgDescriptionView;
YQPkgFileListView * _pkgFileListView;
- YQPkgInstSrcFilterView * _instSrcFilterView;
+ YQPkgRepoFilterView * _repoFilterView;
YQPkgLangList * _langList;
YQPkgList * _pkgList;
YQPkgPatternList * _patternList;
Copied: trunk/qt/src/pkg/YQPkgRepoFilterView.cc (from r39600, trunk/qt/src/pkg/YQPkgInstSrcFilterView.cc)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.cc?p2=trunk/qt/src/pkg/YQPkgRepoFilterView.cc&p1=trunk/qt/src/pkg/YQPkgInstSrcFilterView.cc&r1=39600&r2=39617&rev=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgInstSrcFilterView.cc (original)
+++ trunk/qt/src/pkg/YQPkgRepoFilterView.cc Mon Jul 23 18:01:34 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YQPkgInstSrcFilterView.cc
+ File: YQPkgRepoFilterView.cc
Author: Stefan Hundhammer
@@ -26,8 +26,8 @@
#include "QY2ComboTabWidget.h"
#include "QY2LayoutUtils.h"
-#include "YQPkgInstSrcFilterView.h"
-#include "YQPkgInstSrcList.h"
+#include "YQPkgRepoFilterView.h"
+#include "YQPkgRepoList.h"
#include "YQPkgRpmGroupTagsFilterView.h"
#include "YQPkgSearchFilterView.h"
#include "YQPkgStatusFilterView.h"
@@ -36,16 +36,16 @@
#define MARGIN 4
-YQPkgInstSrcFilterView::YQPkgInstSrcFilterView( QWidget * parent )
+YQPkgRepoFilterView::YQPkgRepoFilterView( QWidget * parent )
: QVBox( parent )
{
QSplitter * splitter = new QSplitter( QSplitter::Vertical, this );
CHECK_PTR( splitter );
QVBox * upper_vbox = new QVBox( splitter );
- _instSrcList = new YQPkgInstSrcList( upper_vbox );
- CHECK_PTR( _instSrcList );
- _instSrcList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert
+ _repoList = new YQPkgRepoList( upper_vbox );
+ CHECK_PTR( _repoList );
+ _repoList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert
addVSpacing( upper_vbox, MARGIN );
@@ -53,19 +53,19 @@
// Directly propagate signals filterStart() and filterFinished()
// from primary filter to the outside
- connect( _instSrcList, SIGNAL( filterStart() ),
+ connect( _repoList, SIGNAL( filterStart() ),
this, SIGNAL( filterStart() ) );
- connect( _instSrcList, SIGNAL( filterFinished() ),
+ connect( _repoList, SIGNAL( filterFinished() ),
this, SIGNAL( filterFinished() ) );
// Redirect filterMatch() and filterNearMatch() signals to secondary filter
- connect( _instSrcList, SIGNAL( filterMatch ( ZyppSel, ZyppPkg ) ),
+ connect( _repoList, SIGNAL( filterMatch ( ZyppSel, ZyppPkg ) ),
this, SLOT ( primaryFilterMatch ( ZyppSel, ZyppPkg ) ) );
- connect( _instSrcList, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ),
+ connect( _repoList, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ),
this, SLOT ( primaryFilterNearMatch ( ZyppSel, ZyppPkg ) ) );
#if 0
@@ -74,20 +74,20 @@
layoutSecondaryFilters( splitter );
#if 0
- splitter->setResizeMode( _instSrcList, QSplitter::Stretch );
+ splitter->setResizeMode( _repoList, QSplitter::Stretch );
splitter->setResizeMode( secondary_filters, QSplitter::FollowSizeHint );
#endif
}
-YQPkgInstSrcFilterView::~YQPkgInstSrcFilterView()
+YQPkgRepoFilterView::~YQPkgRepoFilterView()
{
// NOP
}
QWidget *
-YQPkgInstSrcFilterView::layoutSecondaryFilters( QWidget * parent )
+YQPkgRepoFilterView::layoutSecondaryFilters( QWidget * parent )
{
QVBox *vbox = new QVBox( parent );
CHECK_PTR( vbox );
@@ -123,7 +123,7 @@
_secondaryFilters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView );
connect( _rpmGroupTagsFilterView, SIGNAL( filterStart() ),
- _instSrcList, SLOT ( filter() ) );
+ _repoList, SLOT ( filter() ) );
//
@@ -135,7 +135,7 @@
_secondaryFilters->addPage( _( "Search" ), _searchFilterView );
connect( _searchFilterView, SIGNAL( filterStart() ),
- _instSrcList, SLOT ( filter() ) );
+ _repoList, SLOT ( filter() ) );
connect( _secondaryFilters, SIGNAL( currentChanged( QWidget * ) ),
this, SLOT ( filter() ) );
@@ -150,26 +150,26 @@
_secondaryFilters->addPage( _( "Installation Summary" ), _statusFilterView );
connect( _statusFilterView, SIGNAL( filterStart() ),
- _instSrcList, SLOT ( filter() ) );
+ _repoList, SLOT ( filter() ) );
return _secondaryFilters;
}
-void YQPkgInstSrcFilterView::filter()
+void YQPkgRepoFilterView::filter()
{
- _instSrcList->filter();
+ _repoList->filter();
}
-void YQPkgInstSrcFilterView::filterIfVisible()
+void YQPkgRepoFilterView::filterIfVisible()
{
- _instSrcList->filterIfVisible();
+ _repoList->filterIfVisible();
}
-void YQPkgInstSrcFilterView::primaryFilterMatch( ZyppSel selectable,
+void YQPkgRepoFilterView::primaryFilterMatch( ZyppSel selectable,
ZyppPkg pkg )
{
if ( secondaryFilterMatch( selectable, pkg ) )
@@ -177,7 +177,7 @@
}
-void YQPkgInstSrcFilterView::primaryFilterNearMatch( ZyppSel selectable,
+void YQPkgRepoFilterView::primaryFilterNearMatch( ZyppSel selectable,
ZyppPkg pkg )
{
if ( secondaryFilterMatch( selectable, pkg ) )
@@ -186,7 +186,7 @@
bool
-YQPkgInstSrcFilterView::secondaryFilterMatch( ZyppSel selectable,
+YQPkgRepoFilterView::secondaryFilterMatch( ZyppSel selectable,
ZyppPkg pkg )
{
if ( _allPackages->isVisible() )
@@ -216,4 +216,4 @@
-#include "YQPkgInstSrcFilterView.moc"
+#include "YQPkgRepoFilterView.moc"
Copied: trunk/qt/src/pkg/YQPkgRepoFilterView.h (from r39600, trunk/qt/src/pkg/YQPkgInstSrcFilterView.h)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.h?p2=trunk/qt/src/pkg/YQPkgRepoFilterView.h&p1=trunk/qt/src/pkg/YQPkgInstSrcFilterView.h&r1=39600&r2=39617&rev=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgInstSrcFilterView.h (original)
+++ trunk/qt/src/pkg/YQPkgRepoFilterView.h Mon Jul 23 18:01:34 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YQPkgInstSrcFilterView.h
+ File: YQPkgRepoFilterView.h
Author: Stefan Hundhammer
@@ -19,21 +19,21 @@
// -*- c++ -*-
-#ifndef YQPkgInstSrcFilterView_h
-#define YQPkgInstSrcFilterView_h
+#ifndef YQPkgRepoFilterView_h
+#define YQPkgRepoFilterView_h
#include "YQZypp.h"
#include
-class YQPkgInstSrcList;
+class YQPkgRepoList;
class QY2ComboTabWidget;
class YQPkgRpmGroupTagsFilterView;
class YQPkgSearchFilterView;
class YQPkgStatusFilterView;
-class YQPkgInstSrcFilterView : public QVBox
+class YQPkgRepoFilterView : public QVBox
{
Q_OBJECT
@@ -42,12 +42,12 @@
/**
* Constructor
**/
- YQPkgInstSrcFilterView( QWidget * parent );
+ YQPkgRepoFilterView( QWidget * parent );
/**
* Destructor
**/
- virtual ~YQPkgInstSrcFilterView();
+ virtual ~YQPkgRepoFilterView();
signals:
@@ -128,7 +128,7 @@
// Data members
- YQPkgInstSrcList * _instSrcList;
+ YQPkgRepoList * _repoList;
QY2ComboTabWidget * _secondaryFilters;
QWidget * _allPackages;
YQPkgRpmGroupTagsFilterView * _rpmGroupTagsFilterView;
@@ -138,4 +138,4 @@
-#endif // ifndef YQPkgInstSrcFilterView_h
+#endif // ifndef YQPkgRepoFilterView_h
Copied: trunk/qt/src/pkg/YQPkgRepoList.cc (from r39600, trunk/qt/src/pkg/YQPkgInstSrcList.cc)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.cc?p2=trunk/qt/src/pkg/YQPkgRepoList.cc&p1=trunk/qt/src/pkg/YQPkgInstSrcList.cc&r1=39600&r2=39617&rev=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgInstSrcList.cc (original)
+++ trunk/qt/src/pkg/YQPkgRepoList.cc Mon Jul 23 18:01:34 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YQPkgInstSrcList.cc
+ File: YQPkgRepoList.cc
Author: Stefan Hundhammer
@@ -24,7 +24,7 @@
#include
#include "YQi18n.h"
#include "utf8.h"
-#include "YQPkgInstSrcList.h"
+#include "YQPkgRepoList.h"
#include
#include <algorithm>
@@ -34,7 +34,7 @@
-YQPkgInstSrcList::YQPkgInstSrcList( QWidget * parent )
+YQPkgRepoList::YQPkgRepoList( QWidget * parent )
: QY2ListView( parent )
{
y2debug( "Creating repository list" );
@@ -61,14 +61,14 @@
}
-YQPkgInstSrcList::~YQPkgInstSrcList()
+YQPkgRepoList::~YQPkgRepoList()
{
// NOP
}
void
-YQPkgInstSrcList::fillList()
+YQPkgRepoList::fillList()
{
clear();
y2debug( "Filling repository list" );
@@ -77,7 +77,7 @@
it != ZyppRepositoriesEnd();
++it )
{
- addInstSrc( *it );
+ addRepo( *it );
}
y2debug( "Inst repository filled" );
@@ -85,14 +85,14 @@
int
-YQPkgInstSrcList::countEnabledSources()
+YQPkgRepoList::countEnabledSources()
{
return zyppPool().knownRepositoriesSize();
}
void
-YQPkgInstSrcList::filterIfVisible()
+YQPkgRepoList::filterIfVisible()
{
if ( isVisible() )
filter();
@@ -100,7 +100,7 @@
void
-YQPkgInstSrcList::filter()
+YQPkgRepoList::filter()
{
emit filterStart();
@@ -122,11 +122,11 @@
{
if ( item->isSelected() )
{
- YQPkgInstSrcListItem * instSrcItem = dynamic_cast (item);
+ YQPkgRepoListItem * repoItem = dynamic_cast (item);
- if ( instSrcItem )
+ if ( repoItem )
{
- ZyppSrc currentSrc = instSrcItem->zyppSrc();
+ ZyppRepo currentSrc = repoItem->zyppSrc();
for ( ZyppPoolIterator sel_it = zyppPkgBegin();
sel_it != zyppPkgEnd();
@@ -193,21 +193,21 @@
void
-YQPkgInstSrcList::addInstSrc( ZyppSrc src )
+YQPkgRepoList::addRepo( ZyppRepo src )
{
- new YQPkgInstSrcListItem( this, src );
+ new YQPkgRepoListItem( this, src );
}
-YQPkgInstSrcListItem *
-YQPkgInstSrcList::selection() const
+YQPkgRepoListItem *
+YQPkgRepoList::selection() const
{
QListViewItem * item = selectedItem();
if ( ! item )
return 0;
- return dynamic_cast (item);
+ return dynamic_cast (item);
}
@@ -215,10 +215,10 @@
-YQPkgInstSrcListItem::YQPkgInstSrcListItem( YQPkgInstSrcList * instSrcList,
- ZyppSrc src )
- : QY2ListViewItem( instSrcList )
- , _instSrcList( instSrcList )
+YQPkgRepoListItem::YQPkgRepoListItem( YQPkgRepoList * repoList,
+ ZyppRepo src )
+ : QY2ListViewItem( repoList )
+ , _repoList( repoList )
, _zyppSrc( src )
{
if ( nameCol() >= 0 )
@@ -248,14 +248,14 @@
-YQPkgInstSrcListItem::~YQPkgInstSrcListItem()
+YQPkgRepoListItem::~YQPkgRepoListItem()
{
// NOP
}
ZyppProduct
-YQPkgInstSrcListItem::singleProduct( ZyppSrc zyppSrc )
+YQPkgRepoListItem::singleProduct( ZyppRepo zyppSrc )
{
ZyppProduct product;
@@ -297,4 +297,4 @@
-#include "YQPkgInstSrcList.moc"
+#include "YQPkgRepoList.moc"
Copied: trunk/qt/src/pkg/YQPkgRepoList.h (from r39600, trunk/qt/src/pkg/YQPkgInstSrcList.h)
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.h?p2=trunk/qt/src/pkg/YQPkgRepoList.h&p1=trunk/qt/src/pkg/YQPkgInstSrcList.h&r1=39600&r2=39617&rev=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgInstSrcList.h (original)
+++ trunk/qt/src/pkg/YQPkgRepoList.h Mon Jul 23 18:01:34 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YQPkgInstSrcList.h
+ File: YQPkgRepoList.h
Author: Stefan Hundhammer
@@ -19,8 +19,8 @@
// -*- c++ -*-
-#ifndef YQPkgInstSrcList_h
-#define YQPkgInstSrcList_h
+#ifndef YQPkgRepoList_h
+#define YQPkgRepoList_h
#include "YQZypp.h"
#include "QY2ListView.h"
@@ -28,15 +28,15 @@
#include
-class YQPkgInstSrcListItem;
+class YQPkgRepoListItem;
-typedef zypp::Repository ZyppSrc;
+typedef zypp::Repository ZyppRepo;
/**
* @short Display a list of zypp::Selection objects.
**/
-class YQPkgInstSrcList : public QY2ListView
+class YQPkgRepoList : public QY2ListView
{
Q_OBJECT
@@ -45,12 +45,12 @@
/**
* Constructor
**/
- YQPkgInstSrcList( QWidget * parent );
+ YQPkgRepoList( QWidget * parent );
/**
* Destructor
**/
- virtual ~YQPkgInstSrcList();
+ virtual ~YQPkgRepoList();
/**
* Returns the number of enabled installation sources.
@@ -77,7 +77,7 @@
/**
* Add an inst source to the list.
**/
- void addInstSrc( ZyppSrc src );
+ void addRepo( ZyppRepo src );
public:
@@ -91,7 +91,7 @@
/**
* Returns the currently selected item or 0 if there is none.
**/
- YQPkgInstSrcListItem * selection() const;
+ YQPkgRepoListItem * selection() const;
signals:
@@ -143,49 +143,49 @@
-class YQPkgInstSrcListItem: public QY2ListViewItem
+class YQPkgRepoListItem: public QY2ListViewItem
{
public:
/**
* Constructor
**/
- YQPkgInstSrcListItem( YQPkgInstSrcList *parentList, ZyppSrc src );
+ YQPkgRepoListItem( YQPkgRepoList *parentList, ZyppRepo src );
/**
* Destructor
**/
- virtual ~YQPkgInstSrcListItem();
+ virtual ~YQPkgRepoListItem();
/**
* Returns the ZYPP source this item corresponds to
**/
- ZyppSrc zyppSrc() const { return _zyppSrc; }
+ ZyppRepo zyppSrc() const { return _zyppSrc; }
/**
* Returns the parent list
**/
- const YQPkgInstSrcList * instSrcList() const { return _instSrcList; }
+ const YQPkgRepoList * repoList() const { return _repoList; }
/**
* Returns the product on a source if it has one single product
* or 0 if there are no or multiple products.
**/
- static ZyppProduct singleProduct( ZyppSrc src );
+ static ZyppProduct singleProduct( ZyppRepo src );
// Columns
- int nameCol() const { return _instSrcList->nameCol(); }
- int urlCol() const { return _instSrcList->urlCol(); }
+ int nameCol() const { return _repoList->nameCol(); }
+ int urlCol() const { return _repoList->urlCol(); }
protected:
// Data members
- YQPkgInstSrcList * _instSrcList;
- ZyppSrc _zyppSrc;
+ YQPkgRepoList * _repoList;
+ ZyppRepo _zyppSrc;
};
-#endif // ifndef YQPkgInstSrcList_h
+#endif // ifndef YQPkgRepoList_h
Modified: trunk/qt/src/pkg/YQPkgVersionsView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.cc?rev=39617&r1=39616&r2=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgVersionsView.cc (original)
+++ trunk/qt/src/pkg/YQPkgVersionsView.cc Mon Jul 23 18:01:34 2007
@@ -28,7 +28,7 @@
#include
#include "YQPkgVersionsView.h"
-#include "YQPkgInstSrcList.h"
+#include "YQPkgRepoList.h"
#include "YQIconPool.h"
#include "YQi18n.h"
#include "utf8.h"
@@ -45,7 +45,7 @@
_archCol = -42;
_productCol = -42;
_urlCol = -42;
- _instSrcCol = -42;
+ _repoCol = -42;
_statusCol = -42;
_nameCol = -42;
_summaryCol = -42;
@@ -54,12 +54,12 @@
addColumn( _( "Version" ) ); _versionCol = numCol++;
addColumn( _( "Arch." ) ); _archCol = numCol++;
addColumn( _( "Product" ) ); _productCol = numCol++;
- addColumn( _( "Repository" ) ); _instSrcCol = numCol++;
+ addColumn( _( "Repository" ) ); _repoCol = numCol++;
addColumn( _( "URL" ) ); _urlCol = numCol++;
_statusCol = _productCol;
_nameCol = _versionCol;
- _summaryCol = _instSrcCol;
+ _summaryCol = _repoCol;
// saveColumnWidths(); // Minimize column widths
// header()->hide();
@@ -248,10 +248,10 @@
if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() );
if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() );
- if ( instSrcCol() >= 0 ) setText( instSrcCol(), zyppObj->repository().info().alias().c_str() );
+ if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() );
if ( productCol() >= 0 )
{
- ZyppProduct product = YQPkgInstSrcListItem::singleProduct( zyppObj->repository() );
+ ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() );
if ( product )
setText( productCol(), product->summary() );
Modified: trunk/qt/src/pkg/YQPkgVersionsView.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.h?rev=39617&r1=39616&r2=39617&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgVersionsView.h (original)
+++ trunk/qt/src/pkg/YQPkgVersionsView.h Mon Jul 23 18:01:34 2007
@@ -66,7 +66,7 @@
int archCol() const { return _archCol; }
int productCol() const { return _productCol; }
int urlCol() const { return _urlCol; }
- int instSrcCol() const { return _instSrcCol; }
+ int repoCol() const { return _repoCol; }
int nameCol() const { return _nameCol; }
int summaryCol() const { return _summaryCol; }
int statusCol() const { return _statusCol; }
@@ -124,7 +124,7 @@
int _archCol;
int _productCol;
int _urlCol;
- int _instSrcCol;
+ int _repoCol;
int _nameCol;
int _summaryCol;
int _statusCol;
@@ -187,7 +187,7 @@
int versionCol() const { return _pkgVersionList->versionCol(); }
int productCol() const { return _pkgVersionList->productCol(); }
int urlCol() const { return _pkgVersionList->urlCol(); }
- int instSrcCol() const { return _pkgVersionList->instSrcCol(); }
+ int repoCol() const { return _pkgVersionList->repoCol(); }
int statusCol() const { return _pkgVersionList->statusCol(); }
int archCol() const { return _pkgVersionList->archCol(); }
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
