Differential D15357 Diff 42768 runners/bookmarks/browsers/firefox.cpp

Changeset View

Standalone View

View Options

runners/bookmarks/browsers/firefox.cpp

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)93 } else {
94 const QString escapedTerm = tmpTerm.replace('\'', QLatin1String("\\'")); 94​ const QString escapedTerm = tmpTerm.replace('\'', QLatin1String("\\'"));
95 query = QString("SELECT moz_bookmarks.fk, moz_bookmarks.title, moz_places.url " \ 95​ query = QString("SELECT moz_bookmarks.fk, moz_bookmarks.title, moz_places.url " \
96 "FROM moz_bookmarks, moz_places WHERE " \ 96​ "FROM moz_bookmarks, moz_places WHERE " \
97 "moz_bookmarks.type = 1 AND moz_bookmarks.fk = moz_places.id AND " \ 97​ "moz_bookmarks.type = 1 AND moz_bookmarks.fk = moz_places.id AND " \
98 "(moz_bookmarks.title LIKE '%" + escapedTerm + "%' or moz_places.url LIKE '%" 98​ "(moz_bookmarks.title LIKE '%" + escapedTerm + "%' or moz_places.url LIKE '%"
99 + escapedTerm + "%')"); 99​ + escapedTerm + "%')");
100 } 100​ }
101 QList<QVariantMap> results = m_fetchsqlite->query(query, QMap<QString, QVariant>()); 101​ QList<QVariantMap> results = m_fetchsqlite->query(query, QMap<QString, QVariant>());
102​ QMultiMap<QString, QString> uniqueResults;
102 foreach(QVariantMap result, results) { 103​ foreach(QVariantMap result, results) {
103 const QString title = result.value(QStringLiteral("title")).toString(); 104​ const QString title = result.value(QStringLiteral("title")).toString();
104 const QUrl url = result.value(QStringLiteral("url")).toUrl(); 105​ const QUrl url = result.value(QStringLiteral("url")).toUrl();
105 if (url.isEmpty() || url.scheme() == QLatin1String("place")) { 106​ if (url.isEmpty() || url.scheme() == QLatin1String("place")) {
106 // Don't use bookmarks with empty url or Firefox's "place:" scheme, 107​ // Don't use bookmarks with empty url or Firefox's "place:" scheme,
107 // e.g. used for "Most Visited" or "Recent Tags" 108​ // e.g. used for "Most Visited" or "Recent Tags"
108 //qDebug() << "element " << url << " was not added"; 109​ //qDebug() << "element " << url << " was not added";
109 continue; 110​ continue;
110 } 111​ }
111 112​
112 BookmarkMatch bookmarkMatch( m_favicon, term, title, url.toString()); 113​ auto urlString = url.toString();
114​ // After joining we may have multiple results for each URL:
115​ // 1) one for each bookmark folder (same or different titles)
116​ // 2) one for each tag (no title for all but the first entry)
117​ auto keyRange = uniqueResults.equal_range(urlString);
118​ auto it = keyRange.first;
119​ if (!title.isEmpty()) {
120​ while (it != keyRange.second) {
121​ if (*it == title) {
122​ // same URL and title in multiple bookmark folders
123​ break;
124​ }
125​ if (it->isEmpty()) {
126​ // add a title if there was none for the URL
127​ *it = title;
128​ break;
129​ }
130​ ++it;
131​ }
132​ }
133​ if (it == keyRange.second) {
134​ // first or unique entry
135​ uniqueResults.insert(urlString, title);
136​ }
zzagUnsubmitted
Done

Why postfix increment?

zzag: Why postfix increment?
brunsAuthorUnsubmitted
Done

Because modern compilers are clever enough do avoid any temporaries

bruns: Because modern compilers are clever enough do avoid any temporaries
zzagUnsubmitted
Done

Does the C++ standard guarantee that?

zzag: Does the C++ standard guarantee that?
brunsAuthorUnsubmitted
Done

It neither guarantees prefix is more efficient than postfix.

bruns: It neither guarantees prefix is more efficient than postfix.
zzagUnsubmitted
Done

Please use prefix increment.

zzag: Please use prefix increment.
brunsAuthorUnsubmitted
Done

If there are more required changes, yes, else - no.

bruns: If there are more required changes, yes, else - no.
137​ }
138​
139​ for (auto result = uniqueResults.constKeyValueBegin(); result != uniqueResults.constKeyValueEnd(); ++result) {
140​ BookmarkMatch bookmarkMatch(m_favicon, term, (*result).second, (*result).first);
113 bookmarkMatch.addTo(matches, addEverything); 141​ bookmarkMatch.addTo(matches, addEverything);
114 } 142​ }
115 143​
116 return matches; 144​ return matches;
117} 145​}
118 146​
119 147​
120void Firefox::teardown() 148​void Firefox::teardown()
▲ Show 20 Lines • Show All 64 Lines • Show Last 20 Lines