diff options
Diffstat (limited to 'src/urlbar')
-rw-r--r-- | src/urlbar/urlbar.cpp | 5 | ||||
-rw-r--r-- | src/urlbar/urlresolver.cpp | 1 | ||||
-rw-r--r-- | src/urlbar/urlresolver.h | 18 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index f1729d53..25c7b748 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -42,11 +42,11 @@ #include "webview.h" #include "completionwidget.h" #include "bookmarkprovider.h" +#include "bookmarkowner.h" #include "bookmarkwidget.h" #include "iconmanager.h" // KDE Includes -#include <KBookmarkManager> #include <KCompletionBox> #include <KStandardDirs> @@ -356,8 +356,7 @@ void UrlBar::showBookmarkInfo(const QPoint &pos) if (bookmark.isNull()) { - bookmark = Application::bookmarkProvider()->rootGroup().addBookmark(_tab->view()->title(), _tab->url()); - Application::bookmarkProvider()->bookmarkManager()->emitChanged(); + bookmark = Application::bookmarkProvider()->bookmarkOwner()->bookmarkCurrentPage(); } BookmarkWidget *widget = new BookmarkWidget(bookmark, window()); diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index dfb3289f..7f6a7f4f 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -26,6 +26,7 @@ // Self Includes #include "urlresolver.h" +#include "urlresolver.moc" // Local Includes #include "application.h" diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h index 700fd460..f16c44f8 100644 --- a/src/urlbar/urlresolver.h +++ b/src/urlbar/urlresolver.h @@ -40,6 +40,7 @@ #include <QList> #include <QStringList> + class UrlSearchItem { public: @@ -123,14 +124,6 @@ Q_SIGNALS: void suggestionsReady(const UrlSearchList &, const QString &); private: - QString _typedString; - - UrlSearchList _webSearches; - UrlSearchList _qurlFromUserInput; - UrlSearchList _history; - UrlSearchList _bookmarks; - UrlSearchList _suggestions; - void computeWebSearches(); void computeHistory(); void computeQurlFromUserInput(); @@ -139,6 +132,15 @@ private: UrlSearchItem privilegedItem(UrlSearchList* list); UrlSearchList orderLists(); + + QString _typedString; + + UrlSearchList _webSearches; + UrlSearchList _qurlFromUserInput; + UrlSearchList _history; + UrlSearchList _bookmarks; + UrlSearchList _suggestions; + static QRegExp _browseRegexp; static QRegExp _searchEnginesRegexp; |