| -rw-r--r-- | noncore/settings/packagemanager/oconfitem.h | 7 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 7 | ||||
| -rw-r--r-- | noncore/settings/packagemanager/opie-packagemanager.control | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h index 7b52ce4..9972c00 100644 --- a/noncore/settings/packagemanager/oconfitem.h +++ b/noncore/settings/packagemanager/oconfitem.h @@ -37,14 +37,9 @@ _;:, .> :=|. This program is free software; you can class OConfItem { public: - enum Type { Source=0x01, - GzSource=0x02, - Destination=0x04, - Option=0x08, - Arch=0x10, - NotDefined=0x20 }; + enum Type { Source, Destination, Option, Arch, NotDefined }; OConfItem( Type type = NotDefined, const QString &name = QString::null, const QString &value = QString::null, const QString &features = QString::null, bool active = true ); diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index a885ef8..f2d7e39 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp @@ -113,10 +113,9 @@ OConfItemList *OIpkg::configItems() OConfItemList *OIpkg::servers() { // Retrieve only servers - return filterConfItems( (OConfItem::Type)((int)OConfItem::Source | - (int)OConfItem::GzSource) ); + return filterConfItems( OConfItem::Source ); } OConfItemList *OIpkg::destinations() { @@ -543,9 +542,8 @@ void OIpkg::loadConfiguration() if ( !line.isEmpty() ) { if ( !line.startsWith( "#" ) || line.startsWith( "#src" ) || - line.startsWith( "#src/gz" ) || line.startsWith( "#dest" ) || line.startsWith( "#arch" ) || line.startsWith( "#option" ) ) { @@ -619,10 +617,9 @@ OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter ) OConfItemListIterator it( *m_confInfo ); for ( ; it.current(); ++it ) { OConfItem *item = it.current(); - if ( retrieveAll || - ( item->type() & typefilter ) ) + if ( retrieveAll || item->type() == typefilter ) { sl->append( item ); } } diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control index 0153d40..da3ddfe 100644 --- a/noncore/settings/packagemanager/opie-packagemanager.control +++ b/noncore/settings/packagemanager/opie-packagemanager.control @@ -1,10 +1,10 @@ Package: opie-packagemanager Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop Priority: optional Section: opie/settings -Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg0 (>=0.99.120), ipkg-link +Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120) Replaces: packagemanager Architecture: arm Maintainer: Dan Williams (drw@handhelds.org) Description: Opie package management client -Version: $QPE_VERSION$EXTRAVERSION +Version: 0.6.1$EXTRAVERSION |