From 478cdbbc5cc1c69a76e6f1054ce70f8ee0bb0a59 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Tue, 25 Dec 2018 23:58:38 +0100
Subject: Rename TabWidget::deleteTab to TabWidget::removeTab

---
 src/subwindow/tabwidget.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/subwindow/tabwidget.cpp')

diff --git a/src/subwindow/tabwidget.cpp b/src/subwindow/tabwidget.cpp
index 58e9b03..6951b7b 100644
--- a/src/subwindow/tabwidget.cpp
+++ b/src/subwindow/tabwidget.cpp
@@ -36,7 +36,7 @@ TabWidget::TabWidget(QWidget *parent)
     setElideMode(Qt::ElideRight);
     setMovable(true);
 
-    connect(this, &TabWidget::tabCloseRequested, this, &TabWidget::deleteTab);
+    connect(this, &TabWidget::tabCloseRequested, this, &TabWidget::removeTab);
 
     // when changing tabs, give focus to the widget
     // otherwise when closing tabs, the tabwidget will retain focus
@@ -49,14 +49,14 @@ TabWidget::TabWidget(QWidget *parent)
     tabContextMenu = new QMenu(this);
     auto *closeTab = tabContextMenu->addAction(tr("Close Tab"));
     connect(closeTab, &QAction::triggered, this, [this]() {
-        deleteTab(this->tabBar()->tabAt(mapFromGlobal(tabContextMenu->pos())));
+        removeTab(this->tabBar()->tabAt(mapFromGlobal(tabContextMenu->pos())));
     });
 
     auto *closeTabsLeft = tabContextMenu->addAction(tr("Close Tabs left"));
     connect(closeTabsLeft, &QAction::triggered, this, [this]() {
         int idx = this->tabBar()->tabAt(mapFromGlobal(tabContextMenu->pos()));
         for(int i = idx - 1; i >= 0; --i) {
-            deleteTab(i);
+            removeTab(i);
         }
     });
 
@@ -64,7 +64,7 @@ TabWidget::TabWidget(QWidget *parent)
     connect(closeTabsRight, &QAction::triggered, this, [this]() {
         int idx = this->tabBar()->tabAt(mapFromGlobal(tabContextMenu->pos()));
         for(int i = count() - 1; i > idx; --i) {
-            deleteTab(i);
+            removeTab(i);
         }
     });
 }
@@ -100,7 +100,7 @@ int TabWidget::addTab(WebView *view)
     return idx;
 }
 
-void TabWidget::deleteTab(int index)
+void TabWidget::removeTab(int index)
 {
     // deleting the widget automatically removes the tab?
     WebView *w = qobject_cast<WebView *>(widget(index));
@@ -117,11 +117,8 @@ void TabWidget::deleteTab(int index)
         m_closedTabs.dequeue();
     }
 
-    disconnect(w);
+    QTabWidget::removeTab(index);
     delete w;
-
-    if(count() == 0)
-        parentWidget()->close();
 }
 
 int TabWidget::restoreLastTab()
@@ -171,7 +168,7 @@ void TabWidget::mousePressEvent(QMouseEvent *event)
     if(event->button() == Qt::MiddleButton) {
         int index = tabBar()->tabAt(event->pos());
         if(index >= 0) {
-            deleteTab(index);
+            removeTab(index);
         }
         event->accept();
         return;
-- 
cgit v1.2.1