diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-10-29 19:14:37 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-10-29 19:14:37 +0200 |
commit | acdc42e067c5bea90cb1017db919c267fd0bf0d7 (patch) | |
tree | f4db3e574f8dff71c6dfa448cb7a8256af2b1aa3 | |
parent | Merge branch 'master' of git.kde.org:rekonq (diff) | |
download | rekonq-acdc42e067c5bea90cb1017db919c267fd0bf0d7.tar.xz |
Revert "Fastest last tab recover"
This reverts commit 8561c1b43a506ac4ead17734c20cc55ce7cec666.
This implementation lets the last close page to continue load eg flash
and in general can produce audio playback :(
-rw-r--r-- | src/mainview.cpp | 20 | ||||
-rw-r--r-- | src/mainview.h | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index 325afb4c..beaf4e21 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -63,7 +63,6 @@ MainView::MainView(MainWindow *parent) , m_addTabButton(0) , m_currentTabIndex(0) , m_parentWindow(parent) - , _lastClosedTab(0) { // setting tabbar TabBar *tabBar = new TabBar(this); @@ -101,7 +100,6 @@ MainView::~MainView() { delete _widgetBar; delete m_addTabButton; - delete _lastClosedTab; } @@ -502,10 +500,7 @@ void MainView::closeTab(int index, bool del) if (del) { - if(_lastClosedTab) - _lastClosedTab->deleteLater(); - _lastClosedTab = tabToClose; -// tabToClose->deleteLater(); + tabToClose->deleteLater(); } emit tabsChanged(); @@ -639,19 +634,6 @@ void MainView::openLastClosedTab() return; const HistoryItem item = m_recentlyClosedTabs.takeFirst(); - - // if there is a tab yet loaded, use it - if(_lastClosedTab) - { - addTab(_lastClosedTab, _lastClosedTab->view()->title() ); - _widgetBar->addWidget(_lastClosedTab->urlBar()); - updateTabBar(); - emit tabsChanged(); - - _lastClosedTab = 0; - return; - } - Application::instance()->loadUrl(KUrl(item.url), Rekonq::NewTab); } diff --git a/src/mainview.h b/src/mainview.h index 6ef40ac7..29162dd1 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -189,8 +189,6 @@ private: QList<HistoryItem> m_recentlyClosedTabs; MainWindow *m_parentWindow; - - WebTab *_lastClosedTab; }; #endif // MAINVIEW_H |