diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-08-01 11:35:06 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-10 02:48:04 +0100 |
| commit | 4b24758d7230504daedc3d537f233f02244641bb (patch) | |
| tree | 27206d0a12e5052d7b4bffe76b48e1e1cca31985 /src/bookmarks | |
| parent | Let WebTab compile (and everything NOT commented out...) (diff) | |
| download | rekonq-4b24758d7230504daedc3d537f233f02244641bb.tar.xz | |
Clean up WebWindow inserting the WebTab there.
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/bookmarkowner.cpp | 4 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 1c117824..aba4ec69 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -127,7 +127,7 @@ QString BookmarkOwner::currentTitle() const QString BookmarkOwner::currentUrl() const { - return rApp->tabWindow()->currentWebWindow()->url().toString(); + return rApp->tabWindow()->currentWebWindow()->url().url(); } @@ -141,7 +141,7 @@ QList< QPair<QString, QString> > BookmarkOwner::currentBookmarkList() const { QPair<QString, QString> item; item.first = view->webWindow(i)->title(); - item.second = view->webWindow(i)->url().toString(); + item.second = view->webWindow(i)->url().url(); bkList << item; } diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 27ccaec4..019c260e 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -404,7 +404,7 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event) // DROP is URL QString url = dropEvent->mimeData()->urls().at(0).toString(); WebWindow *w = qobject_cast<WebWindow *>(parent()); - QString title = url.contains(w->url().toString()) + QString title = url.contains(w->url().url()) ? w->title() : url; bookmark = root.addBookmark(title, url); @@ -417,7 +417,7 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event) if (u.isValid()) { WebWindow *w = qobject_cast<WebWindow *>(parent()); - QString title = url.contains(w->url().toString()) + QString title = url.contains(w->url().url()) ? w->title() : url; bookmark = root.addBookmark(title, url); |