summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2019-11-19 13:36:05 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2019-11-19 13:58:45 (GMT)
commit261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
treec7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swift/QtUI
parent697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
downloadswift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip
swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a log file. Calls to the Android logging system or manually set callbacks will not include the newline in the logging output. JIRA: SWIFT-430 Test-Information: Unit tests pass on Debian 9 Checked that running Swift with logging to stderr still had a newline. Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/CAPICertificateSelector.cpp12
-rw-r--r--Swift/QtUI/QtAboutWidget.cpp4
-rw-r--r--Swift/QtUI/QtScaledAvatarCache.cpp8
-rw-r--r--Swift/QtUI/QtSpellCheckerWindow.cpp4
-rw-r--r--Swift/QtUI/QtSwift.cpp8
-rw-r--r--Swift/QtUI/QtTextEdit.cpp4
-rw-r--r--Swift/QtUI/QtUIFactory.cpp6
-rw-r--r--Swift/QtUI/QtWebKitChatView.cpp18
-rw-r--r--Swift/QtUI/Trellis/QtDynamicGridLayout.cpp8
9 files changed, 36 insertions, 36 deletions
diff --git a/Swift/QtUI/CAPICertificateSelector.cpp b/Swift/QtUI/CAPICertificateSelector.cpp
index e47121b..7e4bc0b 100644
--- a/Swift/QtUI/CAPICertificateSelector.cpp
+++ b/Swift/QtUI/CAPICertificateSelector.cpp
@@ -80,11 +80,11 @@ std::string selectCAPICertificate() {
80 if (titleLength == 0 || promptLength == 0) { 80 if (titleLength == 0 || promptLength == 0) {
81 int error = GetLastError(); 81 int error = GetLastError();
82 switch (error) { 82 switch (error) {
83 case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog" << std::endl;break; 83 case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog"; break;
84 case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog" << std::endl;break; 84 case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog"; break;
85 case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog" << std::endl;break; 85 case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog"; break;
86 case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog" << std::endl;break; 86 case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog"; break;
87 default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode" << std::endl; 87 default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode";
88 88
89 } 89 }
90 } 90 }
@@ -103,7 +103,7 @@ std::string selectCAPICertificate() {
103 103
104 if (hstore) { 104 if (hstore) {
105 if (CertCloseStore(hstore, 0) == FALSE) { 105 if (CertCloseStore(hstore, 0) == FALSE) {
106 SWIFT_LOG(debug) << "Failed to close the certificate store handle." << std::endl; 106 SWIFT_LOG(debug) << "Failed to close the certificate store handle.";
107 } 107 }
108 } 108 }
109 109
diff --git a/Swift/QtUI/QtAboutWidget.cpp b/Swift/QtUI/QtAboutWidget.cpp
index 2db0c9d..0a4e0ba 100644
--- a/Swift/QtUI/QtAboutWidget.cpp
+++ b/Swift/QtUI/QtAboutWidget.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2017 Isode Limited. 2 * Copyright (c) 2010-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 */
@@ -150,7 +150,7 @@ void QtAboutWidget::openPlainTextWindow(const QString& path) {
150 text->activateWindow(); 150 text->activateWindow();
151 } 151 }
152 else { 152 else {
153 SWIFT_LOG(error) << "Failed to open " << Q2PSTRING(path) << "." << std::endl; 153 SWIFT_LOG(error) << "Failed to open " << Q2PSTRING(path) << ".";
154 } 154 }
155} 155}
156 156
diff --git a/Swift/QtUI/QtScaledAvatarCache.cpp b/Swift/QtUI/QtScaledAvatarCache.cpp
index 37ea6a9..e3a28d6 100644
--- a/Swift/QtUI/QtScaledAvatarCache.cpp
+++ b/Swift/QtUI/QtScaledAvatarCache.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2011-2016 Isode Limited. 2 * Copyright (c) 2011-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 */
@@ -53,8 +53,8 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
53 if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) { 53 if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) {
54 QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size)); 54 QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size));
55 if (!avatarFile.dir().mkpath(cacheSubPath)) { 55 if (!avatarFile.dir().mkpath(cacheSubPath)) {
56 SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath()) << std::endl; 56 SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath());
57 SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath) << std::endl; 57 SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath);
58 return path; 58 return path;
59 } 59 }
60 QDir targetDir(avatarFile.dir().absoluteFilePath(cacheSubPath)); 60 QDir targetDir(avatarFile.dir().absoluteFilePath(cacheSubPath));
@@ -75,7 +75,7 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
75 return path; 75 return path;
76 } 76 }
77 } else { 77 } else {
78 SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path) << std::endl; 78 SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path);
79 } 79 }
80 } 80 }
81 return targetFile; 81 return targetFile;
diff --git a/Swift/QtUI/QtSpellCheckerWindow.cpp b/Swift/QtUI/QtSpellCheckerWindow.cpp
index a8178c4..23b0963 100644
--- a/Swift/QtUI/QtSpellCheckerWindow.cpp
+++ b/Swift/QtUI/QtSpellCheckerWindow.cpp
@@ -5,7 +5,7 @@
5 */ 5 */
6 6
7/* 7/*
8 * Copyright (c) 2016 Isode Limited. 8 * Copyright (c) 2016-2019 Isode Limited.
9 * All rights reserved. 9 * All rights reserved.
10 * See the COPYING file for more information. 10 * See the COPYING file for more information.
11 */ 11 */
@@ -64,7 +64,7 @@ void QtSpellCheckerWindow::setSupportedLanguages(const std::vector<std::string>&
64} 64}
65 65
66void QtSpellCheckerWindow::setActiveLanguage(const std::string& language) { 66void QtSpellCheckerWindow::setActiveLanguage(const std::string& language) {
67 SWIFT_LOG_ASSERT(languageItems_.find(language) != languageItems_.end(), warning) << "Language '" << language << "' is not available." << std::endl; 67 SWIFT_LOG_ASSERT(languageItems_.find(language) != languageItems_.end(), warning) << "Language '" << language << "' is not available.";
68 if (languageItems_.find(language) != languageItems_.end()) { 68 if (languageItems_.find(language) != languageItems_.end()) {
69 languageItems_[language]->setSelected(true); 69 languageItems_[language]->setSelected(true);
70 } 70 }
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index f1ad38e..73fd733 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2018 Isode Limited. 2 * Copyright (c) 2010-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 */
@@ -191,7 +191,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
191 Log::setLogFile(fileName); 191 Log::setLogFile(fileName);
192 } 192 }
193 catch (...) { 193 catch (...) {
194 SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line" << std::endl; 194 SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line";
195 } 195 }
196 } 196 }
197 //TODO this old option can be purged 197 //TODO this old option can be purged
@@ -222,13 +222,13 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
222 for (auto&& fontName : fontNames) { 222 for (auto&& fontName : fontNames) {
223 std::string fontPath = std::string(":/") + fontName; 223 std::string fontPath = std::string(":/") + fontName;
224 int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); 224 int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
225 SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl; 225 SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath;
226 } 226 }
227 227
228#ifdef SWIFTEN_PLATFORM_LINUX 228#ifdef SWIFTEN_PLATFORM_LINUX
229 std::string fontPath = std::string(":/themes/Default/Noto/NotoColorEmoji.ttf"); 229 std::string fontPath = std::string(":/themes/Default/Noto/NotoColorEmoji.ttf");
230 int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); 230 int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
231 SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl; 231 SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath;
232 QFont::insertSubstitution(QApplication::font().family(),"NotoColorEmoji"); 232 QFont::insertSubstitution(QApplication::font().family(),"NotoColorEmoji");
233#endif 233#endif
234#ifdef SWIFTEN_PLATFORM_WINDOWS 234#ifdef SWIFTEN_PLATFORM_WINDOWS
diff --git a/Swift/QtUI/QtTextEdit.cpp b/Swift/QtUI/QtTextEdit.cpp
index e63cd4f..b3c57a7 100644
--- a/Swift/QtUI/QtTextEdit.cpp
+++ b/Swift/QtUI/QtTextEdit.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2017 Isode Limited. 2 * Copyright (c) 2010-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 */
@@ -240,7 +240,7 @@ void QtTextEdit::setUpSpellChecker() {
240 } 240 }
241 else { 241 else {
242 // Spellchecking is not working, as we did not get a valid checker from the factory. Disable spellchecking. 242 // Spellchecking is not working, as we did not get a valid checker from the factory. Disable spellchecking.
243 SWIFT_LOG(warning) << "Spellchecking is currently misconfigured in Swift (e.g. missing dictionary or broken dictionary file). Disable spellchecking." << std::endl; 243 SWIFT_LOG(warning) << "Spellchecking is currently misconfigured in Swift (e.g. missing dictionary or broken dictionary file). Disable spellchecking.";
244 settings_->storeSetting(QtUISettingConstants::SPELL_CHECKER, false); 244 settings_->storeSetting(QtUISettingConstants::SPELL_CHECKER, false);
245 } 245 }
246 246
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index 93fca5f..49f55dd 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2018 Isode Limited. 2 * Copyright (c) 2010-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 */
@@ -49,9 +49,9 @@ QtUIFactory::QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider*
49} 49}
50 50
51QtUIFactory::~QtUIFactory() { 51QtUIFactory::~QtUIFactory() {
52 SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows_.size() << std::endl; 52 SWIFT_LOG(debug) << "Entering QtUIFactory destructor. chatWindows size:" << chatWindows_.size();
53 for (auto chat : chatWindows_) { 53 for (auto chat : chatWindows_) {
54 SWIFT_LOG_ASSERT(chat.isNull(), debug) << "QtUIFactory has active chat windows and has not been reset properly" << std::endl; 54 SWIFT_LOG_ASSERT(chat.isNull(), debug) << "QtUIFactory has active chat windows and has not been reset properly";
55 } 55 }
56 delete chatWindowFactory_; 56 delete chatWindowFactory_;
57} 57}
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index bca9e2e..75a23f8 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2018 Isode Limited. 2 * Copyright (c) 2010-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 */
@@ -141,7 +141,7 @@ void QtWebKitChatView::addMessageBottom(std::shared_ptr<ChatSnippet> snippet) {
141 141
142void QtWebKitChatView::addMessageTop(std::shared_ptr<ChatSnippet> /* snippet */) { 142void QtWebKitChatView::addMessageTop(std::shared_ptr<ChatSnippet> /* snippet */) {
143 // TODO: Implement this in a sensible manner later. 143 // TODO: Implement this in a sensible manner later.
144 SWIFT_LOG(error) << "Not yet implemented!" << std::endl; 144 SWIFT_LOG(error) << "Not yet implemented!";
145} 145}
146 146
147void QtWebKitChatView::addToDOM(std::shared_ptr<ChatSnippet> snippet) { 147void QtWebKitChatView::addToDOM(std::shared_ptr<ChatSnippet> snippet) {
@@ -384,7 +384,7 @@ void QtWebKitChatView::setFileTransferProgress(QString id, const int percentageD
384 rememberScrolledToBottom(); 384 rememberScrolledToBottom();
385 QWebElement ftElement = findElementWithID(document_, "div", id); 385 QWebElement ftElement = findElementWithID(document_, "div", id);
386 if (ftElement.isNull()) { 386 if (ftElement.isNull()) {
387 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id!" << std::endl; 387 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id!";
388 return; 388 return;
389 } 389 }
390 QWebElement progressBar = ftElement.findFirst("div.progressbar"); 390 QWebElement progressBar = ftElement.findFirst("div.progressbar");
@@ -398,7 +398,7 @@ void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileT
398 rememberScrolledToBottom(); 398 rememberScrolledToBottom();
399 QWebElement ftElement = findElementWithID(document_, "div", id); 399 QWebElement ftElement = findElementWithID(document_, "div", id);
400 if (ftElement.isNull()) { 400 if (ftElement.isNull()) {
401 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl; 401 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id);
402 return; 402 return;
403 } 403 }
404 404
@@ -483,7 +483,7 @@ int QtWebKitChatView::getSnippetPositionByDate(const QDate& date) {
483 483
484void QtWebKitChatView::resetTopInsertPoint() { 484void QtWebKitChatView::resetTopInsertPoint() {
485 // TODO: Implement or refactor later. 485 // TODO: Implement or refactor later.
486 SWIFT_LOG(error) << "Not yet implemented!" << std::endl; 486 SWIFT_LOG(error) << "Not yet implemented!";
487} 487}
488 488
489std::string QtWebKitChatView::addMessage( 489std::string QtWebKitChatView::addMessage(
@@ -624,7 +624,7 @@ void QtWebKitChatView::resizeEvent(QResizeEvent* event) {
624} 624}
625 625
626std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, const std::string& avatarPath, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) { 626std::string QtWebKitChatView::addFileTransfer(const std::string& senderName, const std::string& avatarPath, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes, const std::string& description) {
627 SWIFT_LOG(debug) << "addFileTransfer" << std::endl; 627 SWIFT_LOG(debug) << "addFileTransfer";
628 QString ft_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++))); 628 QString ft_id = QString("ft%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
629 629
630 QString actionText; 630 QString actionText;
@@ -726,7 +726,7 @@ static bool isFilePathWritable(const QString& path) {
726void QtWebKitChatView::setFileTransferWarning(QString id, QString warningText) { 726void QtWebKitChatView::setFileTransferWarning(QString id, QString warningText) {
727 QWebElement ftElement = findElementWithID(document_, "div", id); 727 QWebElement ftElement = findElementWithID(document_, "div", id);
728 if (ftElement.isNull()) { 728 if (ftElement.isNull()) {
729 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl; 729 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id);
730 return; 730 return;
731 } 731 }
732 732
@@ -737,7 +737,7 @@ void QtWebKitChatView::setFileTransferWarning(QString id, QString warningText) {
737void QtWebKitChatView::removeFileTransferWarning(QString id) { 737void QtWebKitChatView::removeFileTransferWarning(QString id) {
738 QWebElement ftElement = findElementWithID(document_, "div", id); 738 QWebElement ftElement = findElementWithID(document_, "div", id);
739 if (ftElement.isNull()) { 739 if (ftElement.isNull()) {
740 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl; 740 SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id);
741 return; 741 return;
742 } 742 }
743 743
@@ -829,7 +829,7 @@ void QtWebKitChatView::handleHTMLButtonClicked(QString id, QString encodedArgume
829 window_->resendMessage(Q2PSTRING(chatID)); 829 window_->resendMessage(Q2PSTRING(chatID));
830 } 830 }
831 else { 831 else {
832 SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )" << std::endl; 832 SWIFT_LOG(debug) << "Unknown HTML button! ( " << Q2PSTRING(id) << " )";
833 } 833 }
834} 834}
835 835
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();