aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-05 23:31:18 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-05 23:31:18 +0000
commite5f11c45d88ca843235be6a10cc97f580f674513 (patch)
treedb287fae60bbf68a4598ff2f164cabc7816e7ecf
parenta956e534b82aaab7f5af468f353134af96cf7e75 (diff)
downloadpaludis-e5f11c45d88ca843235be6a10cc97f580f674513.tar.gz
paludis-e5f11c45d88ca843235be6a10cc97f580f674513.tar.xz
Fix gtkpaludis for PackageIDs, new collections. Fixes: ticket:302
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc18
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/categories_list_model.hh3
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/package_buttons.hh1
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_list_filtered_model.hh2
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc96
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_list_model.hh4
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc1
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_page.hh1
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc9
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.hh2
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc1
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc9
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.hh3
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc5
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc20
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/sets_list_model.hh3
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc40
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.hh5
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/versions_list.cc8
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc37
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/versions_list_model.hh5
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/versions_page.cc12
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/versions_page.hh7
23 files changed, 139 insertions, 153 deletions
diff --git a/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
index c9c13c7..ca2aa90 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
@@ -3,9 +3,10 @@
#include "categories_list_model.hh"
#include "main_window.hh"
#include "packages_page.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/set.hh>
+#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -51,18 +52,17 @@ CategoriesListModel::populate()
void
CategoriesListModel::populate_in_paludis_thread()
{
- paludis::tr1::shared_ptr<CategoryNamePartCollection> columns(
- new CategoryNamePartCollection::Concrete);
+ paludis::tr1::shared_ptr<CategoryNamePartSet> columns(new CategoryNamePartSet);
- paludis::tr1::shared_ptr<RepositoryNameCollection> repos(
+ paludis::tr1::shared_ptr<RepositoryNameSequence> repos(
_imp->packages_page->get_repository_filter()->repositories(*_imp->main_window->environment()));
if (repos)
{
- for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
+ for (RepositoryNameSequence::Iterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
{
- paludis::tr1::shared_ptr<const CategoryNamePartCollection> cats(
+ paludis::tr1::shared_ptr<const CategoryNamePartSet> cats(
_imp->main_window->environment()->package_database()->fetch_repository(*r)->category_names());
std::copy(cats->begin(), cats->end(), columns->inserter());
}
@@ -74,7 +74,7 @@ CategoriesListModel::populate_in_paludis_thread()
r_end(indirect_iterator(_imp->main_window->environment()->package_database()->end_repositories())) ;
r != r_end ; ++r)
{
- paludis::tr1::shared_ptr<const CategoryNamePartCollection> cats(r->category_names());
+ paludis::tr1::shared_ptr<const CategoryNamePartSet> cats(r->category_names());
std::copy(cats->begin(), cats->end(), columns->inserter());
}
}
@@ -84,10 +84,10 @@ CategoriesListModel::populate_in_paludis_thread()
}
void
-CategoriesListModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const CategoryNamePartCollection> names)
+CategoriesListModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const CategoryNamePartSet> names)
{
clear();
- for (CategoryNamePartCollection::Iterator n(names->begin()), n_end(names->end()) ;
+ for (CategoryNamePartSet::Iterator n(names->begin()), n_end(names->end()) ;
n != n_end ; ++n)
(*append())[_imp->columns.col_cat_name] = stringify(*n);
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.hh b/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.hh
index 1ff1e0e..4b1aefc 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.hh
@@ -5,6 +5,7 @@
#include <gtkmm/liststore.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/name.hh>
namespace gtkpaludis
@@ -18,7 +19,7 @@ namespace gtkpaludis
{
protected:
void populate_in_paludis_thread();
- void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::CategoryNamePartCollection> names);
+ void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::CategoryNamePartSet> names);
public:
CategoriesListModel(MainWindow * const m, PackagesPage * const p);
diff --git a/src/clients/gtkpaludis/libgtkpaludis/package_buttons.hh b/src/clients/gtkpaludis/libgtkpaludis/package_buttons.hh
index 6794206..d8a184a 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/package_buttons.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/package_buttons.hh
@@ -5,6 +5,7 @@
#include <gtkmm/buttonbox.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/name.hh>
namespace gtkpaludis
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_list_filtered_model.hh b/src/clients/gtkpaludis/libgtkpaludis/packages_list_filtered_model.hh
index 90d5acc..679dfe4 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_list_filtered_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_list_filtered_model.hh
@@ -5,8 +5,8 @@
#include <gtkmm/treemodelfilter.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/name.hh>
-#include <paludis/package_database_entry.hh>
namespace gtkpaludis
{
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
index 5375ead..f73f512 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
@@ -7,7 +7,7 @@
#include <paludis/dep_spec_flattener.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
-#include <paludis/util/collection_concrete.hh>
+#include <paludis/metadata_key.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
@@ -127,70 +127,69 @@ PackagesListModel::populate()
namespace
{
PopulateItem make_item(const PackageDepSpec & pds,
- const QualifiedPackageName & qpn,
- paludis::tr1::shared_ptr<const VersionMetadata> metadata,
+ const tr1::shared_ptr<const PackageID> & id,
const Environment * const environment)
{
PackagesPackageFilterOption best_option(ppfo_all_packages);
std::string status;
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> ci(
+ paludis::tr1::shared_ptr<const PackageIDSequence> ci(
environment->package_database()->query(
query::InstalledAtRoot(environment->root()) &
query::Matches(pds) &
query::Matches(PackageDepSpec(
- paludis::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(qpn)),
+ paludis::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(id->name())),
paludis::tr1::shared_ptr<CategoryNamePart>(),
paludis::tr1::shared_ptr<PackageNamePart>(),
paludis::tr1::shared_ptr<VersionRequirements>(),
vr_and,
- paludis::tr1::shared_ptr<SlotName>(new SlotName(metadata->slot)))),
+ paludis::tr1::shared_ptr<SlotName>(new SlotName(id->slot())))),
qo_order_by_version));
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> av(
+ paludis::tr1::shared_ptr<const PackageIDSequence> av(
environment->package_database()->query(
query::RepositoryHasInstallableInterface() &
query::Matches(pds) &
query::Matches(PackageDepSpec(
- paludis::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(qpn)),
+ paludis::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(id->name())),
paludis::tr1::shared_ptr<CategoryNamePart>(),
paludis::tr1::shared_ptr<PackageNamePart>(),
paludis::tr1::shared_ptr<VersionRequirements>(),
vr_and,
- paludis::tr1::shared_ptr<SlotName>(new SlotName(metadata->slot)))) &
+ paludis::tr1::shared_ptr<SlotName>(new SlotName(id->slot())))) &
query::NotMasked(),
qo_order_by_version));
if (! ci->empty())
{
- status = markup_escape(stringify(ci->last()->version));
+ status = markup_escape(((*ci->last())->canonical_form(idcf_version)));
best_option = ppfo_installed_packages;
if (! av->empty())
{
- if (av->last()->version < ci->last()->version)
+ if ((*av->last())->version() < (*ci->last())->version())
{
- status.append(markup_bold(markup_escape(" > " + stringify(av->last()->version))));
+ status.append(markup_bold(markup_escape(" > " + (*av->last())->canonical_form(idcf_version))));
best_option = ppfo_upgradable_packages;
}
- else if (av->last()->version > ci->last()->version)
+ else if ((*av->last())->version() > (*ci->last())->version())
{
- status.append(markup_bold(markup_escape(" < " + stringify(av->last()->version))));
+ status.append(markup_bold(markup_escape(" < " + (*av->last())->canonical_form(idcf_version))));
best_option = ppfo_upgradable_packages;
}
}
}
else
{
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> av(
+ paludis::tr1::shared_ptr<const PackageIDSequence> av(
environment->package_database()->query(
query::Matches(pds) &
query::Matches(PackageDepSpec(
- paludis::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(qpn)),
+ paludis::tr1::shared_ptr<QualifiedPackageName>(new QualifiedPackageName(id->name())),
paludis::tr1::shared_ptr<CategoryNamePart>(),
paludis::tr1::shared_ptr<PackageNamePart>(),
paludis::tr1::shared_ptr<VersionRequirements>(),
vr_and,
- paludis::tr1::shared_ptr<SlotName>(new SlotName(metadata->slot)))) &
+ paludis::tr1::shared_ptr<SlotName>(new SlotName(id->slot())))) &
query::RepositoryHasInstallableInterface() &
query::NotMasked(),
qo_order_by_version));
@@ -201,15 +200,18 @@ namespace
}
else
{
- status.append(markup_foreground("grey", markup_escape(stringify(av->last()->version))));
+ status.append(markup_foreground("grey", markup_escape((*av->last())->canonical_form(idcf_version))));
best_option = ppfo_visible_packages;
}
}
- PopulateItem result(stringify(metadata->slot));
+ PopulateItem result(stringify(id->slot()));
result.status_markup = status;
- result.description = metadata->description;
- result.qpn = make_shared_ptr(new QualifiedPackageName(qpn));
+ if (id->short_description_key())
+ result.description = id->short_description_key()->value();
+ else
+ result.description = "(no description)";
+ result.qpn = make_shared_ptr(new QualifiedPackageName(id->name()));
result.local_best_option = best_option;
return result;
}
@@ -222,7 +224,7 @@ PackagesListModel::populate_in_paludis_thread()
if (_imp->packages_page->get_category())
{
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> c(
+ paludis::tr1::shared_ptr<const PackageIDSequence> c(
_imp->main_window->environment()->package_database()->query(
*_imp->packages_page->get_repository_filter() &
query::Category(*_imp->packages_page->get_category()),
@@ -230,31 +232,27 @@ PackagesListModel::populate_in_paludis_thread()
QualifiedPackageName old_qpn("OLD/OLD");
- for (PackageDatabaseEntryCollection::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
+ for (PackageIDSequence::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
p != p_end ; ++p)
{
- paludis::tr1::shared_ptr<const VersionMetadata> metadata(
- _imp->main_window->environment()->package_database()->fetch_repository(p->repository)->version_metadata(
- p->name, p->version));
-
- if (old_qpn != p->name)
+ if (old_qpn != (*p)->name())
{
- data->items.push_front(PopulateItem(stringify(p->name.package)));
+ data->items.push_front(PopulateItem(stringify((*p)->name().package)));
data->items.begin()->children.push_front(make_item(
- PackageDepSpec(make_shared_ptr(new QualifiedPackageName(p->name))),
- p->name, metadata, _imp->main_window->environment()));
+ PackageDepSpec(make_shared_ptr(new QualifiedPackageName((*p)->name()))),
+ *p, _imp->main_window->environment()));
data->items.begin()->qpn = data->items.begin()->children.begin()->qpn;
- old_qpn = p->name;
+ old_qpn = (*p)->name();
}
else
data->items.begin()->children.push_front(make_item(
- PackageDepSpec(make_shared_ptr(new QualifiedPackageName(p->name))),
- p->name, metadata, _imp->main_window->environment()));
+ PackageDepSpec(make_shared_ptr(new QualifiedPackageName((*p)->name()))),
+ *p, _imp->main_window->environment()));
}
}
else if (_imp->packages_page->get_set())
{
- DepSpecFlattener f(_imp->main_window->environment(), 0);
+ DepSpecFlattener f(_imp->main_window->environment(), tr1::shared_ptr<const PackageID>());
_imp->main_window->environment()->set(*_imp->packages_page->get_set())->accept(f);
std::set<std::string> a;
std::transform(indirect_iterator(f.begin()), indirect_iterator(f.end()), std::inserter(a, a.begin()),
@@ -268,27 +266,23 @@ PackagesListModel::populate_in_paludis_thread()
PackageDepSpec ds(*i, pds_pm_unspecific);
if (ds.package_ptr())
{
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> c(
+ paludis::tr1::shared_ptr<const PackageIDSequence> c(
_imp->main_window->environment()->package_database()->query(
*_imp->packages_page->get_repository_filter() &
query::Matches(ds),
qo_best_version_in_slot_only));
- for (PackageDatabaseEntryCollection::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
+ for (PackageIDSequence::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
p != p_end ; ++p)
{
- paludis::tr1::shared_ptr<const VersionMetadata> metadata(
- _imp->main_window->environment()->package_database()->fetch_repository(p->repository)->version_metadata(
- p->name, p->version));
-
atom_iter->children.push_back(make_item(ds,
- p->name, metadata, _imp->main_window->environment()));
+ *p, _imp->main_window->environment()));
atom_iter->qpn = atom_iter->children.back().qpn;
}
}
else
{
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> c(
+ paludis::tr1::shared_ptr<const PackageIDSequence> c(
_imp->main_window->environment()->package_database()->query(
*_imp->packages_page->get_repository_filter() &
query::Matches(ds),
@@ -297,24 +291,20 @@ PackagesListModel::populate_in_paludis_thread()
QualifiedPackageName old_qpn("OLD/OLD");
std::list<PopulateItem>::iterator pkg_iter;
- for (PackageDatabaseEntryCollection::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
+ for (PackageIDSequence::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
p != p_end ; ++p)
{
- paludis::tr1::shared_ptr<const VersionMetadata> metadata(
- _imp->main_window->environment()->package_database()->fetch_repository(p->repository)->version_metadata(
- p->name, p->version));
-
- if (old_qpn != p->name)
+ if (old_qpn != (*p)->name())
{
- pkg_iter = atom_iter->children.insert(atom_iter->children.end(), PopulateItem(stringify(p->name)));
+ pkg_iter = atom_iter->children.insert(atom_iter->children.end(), PopulateItem(stringify((*p)->name())));
pkg_iter->children.push_back(make_item(ds,
- p->name, metadata, _imp->main_window->environment()));
+ *p, _imp->main_window->environment()));
pkg_iter->qpn = pkg_iter->children.back().qpn;
- old_qpn = p->name;
+ old_qpn = (*p)->name();
}
else
pkg_iter->children.push_front(make_item(ds,
- p->name, metadata, _imp->main_window->environment()));
+ *p, _imp->main_window->environment()));
}
}
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.hh b/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.hh
index 74e135a..6125132 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.hh
@@ -5,9 +5,9 @@
#include <gtkmm/treestore.h>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/name.hh>
-#include <paludis/package_database_entry.hh>
#include <paludis/util/tr1_functional.hh>
+#include <paludis/util/tr1_memory.hh>
+#include <paludis/name.hh>
#include <libgtkpaludis/packages_package_filter_option.hh>
namespace gtkpaludis
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc
index 67c7536..3c53357 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc
@@ -2,7 +2,6 @@
#include "packages_package_filter_model.hh"
#include "main_window.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/environment.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_page.hh b/src/clients/gtkpaludis/libgtkpaludis/packages_page.hh
index e6b4fcb..724664b 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_page.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_page.hh
@@ -6,7 +6,6 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/name.hh>
#include <paludis/query.hh>
-#include <paludis/package_database_entry.hh>
#include <libgtkpaludis/main_notebook_page.hh>
#include <libgtkpaludis/packages_package_filter_option.hh>
#include <libgtkpaludis/packages_text_filter_source_option.hh>
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
index cdb142a..9541c24 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
@@ -2,9 +2,9 @@
#include "packages_repository_filter_model.hh"
#include "main_window.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/iterator.hh>
+#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
@@ -66,8 +66,7 @@ PackagesRepositoryFilterModel::populate()
void
PackagesRepositoryFilterModel::populate_in_paludis_thread()
{
- paludis::tr1::shared_ptr<RepositoryNameCollection> columns(
- new RepositoryNameCollection::Concrete);
+ paludis::tr1::shared_ptr<RepositoryNameSequence> columns(new RepositoryNameSequence);
for (IndirectIterator<PackageDatabase::RepositoryIterator>
r(indirect_iterator(_imp->main_window->environment()->package_database()->begin_repositories())),
@@ -80,13 +79,13 @@ PackagesRepositoryFilterModel::populate_in_paludis_thread()
}
void
-PackagesRepositoryFilterModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const RepositoryNameCollection> names)
+PackagesRepositoryFilterModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const RepositoryNameSequence> names)
{
iterator repositories(append());
(*repositories)[_imp->columns.col_text] = "Specific repository";
(*repositories)[_imp->columns.col_sensitive] = false;
- for (RepositoryNameCollection::Iterator n(names->begin()), n_end(names->end()) ;
+ for (RepositoryNameSequence::Iterator n(names->begin()), n_end(names->end()) ;
n != n_end ; ++n)
{
iterator r(append(repositories->children()));
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.hh b/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.hh
index 6b2f97b..6d50a35 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.hh
@@ -18,7 +18,7 @@ namespace gtkpaludis
{
protected:
void populate_in_paludis_thread();
- void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::RepositoryNameCollection> names);
+ void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::RepositoryNameSequence> names);
public:
PackagesRepositoryFilterModel(MainWindow * const m);
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc
index cbd8208..c9292cd 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc
@@ -2,7 +2,6 @@
#include "packages_text_filter_source_model.hh"
#include "main_window.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
diff --git a/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
index 933f059..7e2b5c5 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
@@ -2,9 +2,9 @@
#include "repositories_list_model.hh"
#include "main_window.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -48,8 +48,7 @@ RepositoriesListModel::populate()
void
RepositoriesListModel::populate_in_paludis_thread()
{
- paludis::tr1::shared_ptr<RepositoryNameCollection> columns(
- new RepositoryNameCollection::Concrete);
+ tr1::shared_ptr<RepositoryNameSequence> columns(new RepositoryNameSequence);
for (IndirectIterator<PackageDatabase::RepositoryIterator>
r(indirect_iterator(_imp->main_window->environment()->package_database()->begin_repositories())),
@@ -62,10 +61,10 @@ RepositoriesListModel::populate_in_paludis_thread()
}
void
-RepositoriesListModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const RepositoryNameCollection> names)
+RepositoriesListModel::populate_in_gui_thread(tr1::shared_ptr<const RepositoryNameSequence> names)
{
clear();
- for (RepositoryNameCollection::Iterator n(names->begin()), n_end(names->end()) ;
+ for (RepositoryNameSequence::Iterator n(names->begin()), n_end(names->end()) ;
n != n_end ; ++n)
(*append())[_imp->columns.col_repo_name] = stringify(*n);
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.hh b/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.hh
index 625c3cc..49fa5ed 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.hh
@@ -5,6 +5,7 @@
#include <gtkmm/liststore.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/name.hh>
namespace gtkpaludis
@@ -17,7 +18,7 @@ namespace gtkpaludis
{
protected:
void populate_in_paludis_thread();
- void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::RepositoryNameCollection> names);
+ void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::RepositoryNameSequence> names);
public:
RepositoriesListModel(MainWindow * const m);
diff --git a/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
index a829a5c..eaec448 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
@@ -5,6 +5,7 @@
#include <paludis/repository.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
+#include <paludis/repository_info.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -49,7 +50,7 @@ RepositoryInfoModel::set_repository(const RepositoryName & name)
void
RepositoryInfoModel::set_repository_in_paludis_thread(const RepositoryName & name)
{
- paludis::tr1::shared_ptr<const RepositoryInfo> info(
+ tr1::shared_ptr<const RepositoryInfo> info(
_imp->main_window->environment()->package_database()->fetch_repository(name)->info(true));
_imp->main_window->gui_thread_action(
@@ -57,7 +58,7 @@ RepositoryInfoModel::set_repository_in_paludis_thread(const RepositoryName & nam
}
void
-RepositoryInfoModel::set_repository_in_gui_thread(paludis::tr1::shared_ptr<const RepositoryInfo> info)
+RepositoryInfoModel::set_repository_in_gui_thread(tr1::shared_ptr<const RepositoryInfo> info)
{
clear();
for (IndirectIterator<RepositoryInfo::SectionIterator>
diff --git a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
index d81853c..b798278 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
@@ -3,9 +3,10 @@
#include "sets_list_model.hh"
#include "main_window.hh"
#include "packages_page.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/set.hh>
+#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -51,21 +52,20 @@ SetsListModel::populate()
void
SetsListModel::populate_in_paludis_thread()
{
- paludis::tr1::shared_ptr<SetNameCollection> columns(
- new SetNameCollection::Concrete);
+ tr1::shared_ptr<SetNameSet> columns(new SetNameSet);
- paludis::tr1::shared_ptr<RepositoryNameCollection> repos(
+ tr1::shared_ptr<RepositoryNameSequence> repos(
_imp->packages_page->get_repository_filter()->repositories(*_imp->main_window->environment()));
if (repos)
{
- for (RepositoryNameCollection::Iterator r(repos->begin()), r_end(repos->end()) ;
+ for (RepositoryNameSequence::Iterator r(repos->begin()), r_end(repos->end()) ;
r != r_end ; ++r)
{
RepositorySetsInterface * const i(_imp->main_window->environment()->package_database()->fetch_repository(*r)->sets_interface);
if (i)
{
- paludis::tr1::shared_ptr<const SetNameCollection> sets(i->sets_list());
+ tr1::shared_ptr<const SetNameSet> sets(i->sets_list());
std::copy(sets->begin(), sets->end(), columns->inserter());
}
}
@@ -80,13 +80,13 @@ SetsListModel::populate_in_paludis_thread()
RepositorySetsInterface * const i(r->sets_interface);
if (i)
{
- paludis::tr1::shared_ptr<const SetNameCollection> sets(i->sets_list());
+ tr1::shared_ptr<const SetNameSet> sets(i->sets_list());
std::copy(sets->begin(), sets->end(), columns->inserter());
}
}
}
- tr1::shared_ptr<const SetNameCollection> sets(_imp->main_window->environment()->set_names());
+ tr1::shared_ptr<const SetNameSet> sets(_imp->main_window->environment()->set_names());
std::copy(sets->begin(), sets->end(), columns->inserter());
_imp->main_window->gui_thread_action(
@@ -94,10 +94,10 @@ SetsListModel::populate_in_paludis_thread()
}
void
-SetsListModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const SetNameCollection> names)
+SetsListModel::populate_in_gui_thread(tr1::shared_ptr<const SetNameSet> names)
{
clear();
- for (SetNameCollection::Iterator n(names->begin()), n_end(names->end()) ;
+ for (SetNameSet::Iterator n(names->begin()), n_end(names->end()) ;
n != n_end ; ++n)
(*append())[_imp->columns.col_set_name] = stringify(*n);
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.hh b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.hh
index 882e26b..00d0e5b 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.hh
@@ -5,6 +5,7 @@
#include <gtkmm/liststore.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/name.hh>
namespace gtkpaludis
@@ -18,7 +19,7 @@ namespace gtkpaludis
{
protected:
void populate_in_paludis_thread();
- void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::SetNameCollection> names);
+ void populate_in_gui_thread(paludis::tr1::shared_ptr<const paludis::SetNameSet> names);
public:
SetsListModel(MainWindow * const m, PackagesPage * const p);
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
index ef4fa80..dd725a1 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
@@ -4,14 +4,15 @@
#include "query_window.hh"
#include "versions_page.hh"
#include "markup.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/visitor-impl.hh>
+#include <paludis/util/set.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/query.hh>
#include <paludis/eapi.hh>
+#include <paludis/metadata_key.hh>
#include <paludis/dep_spec_pretty_printer.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
@@ -92,41 +93,40 @@ VersionInfoModel::populate()
{
_imp->query_window->paludis_thread_action(
sigc::bind(sigc::mem_fun(this, &VersionInfoModel::populate_in_paludis_thread),
- _imp->versions_page->get_pde()), "Populating version information model");
+ _imp->versions_page->get_id()), "Populating version information model");
}
void
-VersionInfoModel::populate_in_paludis_thread(paludis::tr1::shared_ptr<const PackageDatabaseEntry> p)
+VersionInfoModel::populate_in_paludis_thread(tr1::shared_ptr<const PackageID> p)
{
- paludis::tr1::shared_ptr<PopulateData> data(new PopulateData);
+ tr1::shared_ptr<PopulateData> data(new PopulateData);
if (p)
{
- paludis::tr1::shared_ptr<const VersionMetadata> metadata(
- _imp->query_window->environment()->package_database()->fetch_repository(p->repository)->version_metadata(
- p->name, p->version));
-
- if (metadata->eapi->supported)
+ if (p->eapi()->supported)
{
- if (! metadata->description.empty())
- data->items.push_back(PopulateDataItem("Description", markup_escape(metadata->description)));
+ if (p->short_description_key())
+ data->items.push_back(PopulateDataItem("Description", markup_escape(p->short_description_key()->value())));
- DepSpecPrettyPrinter homepage_printer(0, false);
- metadata->homepage()->accept(homepage_printer);
- if (! stringify(homepage_printer).empty())
- data->items.push_back(PopulateDataItem("Homepage", markup_escape(stringify(homepage_printer))));
+ if (p->homepage_key())
+ {
+ DepSpecPrettyPrinter homepage_printer(0, false);
+ p->homepage_key()->value()->accept(homepage_printer);
+ if (! stringify(homepage_printer).empty())
+ data->items.push_back(PopulateDataItem("Homepage", markup_escape(stringify(homepage_printer))));
+ }
- if (metadata->ebuild_interface)
+ if (p->keywords_key())
{
std::string km;
- paludis::tr1::shared_ptr<const KeywordNameCollection> keywords(metadata->ebuild_interface->keywords());
- for (KeywordNameCollection::Iterator k(keywords->begin()), k_end(keywords->end()) ;
+ tr1::shared_ptr<const KeywordNameSet> keywords(p->keywords_key()->value());
+ for (KeywordNameSet::Iterator k(keywords->begin()), k_end(keywords->end()) ;
k != k_end ; ++k)
{
if (! km.empty())
km.append(" ");
- paludis::tr1::shared_ptr<KeywordNameCollection> kc(new KeywordNameCollection::Concrete);
+ tr1::shared_ptr<KeywordNameSet> kc(new KeywordNameSet);
kc->insert(*k);
if (_imp->query_window->environment()->accept_keywords(kc, *p))
km.append(markup_bold(markup_escape(stringify(*k))));
@@ -144,7 +144,7 @@ VersionInfoModel::populate_in_paludis_thread(paludis::tr1::shared_ptr<const Pack
}
void
-VersionInfoModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const VersionInfoModel::PopulateData> names)
+VersionInfoModel::populate_in_gui_thread(tr1::shared_ptr<const VersionInfoModel::PopulateData> names)
{
clear();
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.hh b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.hh
index 8a62bc9..984b305 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.hh
@@ -5,8 +5,9 @@
#include <gtkmm/treestore.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
+#include <paludis/package_id-fwd.hh>
#include <paludis/name.hh>
-#include <paludis/package_database_entry.hh>
namespace gtkpaludis
{
@@ -20,7 +21,7 @@ namespace gtkpaludis
protected:
class PopulateData;
- void populate_in_paludis_thread(paludis::tr1::shared_ptr<const paludis::PackageDatabaseEntry>);
+ void populate_in_paludis_thread(paludis::tr1::shared_ptr<const paludis::PackageID>);
void populate_in_gui_thread(paludis::tr1::shared_ptr<const PopulateData> names);
public:
diff --git a/src/clients/gtkpaludis/libgtkpaludis/versions_list.cc b/src/clients/gtkpaludis/libgtkpaludis/versions_list.cc
index df03572..7f75559 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/versions_list.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/versions_list.cc
@@ -52,11 +52,11 @@ void
VersionsList::handle_signal_cursor_changed()
{
if (get_selection()->get_selected())
- _imp->versions_page->set_pde(paludis::tr1::shared_ptr<PackageDatabaseEntry>(new PackageDatabaseEntry(*
- (*get_selection()->get_selected())[_imp->model->columns().col_pde].operator
- paludis::tr1::shared_ptr<const PackageDatabaseEntry> ())));
+ _imp->versions_page->set_id(paludis::tr1::shared_ptr<const PackageID>(
+ (*get_selection()->get_selected())[_imp->model->columns().col_id].operator
+ paludis::tr1::shared_ptr<const PackageID> ()));
else
- _imp->versions_page->set_pde(paludis::tr1::shared_ptr<PackageDatabaseEntry>());
+ _imp->versions_page->set_id(paludis::tr1::shared_ptr<const PackageID>());
}
void
diff --git a/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
index 34ee41c..723c2f1 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
@@ -4,12 +4,14 @@
#include "query_window.hh"
#include "versions_page.hh"
#include "markup.hh"
-#include <paludis/util/collection_concrete.hh>
#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/tr1_functional.hh>
+#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
+#include <paludis/package_id.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
#include <list>
@@ -38,15 +40,13 @@ namespace
{
struct PopulateDataItem
{
- PackageDatabaseEntry pde;
- std::string slot;
+ tr1::shared_ptr<const PackageID> id;
std::string masks;
bool prefer_default;
- PopulateDataItem(const PackageDatabaseEntry & d, const std::string & s,
+ PopulateDataItem(const tr1::shared_ptr<const PackageID> & d,
const std::string & m, const bool p) :
- pde(d),
- slot(s),
+ id(d),
masks(m),
prefer_default(p)
{
@@ -79,7 +79,7 @@ VersionsListModel::Columns::Columns()
add(col_repo_name);
add(col_slot);
add(col_masks_markup);
- add(col_pde);
+ add(col_id);
add(col_prefer_default);
}
@@ -105,21 +105,17 @@ void
VersionsListModel::populate_in_paludis_thread()
{
paludis::tr1::shared_ptr<PopulateData> data(new PopulateData);
- paludis::tr1::shared_ptr<const PackageDatabaseEntryCollection> c(
+ paludis::tr1::shared_ptr<const PackageIDSequence> c(
_imp->query_window->environment()->package_database()->query(
query::Package(_imp->query_window->get_package_name()),
qo_order_by_version));
- for (PackageDatabaseEntryCollection::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
+ for (PackageIDSequence::ReverseIterator p(c->rbegin()), p_end(c->rend()) ;
p != p_end ; ++p)
{
bool prefer_default(true);
- paludis::tr1::shared_ptr<const VersionMetadata> metadata(
- _imp->query_window->environment()->package_database()->fetch_repository(p->repository)->version_metadata(
- p->name, p->version));
-
- MaskReasons mask_reasons(_imp->query_window->environment()->mask_reasons(*p));
+ MaskReasons mask_reasons(_imp->query_window->environment()->mask_reasons(**p));
std::string mr_string;
for (MaskReason m(MaskReason(0)) ; m < last_mr ;
@@ -161,16 +157,13 @@ VersionsListModel::populate_in_paludis_thread()
case mr_breaks_portage:
mr_string.append("breaks Portage");
break;
- case mr_interactive:
- mr_string.append("interactive");
- break;
case last_mr:
break;
}
}
- data->items.push_back(PopulateDataItem(*p, stringify(metadata->slot), mr_string, prefer_default));
+ data->items.push_back(PopulateDataItem(*p, mr_string, prefer_default));
}
_imp->query_window->gui_thread_action(
@@ -186,10 +179,10 @@ VersionsListModel::populate_in_gui_thread(paludis::tr1::shared_ptr<const Version
i != i_end ; ++i)
{
iterator r(append());
- (*r)[_imp->columns.col_pde] = paludis::tr1::shared_ptr<PackageDatabaseEntry>(new PackageDatabaseEntry(i->pde));
- (*r)[_imp->columns.col_repo_name] = stringify(i->pde.repository);
- (*r)[_imp->columns.col_version_string] = stringify(i->pde.version);
- (*r)[_imp->columns.col_slot] = i->slot;
+ (*r)[_imp->columns.col_id] = i->id;
+ (*r)[_imp->columns.col_repo_name] = stringify(i->id->repository()->name());
+ (*r)[_imp->columns.col_version_string] = stringify(i->id->canonical_form(idcf_version));
+ (*r)[_imp->columns.col_slot] = stringify(i->id->slot());
(*r)[_imp->columns.col_masks_markup] = i->masks;
(*r)[_imp->columns.col_prefer_default] = i->prefer_default;
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.hh b/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.hh
index 82391f3..d3cc343 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.hh
@@ -5,8 +5,9 @@
#include <gtkmm/treestore.h>
#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/tr1_memory.hh>
#include <paludis/name.hh>
-#include <paludis/package_database_entry.hh>
+#include <paludis/package_id-fwd.hh>
namespace gtkpaludis
{
@@ -38,7 +39,7 @@ namespace gtkpaludis
Gtk::TreeModelColumn<Glib::ustring> col_repo_name;
Gtk::TreeModelColumn<Glib::ustring> col_slot;
Gtk::TreeModelColumn<Glib::ustring> col_masks_markup;
- Gtk::TreeModelColumn<paludis::tr1::shared_ptr<const paludis::PackageDatabaseEntry> > col_pde;
+ Gtk::TreeModelColumn<paludis::tr1::shared_ptr<const paludis::PackageID> > col_id;
Gtk::TreeModelColumn<bool> col_prefer_default;
};
diff --git a/src/clients/gtkpaludis/libgtkpaludis/versions_page.cc b/src/clients/gtkpaludis/libgtkpaludis/versions_page.cc
index 4e595c8..3b098f1 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/versions_page.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/versions_page.cc
@@ -22,7 +22,7 @@ namespace paludis
Gtk::ScrolledWindow version_info_scroll;
VersionInfo version_info;
- paludis::tr1::shared_ptr<const PackageDatabaseEntry> pde;
+ paludis::tr1::shared_ptr<const PackageID> id;
Implementation(QueryWindow * const m, VersionsPage * const p) :
query_window(m),
@@ -58,15 +58,15 @@ VersionsPage::populate()
}
void
-VersionsPage::set_pde(paludis::tr1::shared_ptr<const PackageDatabaseEntry> c)
+VersionsPage::set_id(paludis::tr1::shared_ptr<const PackageID> c)
{
- _imp->pde = c;
+ _imp->id = c;
_imp->version_info.populate();
}
-paludis::tr1::shared_ptr<const PackageDatabaseEntry>
-VersionsPage::get_pde() const
+paludis::tr1::shared_ptr<const PackageID>
+VersionsPage::get_id() const
{
- return _imp->pde;
+ return _imp->id;
}
diff --git a/src/clients/gtkpaludis/libgtkpaludis/versions_page.hh b/src/clients/gtkpaludis/libgtkpaludis/versions_page.hh
index dc50354..1f0154c 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/versions_page.hh
+++ b/src/clients/gtkpaludis/libgtkpaludis/versions_page.hh
@@ -4,7 +4,8 @@
#define GTKPALUDIS_GUARD_LIBGTKPALUDIS_VERSIONS_PAGE_HH 1
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/package_database_entry.hh>
+#include <paludis/util/tr1_memory.hh>
+#include <paludis/package_id-fwd.hh>
#include <libgtkpaludis/query_notebook_page.hh>
#include <gtkmm/table.h>
@@ -23,8 +24,8 @@ namespace gtkpaludis
virtual void populate();
- void set_pde(paludis::tr1::shared_ptr<const paludis::PackageDatabaseEntry>);
- paludis::tr1::shared_ptr<const paludis::PackageDatabaseEntry> get_pde() const;
+ void set_id(paludis::tr1::shared_ptr<const paludis::PackageID>);
+ paludis::tr1::shared_ptr<const paludis::PackageID> get_id() const;
};
}