[Ktutorial-commits] SF.net SVN: ktutorial:[283] trunk/ktutorial

[<dan...@us...>]

Revision: 283
          http://ktutorial.svn.sourceforge.net/ktutorial/?rev=283&view=rev
Author:   danxuliu
Date:     2010-10-29 23:05:17 +0000 (Fri, 29 Oct 2010)

Log Message:
-----------
Make QueuedActionsHelper objects child of the test objects instead of deleting them using QTimer::singleShot(..., SLOT(deleteLater())).

Modified Paths:
--------------
    trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserTest.cpp
    trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp
    trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp
    trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp

Modified: trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserTest.cpp	2010-10-29 21:47:59 UTC (rev 282)
+++ trunk/ktutorial/ktutorial-editor/tests/unit/view/RemoteObjectChooserTest.cpp	2010-10-29 23:05:17 UTC (rev 283)
@@ -450,11 +450,14 @@
 Q_OBJECT
 public:
 
-    QueuedActionsHelper(QWidget* widget = 0):
-            QObject(widget),
-        mWidget(widget) {
+    QueuedActionsHelper(QObject* parent = 0): QObject(parent),
+        mWidget(0) {
     }
 
+    void setWidget(QWidget* widget) {
+        mWidget = widget;
+    }
+
 public slots:
 
     void closeInformation() const {
@@ -497,22 +500,20 @@
 };
 
 void RemoteObjectChooserTest::closeInformationMessageBox(int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper();
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
     QTimer::singleShot(timeToWait, helper, SLOT(closeInformation()));
-    QTimer::singleShot(timeToWait, helper, SLOT(deleteLater()));
 }
 
 void RemoteObjectChooserTest::closeSorryMessageBox(QWidget* widget,
                                                    int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper(widget);
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
+    helper->setWidget(widget);
     QTimer::singleShot(timeToWait, helper, SLOT(closeSorry()));
-    QTimer::singleShot(timeToWait, helper, SLOT(deleteLater()));
 }
 
 void RemoteObjectChooserTest::killTargetApplication(int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper();
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
     QTimer::singleShot(timeToWait, helper, SLOT(killTargetApplication()));
-    QTimer::singleShot(timeToWait, helper, SLOT(deleteLater()));
 }
 
 QTreeView* RemoteObjectChooserTest::remoteObjectsTreeView(

Modified: trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp	2010-10-29 21:47:59 UTC (rev 282)
+++ trunk/ktutorial/ktutorial-library/tests/WaitForWindowTest.cpp	2010-10-29 23:05:17 UTC (rev 283)
@@ -218,7 +218,7 @@
 Q_OBJECT
 public:
 
-    QueuedActionsHelper(QObject* object = 0): QObject(object) {
+    QueuedActionsHelper(QObject* parent = 0): QObject(parent) {
     }
 
     void setWaitForWindow(WaitForWindow* waitForWindow) {
@@ -246,11 +246,10 @@
 void WaitForWindowTest::queueAssertConditionMet(WaitForWindow* waitForWindow,
                                                 QSignalSpy* waitEndedSpy,
                                                 int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper();
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
     helper->setWaitForWindow(waitForWindow);
     helper->setWaitEndedSpy(waitEndedSpy);
     QTimer::singleShot(timeToWait, helper, SLOT(assertConditionMet()));
-    QTimer::singleShot(timeToWait, helper, SLOT(deleteLater()));
 }
 
 QTEST_MAIN(WaitForWindowTest)

Modified: trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp	2010-10-29 21:47:59 UTC (rev 282)
+++ trunk/ktutorial/ktutorial-library/tests/view/StepWidgetTest.cpp	2010-10-29 23:05:17 UTC (rev 283)
@@ -362,7 +362,7 @@
 Q_OBJECT
 public:
 
-    QueuedActionsHelper(QObject* object = 0): QObject(object) {
+    QueuedActionsHelper(QObject* parent = 0): QObject(parent) {
     }
 
     void setStepWidget(StepWidget* stepWidget) {
@@ -407,10 +407,9 @@
 
 void StepWidgetTest::queueAssertWidgetDragged(StepWidget* stepWidget,
                                               int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper();
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
     helper->setStepWidget(stepWidget);
     QTimer::singleShot(timeToWait, helper, SLOT(assertWidgetDragged()));
-    QTimer::singleShot(timeToWait + 1000, helper, SLOT(deleteLater()));
 }
 
 }

Modified: trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp
===================================================================
--- trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp	2010-10-29 21:47:59 UTC (rev 282)
+++ trunk/ktutorial/ktutorial-library/tests/view/WindowOnTopEnforcerTest.cpp	2010-10-29 23:05:17 UTC (rev 283)
@@ -780,7 +780,7 @@
 Q_OBJECT
 public:
 
-    QueuedActionsHelper(QObject* object = 0): QObject(object) {
+    QueuedActionsHelper(QObject* parent = 0): QObject(parent) {
     }
 
     void setAssertWidget(QWidget* widget) {
@@ -812,19 +812,17 @@
 void WindowOnTopEnforcerTest::queueAssertParent(QWidget* widget,
                                                 QWidget* parent,
                                                 int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper();
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
     helper->setAssertWidget(widget);
     helper->setAssertParent(parent);
     QTimer::singleShot(timeToWait, helper, SLOT(assertParent()));
-    QTimer::singleShot(timeToWait, helper, SLOT(deleteLater()));
 }
 
 void WindowOnTopEnforcerTest::queueAssertIsVisibleWindow(QWidget* widget,
                                                          int timeToWait) {
-    QueuedActionsHelper* helper = new QueuedActionsHelper();
+    QueuedActionsHelper* helper = new QueuedActionsHelper(this);
     helper->setAssertWidget(widget);
     QTimer::singleShot(timeToWait, helper, SLOT(assertIsVisibleWindow()));
-    QTimer::singleShot(timeToWait, helper, SLOT(deleteLater()));
 }
 
 void WindowOnTopEnforcerTest::assertWindow(QWidget* window,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.