From 72e0446fbc7017e7703102f733568a4f2e3c5195 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 16 Apr 2010 03:14:48 +0200 Subject: Fixing Lionel's merge request: - clean/fix APIs - removed no more used methods/signals from CompletionWidget - use item->url() (as it has been defined) - Change the "pointing out text" from underline to bold (better, IMO) - QString --> Q/K url, as needed - Restore UrlFromUserInput engine: why it has been deleted? - Comment out the isHttp() check. That way I cannot in any way connect to localhost or to my home server. Apart from typing their IPs.. - Partially fixed the switch search engine implementation. Btw, I have to say I really don't like rekonq switch my default engine just because one time I decided to give a try to another... Not sure about. - Something more coming.. But tomorrow! Now it's 3:20 am here. Good night! --- src/urlbar/urlresolver.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/urlbar/urlresolver.h') diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h index 610b1fd0..22a9de4f 100644 --- a/src/urlbar/urlresolver.h +++ b/src/urlbar/urlresolver.h @@ -51,10 +51,9 @@ class UrlSearchItem int type; KUrl url; QString title; - QString icon; - UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString(), const QString &_icon = QString()) - : type(_type), url(_url), title(_title), icon(_icon) + UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString()) + : type(_type), url(_url), title(_title) {}; bool operator==(UrlSearchItem i); @@ -74,7 +73,7 @@ public: UrlSearchList orderedSearchItems(); private: - QString _urlString; //TODO: give a better name + QString _typedString; UrlSearchList webSearchesResolution(); UrlSearchList historyResolution(); -- cgit v1.2.1