diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/application.cpp | 8 | ||||
-rw-r--r-- | src/history.cpp | 4 | ||||
-rw-r--r-- | src/mainview.cpp | 2 | ||||
-rw-r--r-- | src/mainwindow.cpp | 10 | ||||
-rw-r--r-- | src/mainwindow.h | 2 | ||||
-rw-r--r-- | src/newtabpage.cpp | 24 | ||||
-rw-r--r-- | src/newtabpage.h | 2 |
7 files changed, 26 insertions, 26 deletions
diff --git a/src/application.cpp b/src/application.cpp index 869c23c8..0dfc478f 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -262,13 +262,13 @@ KIcon Application::icon(const KUrl &url) if(!Application::instance()->mainWindowList().isEmpty()) // avoid infinite loop at startup { - if(url == KUrl("rekonq:closedTabs")) + if(url == KUrl("about:closedTabs")) return KIcon("tab-close"); - if(url == KUrl("rekonq:history")) + if(url == KUrl("about:history")) return KIcon("view-history"); - if(url == KUrl("rekonq:bookmarks")) + if(url == KUrl("about:bookmarks")) return KIcon("bookmarks"); - if(url == KUrl("rekonq:home") || url == KUrl("rekonq:favorites")) + if(url == KUrl("about:home") || url == KUrl("about:favorites")) return KIcon("emblem-favorite"); } diff --git a/src/history.cpp b/src/history.cpp index 0db73b76..07580433 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -114,8 +114,8 @@ void HistoryManager::addHistoryEntry(const QString &url) { QUrl cleanUrl(url); - // don't store rekonq: urls (home page related) - if(cleanUrl.scheme() == QString("rekonq")) + // don't store about: urls (home page related) + if(cleanUrl.scheme() == QString("about")) return; cleanUrl.setPassword(QString()); diff --git a/src/mainview.cpp b/src/mainview.cpp index 4b731fc8..ebcad088 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -484,7 +484,7 @@ void MainView::closeTab(int index) hasFocus = tab->hasFocus(); //store close tab except homepage - if (!tab->url().prettyUrl().startsWith( QLatin1String("rekonq:") ) && !tab->url().isEmpty()) + if (!tab->url().prettyUrl().startsWith( QLatin1String("about:") ) && !tab->url().isEmpty()) { QString title = tab->title(); QString url = tab->url().prettyUrl(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 28993fde..770df91d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1113,11 +1113,11 @@ void MainWindow::openActionUrl(QAction *action) bool MainWindow::newTabPage(const KUrl &url) { - if ( url == KUrl("rekonq:closedTabs") - || url == KUrl("rekonq:history") - || url == KUrl("rekonq:bookmarks") - || url == KUrl("rekonq:favorites") - || url == KUrl("rekonq:home") + if ( url == KUrl("about:closedTabs") + || url == KUrl("about:history") + || url == KUrl("about:bookmarks") + || url == KUrl("about:favorites") + || url == KUrl("about:home") ) { kDebug() << "loading home: " << url; diff --git a/src/mainwindow.h b/src/mainwindow.h index 08a99b24..d1a48053 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -71,7 +71,7 @@ public: virtual QSize sizeHint() const; virtual KActionCollection *actionCollection () const; - bool newTabPage(const KUrl &url = KUrl("rekonq:home")); + bool newTabPage(const KUrl &url = KUrl("about:home")); private: void setupActions(); diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index f3656692..b34990fc 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -73,22 +73,22 @@ QString NewTabPage::newTabPageCode(const KUrl &url) QString speed; QString title; - if(url == KUrl("rekonq:closedTabs")) + if(url == KUrl("about:closedTabs")) { speed = closedTabsPage(); title = i18n("Closed Tabs"); } - if(url == KUrl("rekonq:history")) + if(url == KUrl("about:history")) { speed = historyPage(); title = i18n("History"); } - if(url == KUrl("rekonq:bookmarks")) + if(url == KUrl("about:bookmarks")) { speed = bookmarksPage(); title = i18n("Bookmarks"); } - if(url == KUrl("rekonq:home") || url == KUrl("rekonq:favorites")) + if(url == KUrl("about:home") || url == KUrl("about:favorites")) { speed = favoritesPage(); title = i18n("Favorites"); @@ -154,33 +154,33 @@ QString NewTabPage::browsingMenu(const KUrl ¤tUrl) KIconLoader *loader = KIconLoader::global(); menu += "<div class=\"link"; - if(currentUrl == "rekonq:favorites" || currentUrl == "rekonq:home") + if(currentUrl == "about:favorites" || currentUrl == "about:home") menu += " current"; - menu += "\"><a href=\"rekonq:favorites\">"; + menu += "\"><a href=\"about:favorites\">"; menu += "<img src=\"file:///" + loader->iconPath("emblem-favorite", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("Favorites"); menu += "</a></div>"; menu += "<div class=\"link"; - if(currentUrl == "rekonq:closedTabs") + if(currentUrl == "about:closedTabs") menu += " current"; - menu += "\"><a href=\"rekonq:closedTabs\">"; + menu += "\"><a href=\"about:closedTabs\">"; menu += "<img src=\"file:///" + loader->iconPath("tab-close", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("Closed Tabs"); menu += "</a></div>"; menu += "<div class=\"link"; - if(currentUrl == "rekonq:bookmarks") + if(currentUrl == "about:bookmarks") menu += " current"; - menu += "\"><a href=\"rekonq:bookmarks\">"; + menu += "\"><a href=\"about:bookmarks\">"; menu += "<img src=\"file:///" + loader->iconPath("bookmarks", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("Bookmarks"); menu += "</a></div>"; menu += "<div class=\"link"; - if(currentUrl == "rekonq:history") + if(currentUrl == "about:history") menu += " current"; - menu += "\"><a href=\"rekonq:history\">"; + menu += "\"><a href=\"about:history\">"; menu += "<img src=\"file:///" + loader->iconPath("view-history", KIconLoader::Desktop || KIconLoader::SizeSmall) + "\" />"; menu += i18n("History"); menu += "</a></div>"; diff --git a/src/newtabpage.h b/src/newtabpage.h index 265518d2..2d8d50bd 100644 --- a/src/newtabpage.h +++ b/src/newtabpage.h @@ -51,7 +51,7 @@ public: * about: url and loads the corresponding part of the * new tab page */ - QString newTabPageCode(const KUrl &url = KUrl("rekonq:home")); + QString newTabPageCode(const KUrl &url = KUrl("about:home")); protected: // these are the function to build the new tab page |