1 files changed, 35 insertions, 31 deletions
diff --git a/Swift/QtUI/QtTabbable.cpp b/Swift/QtUI/QtTabbable.cpp
index 2a0bbc2..df2cbfe 100644
--- a/Swift/QtUI/QtTabbable.cpp
+++ b/Swift/QtUI/QtTabbable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,7 +10,6 @@
 #include <QKeyEvent>
 #include <QShortcut>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Base/Platform.h>
 
 #include <Swift/QtUI/QtChatTabs.h>
@@ -23,47 +22,52 @@ QtTabbable::QtTabbable() : QWidget() {
 }
 
 QtTabbable::~QtTabbable() {
-	emit windowClosing();
+
 }
 
 bool QtTabbable::isWidgetSelected() {
-	/*isActiveWindow() shouldn't be necessary, but I don't trust it as far as I can throw it*/
-	if (!isActiveWindow()) {
-		return false;
-	}
-	QtChatTabs* parent = qobject_cast<QtChatTabs*>(window());
-	return parent ? parent->getCurrentTab() == this : isAncestorOf(QApplication::focusWidget());
+    /*isActiveWindow() shouldn't be necessary, but I don't trust it as far as I can throw it*/
+    if (!isActiveWindow()) {
+        return false;
+    }
+    QtChatTabs* parent = qobject_cast<QtChatTabs*>(window());
+    return parent ? parent->getCurrentTab() == this : isAncestorOf(QApplication::focusWidget());
 }
 
 bool QtTabbable::event(QEvent* event) {
-	QKeyEvent* keyEvent = dynamic_cast<QKeyEvent*>(event);
-	if (keyEvent) {
-		// According to Qt's focus documentation, one can only override CTRL+TAB via reimplementing QWidget::event().
-		if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Tab) {
-			// Only handle KeyRelease event as Linux also generate KeyPress event in case of CTRL+TAB being pressed
-			// in the roster of a MUC.
-			if (keyEvent->type() == QEvent::KeyRelease) {
-				emit requestNextTab();
-			}
-			return true;
-		}
+    QKeyEvent* keyEvent = dynamic_cast<QKeyEvent*>(event);
+    if (keyEvent) {
+        // According to Qt's focus documentation, one can only override CTRL+TAB via reimplementing QWidget::event().
+        if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Tab) {
+            // Only handle KeyRelease event as Linux also generate KeyPress event in case of CTRL+TAB being pressed
+            // in the roster of a MUC.
+            if (keyEvent->type() == QEvent::KeyRelease) {
+                emit requestNextTab();
+            }
+            return true;
+        }
 #ifdef SWIFTEN_PLATFORM_LINUX
-		else if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Backtab && keyEvent->type() != QEvent::KeyRelease) {
+        else if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Backtab && keyEvent->type() != QEvent::KeyRelease) {
 #else
-		else if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Backtab) {
+        else if (keyEvent->modifiers().testFlag(QtUtilities::ctrlHardwareKeyModifier) && keyEvent->key() == Qt::Key_Backtab) {
 #endif
 #ifdef SWIFTEN_PLATFORM_WINDOWS
-			// Windows emits both the KeyPress and KeyRelease events.
-			if (keyEvent->type() == QEvent::KeyPress) {
+            // Windows emits both the KeyPress and KeyRelease events.
+            if (keyEvent->type() == QEvent::KeyPress) {
 #else
-			if (keyEvent->type() != QEvent::ShortcutOverride) {
+            if (keyEvent->type() != QEvent::ShortcutOverride) {
 #endif
-				emit requestPreviousTab();
-			}
-			return true;
-		}
-	}
-	return QWidget::event(event);
+                emit requestPreviousTab();
+            }
+            return true;
+        }
+    }
+    return QWidget::event(event);
+}
+
+void QtTabbable::closeEvent(QCloseEvent* event) {
+    emit windowClosing();
+    event->accept();
 }
 
 }