diff --git a/src/konqtabs.h b/src/konqtabs.h --- a/src/konqtabs.h +++ b/src/konqtabs.h @@ -138,7 +138,7 @@ private Q_SLOTS: void slotContextMenu(const QPoint &); void slotContextMenu(QWidget *, const QPoint &); - void slotCloseRequest(QWidget *); + void slotCloseRequest(int); void slotMovedTab(int, int); void slotMouseMiddleClick(); void slotMouseMiddleClick(QWidget *); diff --git a/src/konqtabs.cpp b/src/konqtabs.cpp --- a/src/konqtabs.cpp +++ b/src/konqtabs.cpp @@ -83,7 +83,7 @@ if (KonqSettings::tabPosition() == QLatin1String("Bottom")) { setTabPosition(QTabWidget::South); } - connect(this, SIGNAL(closeRequest(QWidget*)), SLOT(slotCloseRequest(QWidget*))); + connect(this, &KonqFrameTabs::tabCloseRequested, this, &KonqFrameTabs::slotCloseRequest); connect(this, SIGNAL(removeTabPopup()), m_pViewManager->mainWindow(), SLOT(slotRemoveTabPopup())); @@ -352,9 +352,9 @@ m_pViewManager->mainWindow()->action("removeothertabs")->shortcut()); } -void KonqFrameTabs::slotCloseRequest(QWidget *w) +void KonqFrameTabs::slotCloseRequest(int idx) { - m_pViewManager->mainWindow()->setWorkingTab(indexOf(w)); + m_pViewManager->mainWindow()->setWorkingTab(idx); emit removeTabPopup(); } @@ -614,7 +614,7 @@ if (e->button() == Qt::MidButton) { if (event->type() == QEvent::MouseButtonRelease) { const int index = bar->tabAt(e->pos()); - slotCloseRequest(widget(index)); + slotCloseRequest(index); } e->accept(); return true;