146 XQSERVICE_DEBUG_PRINT("ServiceApp::answerDial"); |
146 XQSERVICE_DEBUG_PRINT("ServiceApp::answerDial"); |
147 if (mDialService && mDialService->asyncAnswer()) |
147 if (mDialService && mDialService->asyncAnswer()) |
148 { |
148 { |
149 mDialService->complete(mNumber->text()); |
149 mDialService->complete(mNumber->text()); |
150 } |
150 } |
|
151 if (mNewDialService && mNewDialService->asyncAnswer()) |
|
152 { |
|
153 mNewDialService->complete(mNumber->text()); |
|
154 } |
151 } |
155 } |
152 |
156 |
153 |
157 |
154 void ServiceApp::answerUri() |
158 void ServiceApp::answerUri() |
155 { |
159 { |
156 XQSERVICE_DEBUG_PRINT("ServiceApp::answerUri"); |
160 XQSERVICE_DEBUG_PRINT("ServiceApp::answerUri"); |
157 if (mUriService && mUriService->asyncAnswer()) |
161 if (mUriService && mUriService->asyncAnswer()) |
158 { |
162 { |
159 mUriService->complete(true); |
163 mUriService->complete(true); |
160 } |
164 } |
|
165 if (mNewUriService && mNewUriService->asyncAnswer()) |
|
166 { |
|
167 mNewUriService->complete(true); |
|
168 } |
161 } |
169 } |
162 |
170 |
163 void ServiceApp::answerFile() |
171 void ServiceApp::answerFile() |
164 { |
172 { |
165 XQSERVICE_DEBUG_PRINT("ServiceApp::answerFile"); |
173 XQSERVICE_DEBUG_PRINT("ServiceApp::answerFile"); |
166 if (mFileService && mFileService->asyncAnswer()) |
174 if (mFileService && mFileService->asyncAnswer()) |
167 { |
175 { |
168 mFileService->complete(true); |
176 mFileService->complete(true); |
|
177 } |
|
178 if (mNewFileService && mNewFileService->asyncAnswer()) |
|
179 { |
|
180 mNewFileService->complete(true); |
169 } |
181 } |
170 } |
182 } |
171 |
183 |
172 |
184 |
173 |
185 |
235 mNumber = number ; |
247 mNumber = number ; |
236 mServiceApp->setLabelNumber(label, number); |
248 mServiceApp->setLabelNumber(label, number); |
237 int ret = 0; |
249 int ret = 0; |
238 if (asyncAnswer) |
250 if (asyncAnswer) |
239 { |
251 { |
240 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
252 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
241 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
253 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
242 } |
254 } |
243 else |
255 else |
244 { |
256 { |
245 ret = number.toInt(); |
257 ret = number.toInt(); |
451 mNumber = number ; |
463 mNumber = number ; |
452 mServiceApp->setLabelNumber(label, number); |
464 mServiceApp->setLabelNumber(label, number); |
453 int ret = 0; |
465 int ret = 0; |
454 if (asyncAnswer) |
466 if (asyncAnswer) |
455 { |
467 { |
456 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
468 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
457 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
469 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
458 } |
470 } |
459 else |
471 else |
460 { |
472 { |
461 ret = number.toInt(); |
473 ret = number.toInt(); |
670 |
682 |
671 mRetValue = retValue; |
683 mRetValue = retValue; |
672 mServiceApp->setLabelNumber(label,param); |
684 mServiceApp->setLabelNumber(label,param); |
673 if (asyncAnswer) |
685 if (asyncAnswer) |
674 { |
686 { |
675 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
687 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
676 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
688 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
677 } |
689 } |
678 |
690 |
679 return retValue; |
691 return retValue; |
680 } |
692 } |
746 |
758 |
747 mRetValue = retValue; |
759 mRetValue = retValue; |
748 mServiceApp->setLabelNumber(label,param); |
760 mServiceApp->setLabelNumber(label,param); |
749 if (asyncAnswer) |
761 if (asyncAnswer) |
750 { |
762 { |
751 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
763 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
752 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
764 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
753 } |
765 } |
754 |
766 |
755 return retValue; |
767 return retValue; |
756 } |
768 } |
814 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
826 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
815 |
827 |
816 mServiceApp->setLabelNumber(label,param); |
828 mServiceApp->setLabelNumber(label,param); |
817 if (asyncAnswer) |
829 if (asyncAnswer) |
818 { |
830 { |
819 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
831 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
820 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
832 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
821 } |
833 } |
822 |
834 |
823 return true; |
835 return true; |
824 } |
836 } |
847 bool asyncAnswer = !info.isSynchronous();; |
859 bool asyncAnswer = !info.isSynchronous();; |
848 |
860 |
849 mServiceApp->setLabelNumber(label,param); |
861 mServiceApp->setLabelNumber(label,param); |
850 if (asyncAnswer) |
862 if (asyncAnswer) |
851 { |
863 { |
852 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
864 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
853 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
865 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
854 } |
866 } |
855 return true; |
867 return true; |
856 } |
868 } |
857 |
869 |
916 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
928 connect(this, SIGNAL(returnValueDelivered()), this, SLOT(handleAnswerDelivered())); |
917 |
929 |
918 mServiceApp->setLabelNumber(label,param); |
930 mServiceApp->setLabelNumber(label,param); |
919 if (asyncAnswer) |
931 if (asyncAnswer) |
920 { |
932 { |
921 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
933 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
922 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
934 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
923 } |
935 } |
924 |
936 |
925 return true; |
937 return true; |
926 } |
938 } |
949 bool asyncAnswer = !info.isSynchronous();; |
961 bool asyncAnswer = !info.isSynchronous();; |
950 |
962 |
951 mServiceApp->setLabelNumber(label,param); |
963 mServiceApp->setLabelNumber(label,param); |
952 if (asyncAnswer) |
964 if (asyncAnswer) |
953 { |
965 { |
954 mAsyncReqIds.insert(info.clientSecureId(), setCurrentRequestAsync()); |
966 mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync()); |
955 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
967 connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect())); |
956 } |
968 } |
957 return true; |
969 return true; |
958 } |
970 } |
959 |
971 |