diff options
author | Nicolas Bertrand <nicolas.bertrand@linux.intel.com> | 2011-05-11 13:46:45 +0200 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2011-05-11 13:49:32 -0500 |
commit | 66a89e74f08a7b5d2446ff299fe07495f1a3bf3e (patch) | |
tree | 71947597ed3e123d81a54de179c0853fd29b8e64 | |
parent | 2f769131d1ff415de783398c54cd1ef91e1d3465 (diff) | |
download | phonesim-66a89e74f08a7b5d2446ff299fe07495f1a3bf3e.tar.gz |
callmanager: Change call state management slots
-rw-r--r-- | src/callmanager.cpp | 7 | ||||
-rw-r--r-- | src/callmanager.h | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/callmanager.cpp b/src/callmanager.cpp index 0ede2ad..8085056 100644 --- a/src/callmanager.cpp +++ b/src/callmanager.cpp @@ -700,6 +700,10 @@ bool CallManager::chld4() void CallManager::dialingToConnected() { + // Stop timers in case they are still active + alertingTimer->stop(); + connectTimer->stop(); + // Find the currently dialing or alerting call. int index = indexForId( idForState( CallState_Dialing ) ); if ( index < 0 ) @@ -726,6 +730,9 @@ void CallManager::dialingToConnected() void CallManager::dialingToAlerting() { + // Stop the timer in case it is still active + alertingTimer->stop(); + // Find the currently dialing or alerting call. int index = indexForId( idForState( CallState_Dialing ) ); if ( index < 0 ) diff --git a/src/callmanager.h b/src/callmanager.h index 228e26c..c953a7d 100644 --- a/src/callmanager.h +++ b/src/callmanager.h @@ -100,6 +100,12 @@ public slots: void startIncomingCall( const QString& number, const QString& calledNumber, const QString& name ); + // Transition the active dialing or alerting call to connected. + void dialingToConnected(); + + // Transition the active dialing call to alerting. + void dialingToAlerting(); + signals: // Send a response to a command. void send( const QString& line ); @@ -118,12 +124,6 @@ signals: void callStatesChanged( QList<CallInfo> *list ); private slots: - // Transition the active dialing or alerting call to connected. - void dialingToConnected(); - - // Transition the active dialing call to alerting. - void dialingToAlerting(); - // Transition the waiting call to incoming. void waitingToIncoming(); |