--- a/telutils/keysequencerecognitionservice/tsrc/ut_manufacturerkeysequencehandler/ut_manufacturerkeysequencehandler.cpp	Wed Aug 18 10:19:22 2010 +0300
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_manufacturerkeysequencehandler/ut_manufacturerkeysequencehandler.cpp	Thu Sep 02 21:00:29 2010 +0300
@@ -85,12 +85,12 @@
     XQAiwInterfaceDescriptor dummyDescriptor;
     QPointer<XQAiwRequest> request =
         new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("devicemanager"), 
             QString("showVersionNumber()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     bool handled = m_handler->executeKeySequence(KCodeSwVersion);
     
@@ -106,12 +106,12 @@
     XQAiwInterfaceDescriptor dummyDescriptor;
     QPointer<XQAiwRequest> request =
         new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.symbian"), QString("IFactoryReset"), 
             QString("showResetUi()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     bool handled = m_handler->executeKeySequence(KCodeActivateRfsNormal);
     
@@ -121,12 +121,12 @@
     QCOMPARE(handled, true);
     
     request = new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.symbian"), QString("IFactoryReset"), 
             QString("showResetUi()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     handled = m_handler->executeKeySequence(KCodeActivateRfsDeep);
     
@@ -142,12 +142,12 @@
     XQAiwInterfaceDescriptor dummyDescriptor;
     QPointer<XQAiwRequest> request =
         new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("bluetooth"), 
             QString("showBluetoothDeviceAddress()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     bool handled = m_handler->executeKeySequence(KCodeBtAddress);
     
@@ -157,12 +157,12 @@
     QCOMPARE(handled, true);
     
     request = new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("bluetooth"), 
             QString("showBluetoothLoopback()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     handled = m_handler->executeKeySequence(KCodeRFLoopback);
     
@@ -187,12 +187,12 @@
     XQAiwInterfaceDescriptor dummyDescriptor;
     QPointer<XQAiwRequest> request =
         new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("devicemanager"), 
             QString("showVersionNumber()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(false);
+    EXPECT(XQAiwRequest, send).returns(false);
     
     bool handled = m_handler->executeKeySequence(KCodeSwVersion);
     m_handler->requestError(0, QString(""));
@@ -203,12 +203,12 @@
     
     // controlled asynchronous Qt Highway error during request processing
     request = new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("devicemanager"), 
             QString("showVersionNumber()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     handled = m_handler->executeKeySequence(KCodeSwVersion);
     
@@ -220,12 +220,12 @@
     
     // exception during service request dispatching/send
     request = new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("devicemanager"), 
             QString("showVersionNumber()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send)
+    EXPECT(XQAiwRequest, send)
         .willOnce(invokeWithoutArguments(generateException));
     
     int result = 0;
@@ -247,12 +247,12 @@
     XQAiwInterfaceDescriptor dummyDescriptor;
     QPointer<XQAiwRequest> request =
         new XQAiwRequest(dummyDescriptor, QString(""), KIsEmbedded);
-    EXPECT(XQApplicationManager::create)
+    EXPECT(XQApplicationManager, create)
         .with(
             QString("com.nokia.services"), QString("devicemanager"), 
             QString("showVersionNumber()"), KIsEmbedded)
         .returns(request.data());
-    EXPECT(XQAiwRequest::send).returns(true);
+    EXPECT(XQAiwRequest, send).returns(true);
     
     bool handled = m_handler->executeKeySequence(KCodeSwVersion);
     
@@ -261,8 +261,8 @@
     QCOMPARE(handled, true);
     
     // simultaneous request attempt
-    EXPECT(XQApplicationManager::create).times(0);
-    EXPECT(XQAiwRequest::send).times(0);
+    EXPECT(XQApplicationManager, create).times(0);
+    EXPECT(XQAiwRequest, send).times(0);
     handled = m_handler->executeKeySequence(KCodeSwVersion);
     QCOMPARE(handled, false);
 }