diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-04-16 03:14:48 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-04-16 03:14:48 +0200 |
commit | 72e0446fbc7017e7703102f733568a4f2e3c5195 (patch) | |
tree | 597f9ae450fc7e751688d1b060cd558b59aa2884 /src/urlbar/urlbar.h | |
parent | Merge commit 'refs/merge-requests/77' of git://gitorious.org/rekonq/mainline ... (diff) | |
download | rekonq-72e0446fbc7017e7703102f733568a4f2e3c5195.tar.xz |
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!
Diffstat (limited to 'src/urlbar/urlbar.h')
-rw-r--r-- | src/urlbar/urlbar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h index 684a205e..804188f7 100644 --- a/src/urlbar/urlbar.h +++ b/src/urlbar/urlbar.h @@ -60,11 +60,12 @@ public: void setPrivateMode(bool on); private slots: - void activated(const KUrl& url = KUrl(), Rekonq::OpenType = Rekonq::CurrentTab); + void activated(const KUrl& url, Rekonq::OpenType = Rekonq::CurrentTab); void suggestUrls(const QString &editedText); void setQUrl(const QUrl &url); void loadFinished(); + void loadTyped(const QString &); protected: virtual void paintEvent(QPaintEvent *event); |