Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Polishing of the Qt interface #23

Merged
merged 2 commits into from Feb 8, 2016
+6 −1
Merged

Polishing of the Qt interface #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5535a8
Improve usage of Qt containers
aleixpol Feb 8, 2016
2ce571c
Don't compute screenshot images and then forget about them
aleixpol Feb 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 qt/database.cpp
View file
Open in desktop
@@ -201,16 +201,18 @@ Component xapianDocToComponent(Xapian::Document document) {
str = document.get_value (XapianValues::SCREENSHOTS);
pb_scrs.ParseFromString (str);
QList<Appstream::Screenshot> screenshots;
screenshots.reserve(pb_scrs.screenshot_size ());
for (int i = 0; i < pb_scrs.screenshot_size (); i++) {
const Screenshots_Screenshot& pb_scr = pb_scrs.screenshot (i);
Appstream::Screenshot scr;
QList<Appstream::Image> images;

if (pb_scr.primary())
scr.setDefault(true);
if (pb_scr.has_caption())
scr.setCaption(QString::fromStdString(pb_scr.caption()));

QList<Appstream::Image> images;
images.reserve(pb_scr.image_size());
for (int j = 0; j < pb_scr.image_size(); j++) {
const Screenshots_Image& pb_img = pb_scr.image(j);
Appstream::Image image;
@@ -227,6 +229,7 @@ Component xapianDocToComponent(Xapian::Document document) {

images.append(image);
}
scr.setImages(images);

screenshots.append(scr);
}
@@ -259,6 +262,7 @@ Component xapianDocToComponent(Xapian::Document document) {

QList<Component> parseSearchResults(Xapian::MSet matches) {
QList<Component> components;
components.reserve(matches.size());
for (Xapian::MSetIterator it = matches.begin(); it != matches.end(); ++it) {
Xapian::Document document = it.get_document ();
components << xapianDocToComponent(document);
@@ -268,6 +272,7 @@ QList<Component> parseSearchResults(Xapian::MSet matches) {

QList< Component > Database::allComponents() const {
QList<Component> components;
components.reserve(d->m_db.get_termfreq(std::string()));

// Iterate through all Xapian documents
Xapian::PostingIterator it = d->m_db.postlist_begin (std::string());