Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/Trellis/QtDynamicGridLayout.cpp')
-rw-r--r--Swift/QtUI/Trellis/QtDynamicGridLayout.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp b/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
index 2402529..53e2733 100644
--- a/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
+++ b/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2014-2016 Isode Limited. 2 * Copyright (c) 2014-2019 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -514,9 +514,9 @@ void QtDynamicGridLayout::updateTabPositions() {
514 514
515void QtDynamicGridLayout::moveTab(QtTabWidget* tabWidget, int oldIndex, int newIndex) { 515void QtDynamicGridLayout::moveTab(QtTabWidget* tabWidget, int oldIndex, int newIndex) {
516#if QT_VERSION >= 0x040500 516#if QT_VERSION >= 0x040500
517 SWIFT_LOG_ASSERT(movingTab_ == nullptr, error) << std::endl; 517 SWIFT_LOG_ASSERT(movingTab_ == nullptr, error);
518 movingTab_ = qobject_cast<QtTabbable*>(tabWidget->widget(oldIndex)); 518 movingTab_ = qobject_cast<QtTabbable*>(tabWidget->widget(oldIndex));
519 SWIFT_LOG_ASSERT(movingTab_ != nullptr, error) << std::endl; 519 SWIFT_LOG_ASSERT(movingTab_ != nullptr, error);
520 520
521 if (movingTab_) { 521 if (movingTab_) {
522 // Install event filter that filters out events issued during the internal movement of the 522 // Install event filter that filters out events issued during the internal movement of the
@@ -526,7 +526,7 @@ void QtDynamicGridLayout::moveTab(QtTabWidget* tabWidget, int oldIndex, int newI
526 tabWidget->tabBar()->moveTab(oldIndex, newIndex); 526 tabWidget->tabBar()->moveTab(oldIndex, newIndex);
527 527
528 qApp->removeEventFilter(this); 528 qApp->removeEventFilter(this);
529 SWIFT_LOG_ASSERT(movingTab_ == tabWidget->widget(newIndex), error) << std::endl; 529 SWIFT_LOG_ASSERT(movingTab_ == tabWidget->widget(newIndex), error);
530 } 530 }
531 movingTab_ = nullptr; 531 movingTab_ = nullptr;
532 tabWidget->widget(newIndex)->setFocus(); 532 tabWidget->widget(newIndex)->setFocus();