From 6633e788b1544a49c87d0d84be416ab5d4d193df Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefan.karlsson@gmail.com>
Date: Sun, 31 Aug 2014 23:24:20 +0200
Subject: [PATCH] OP-1458 Embed the delayed next QTimer in ConfigInputWidget

---
 .../src/plugins/config/configinputwidget.cpp         | 12 ++++++------
 .../src/plugins/config/configinputwidget.h           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
index 23e7109bd..76795b3d0 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@@ -56,7 +56,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
     //
     loop(NULL),
     skipflag(false),
-    nextDelayedTimer(new QTimer()),
+    nextDelayedTimer(),
     nextDelayedTick(0),
     nextDelayedLatestActivityTick(0)
 {
@@ -462,8 +462,8 @@ void ConfigInputWidget::wzNextDelayed()
 void ConfigInputWidget::wzNextDelayedStart()
 {
     // Call wzNextDelayed every 100 ms, to see if it's time to go to the next page.
-    connect(nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
-    nextDelayedTimer->start(100);
+    connect(&nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
+    nextDelayedTimer.start(100);
 }
 
 // Cancel the delayed next timer, if it's active.
@@ -471,9 +471,9 @@ void ConfigInputWidget::wzNextDelayedCancel()
 {
     nextDelayedTick = 0;
     nextDelayedLatestActivityTick = 0;
-    if (nextDelayedTimer->isActive()) {
-        nextDelayedTimer->stop();
-        disconnect(nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
+    if (nextDelayedTimer.isActive()) {
+        nextDelayedTimer.stop();
+        disconnect(&nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
     }
 }
 
diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.h b/ground/openpilotgcs/src/plugins/config/configinputwidget.h
index 3f6d6535b..c45ef5bd1 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.h
@@ -97,7 +97,7 @@ private:
     bool skipflag;
 
     // Variables to support delayed transitions when detecting input controls.
-    QTimer *nextDelayedTimer;
+    QTimer nextDelayedTimer;
     int nextDelayedTick;
     int nextDelayedLatestActivityTick;