make timerStart called twice just reset, instead of stop

2 files changed, 28 insertions, 21 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 9898332..0eb2b83 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -266,23 +266,34 @@ void Clock::clearClock( void )
 }
 
+void Clock::startSWatch()
+{
+		swatch_start.start();
+		set->setText( tr( "Stop" ) );
+		t->start( 1000 );
+		swatch_running = TRUE;
+			// disable screensaver while stop watch is running
+		toggleScreenSaver( FALSE );
+}
+
+void Clock::stopSWatch()
+{
+		swatch_totalms += swatch_start.elapsed();
+		set->setText( tr( "Start" ) );
+		t->stop();
+		swatch_running = FALSE;
+		toggleScreenSaver( TRUE );
+		updateClock();
+}
+
+
 void Clock::slotSet()
 {
   if ( t->isActive() )
 		{
-			swatch_totalms += swatch_start.elapsed();
-			set->setText( tr( "Start" ) );
-			t->stop();
-			swatch_running = FALSE;
-			toggleScreenSaver( TRUE );
-			updateClock();
+				startSWatch();
 		}
   else
 		{
-			swatch_start.start();
-			set->setText( tr( "Stop" ) );
-			t->start( 1000 );
-			swatch_running = TRUE;
-				// disable screensaver while stop watch is running
-			toggleScreenSaver( FALSE );
+				stopSWatch();
 		}
 }
@@ -602,20 +613,14 @@ void Clock::slotAdjustTime()
 void Clock::slotStartTimer()
 {
-  Config cfg( "Clock" );
-  cfg.setGroup( "Mode" );
-	int mode = cfg.readBoolEntry( "clockMode");
   if ( clockRB->isChecked() )
 		setSwatchMode( 1);
-	slotSet();
+	startSWatch();
 }
 
 void Clock::slotStopTimer()
 {
-  Config cfg( "Clock" );
-  cfg.setGroup( "Mode" );
-	int mode = cfg.readBoolEntry( "clockMode");
   if ( clockRB->isChecked() )
 		setSwatchMode( 1);
-slotSet();
+	stopSWatch();
 }
 
@@ -629,5 +634,5 @@ slotReset();
 void Clock::setSwatchMode(int mode)
 {
-	qDebug("Clock::setSwatchMode( %d)"), mode;
+	qDebug("Clock::setSwatchMode( %d)", mode);
 	swatchRB->setChecked( mode);
 	clearClock( );
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h
index 9b00e28..1e5aa2c 100644
--- a/noncore/tools/clock/clock.h
+++ b/noncore/tools/clock/clock.h
@@ -101,4 +101,6 @@ private:
     void clearClock();
     void clearTimer();
+    void startSWatch();
+    void stopSWatch();
 };