From f8432f8a8be7ac36c87a2d50ab0ddf5599ee18cf Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Mon, 8 Feb 2016 13:50:29 +0100 Subject: [PATCH] Revert "full repaired" This reverts commit 76f573ec26945016f62a2a965b79f0fccc7d2fab. --- HotkeyTest/hottestwidget.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/HotkeyTest/hottestwidget.cpp b/HotkeyTest/hottestwidget.cpp index 771f145..0574ddb 100644 --- a/HotkeyTest/hottestwidget.cpp +++ b/HotkeyTest/hottestwidget.cpp @@ -7,8 +7,8 @@ HotTestWidget::HotTestWidget(QWidget *parent) : hotkey_1(new QHotkey(this)), hotkey_2(new QHotkey(this)), hotkey_3(new QHotkey(this)), - hotkey_4(new QHotkey(this)), - hotkey_5(new QHotkey(this)), + hotkey_4(new QHotkey(NULL)), + hotkey_5(new QHotkey(NULL)), thread4(new QThread(this)), thread5(new QThread(this)), testHotkeys() @@ -100,6 +100,9 @@ HotTestWidget::~HotTestWidget() this->thread5->quit(); this->thread5->wait(); + delete this->hotkey_4; + delete this->hotkey_5; + delete ui; } @@ -198,9 +201,7 @@ void HotTestWidget::on_threadEnableCheckBox_clicked() Q_ASSERT(!this->hotkey_4->isRegistered()); Q_ASSERT(!this->hotkey_5->isRegistered()); - this->hotkey_4->setParent(NULL); this->hotkey_4->moveToThread(this->thread4); - this->hotkey_5->setParent(NULL); this->hotkey_5->moveToThread(this->thread5); QApplication::processEvents(); @@ -209,16 +210,10 @@ void HotTestWidget::on_threadEnableCheckBox_clicked() connect(this->thread4, &QThread::finished, this, [this](){ this->hotkey_4->moveToThread(qApp->thread()); - connect(this->thread4, &QThread::destroyed, this, [this](){ - delete this->hotkey_4; - }, Qt::DirectConnection); - }, Qt::DirectConnection); + }); connect(this->thread5, &QThread::finished, this, [this](){ this->hotkey_5->moveToThread(qApp->thread()); - connect(this->hotkey_5, &QThread::destroyed, this, [this](){ - delete this->hotkey_5; - }, Qt::DirectConnection); - }, Qt::DirectConnection); + }); this->ui->tabWidget->setCurrentIndex(0); }