diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-03-30 02:07:25 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-03-30 02:07:25 +0200 |
commit | 428bf09a4e7ae01b40d24c74f8abe6b735e1c62b (patch) | |
tree | 4684dd80273dbea84e135805b1befbf89f28e2ef /src/urlbar/urlbar.cpp | |
parent | add title for bookmarks in the list (diff) | |
parent | Add mid click support for the completition widget of the url bar (diff) | |
download | rekonq-428bf09a4e7ae01b40d24c74f8abe6b735e1c62b.tar.xz |
Merge commit 'refs/merge-requests/110' of git://gitorious.org/rekonq/mainline into m110
Diffstat (limited to 'src/urlbar/urlbar.cpp')
-rw-r--r-- | src/urlbar/urlbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 54a0a02d..57108d29 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -85,7 +85,7 @@ UrlBar::UrlBar(QWidget *parent) connect(this, SIGNAL(returnPressed(const QString&)), SLOT(activated(const QString&))); installEventFilter(m_box); - connect(m_box, SIGNAL(chosenUrl(const QString&)), SLOT(activated(const QString&))); + connect(m_box, SIGNAL(chosenUrl(const QString&, Rekonq::OpenType)), SLOT(activated(const QString&, Rekonq::OpenType))); } @@ -171,7 +171,7 @@ void UrlBar::updateUrl() } -void UrlBar::activated(const QString& urlString) +void UrlBar::activated(const QString& urlString, Rekonq::OpenType type) { disconnect(this, SIGNAL(editTextChanged(const QString &)), this, SLOT(suggestUrls(const QString &))); @@ -180,7 +180,7 @@ void UrlBar::activated(const QString& urlString) clearFocus(); setUrl(urlString); - Application::instance()->loadUrl(m_currentUrl); + Application::instance()->loadUrl(m_currentUrl, type); } |