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/tabwindow | |
| 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/tabwindow')
| -rw-r--r-- | src/tabwindow/tabbar.cpp | 4 | ||||
| -rw-r--r-- | src/tabwindow/tabwindow.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tabwindow/tabbar.cpp b/src/tabwindow/tabbar.cpp index 2d53c963..6f7586d0 100644 --- a/src/tabwindow/tabbar.cpp +++ b/src/tabwindow/tabbar.cpp @@ -38,13 +38,13 @@ #include <KColorScheme> #include <KLocalizedString> #include <KMenu> +#include <KUrl> #include <QPropertyAnimation> #include <QSignalMapper> #include <QStyleOptionFrameV3> #include <QMouseEvent> #include <QTimer> -#include <QUrl> static inline QByteArray highlightPropertyName(int index) @@ -419,7 +419,7 @@ void TabBar::showTabPreview() int w = tabSizeHint(0).width(); int h = w * tabW->size().height() / tabW->size().width(); - m_previewPopup = new TabPreviewPopup(indexedTab->tabPreview(w,h), indexedTab->url().toString() , this); + m_previewPopup = new TabPreviewPopup(indexedTab->tabPreview(w,h), indexedTab->url().url() , this); int tabBarWidth = tabW->size().width(); int leftIndex = tabRect(m_currentTabPreviewIndex).x() + (tabRect(m_currentTabPreviewIndex).width() - w) / 2; diff --git a/src/tabwindow/tabwindow.cpp b/src/tabwindow/tabwindow.cpp index cce684cf..3e479bdf 100644 --- a/src/tabwindow/tabwindow.cpp +++ b/src/tabwindow/tabwindow.cpp @@ -285,7 +285,7 @@ void TabWindow::tabTitleChanged(const QString &title) bool emptyTitle = title.isEmpty(); - QString tabTitle = emptyTitle ? tab->url().toString() : title; + QString tabTitle = emptyTitle ? tab->url().url() : title; tabTitle.replace('&', "&&"); int index = indexOf(tab); @@ -405,7 +405,7 @@ void TabWindow::closeTab(int index, bool del) const int recentlyClosedTabsLimit = 8; TabHistory history(tabToClose->page()->history()); history.title = tabToClose->title(); - history.url = tabToClose->url().toString(); + history.url = tabToClose->url().url(); m_recentlyClosedTabs.removeAll(history); if (m_recentlyClosedTabs.count() == recentlyClosedTabsLimit) |