# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1270060376 -10800
# Node ID b2f9a76933e1ee3f4ba857547111184b8a778725
# Parent  f096c31e006a2970021aca40d2a6bd420a49a1dd
Revision: 201011
Kit: 201013

diff -r f096c31e006a -r b2f9a76933e1 package_definition.xml
--- a/package_definition.xml	Mon Mar 15 12:40:40 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="speechsrv" name="Speech Recognition UIs" levels="engine framework ui">
-    <collection id="voiceui" name="Voice UI" level="ui">
-      <component id="vcommand" filter="s60" name="Voice Commands UI" introduced="^1">
-        <unit bldFile="voiceui/vcommand/group"/>
-      </component>
-      <component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
-        <unit bldFile="voiceui/voiceuivoicerecognition/group"/>
-      </component>
-      <component id="pbkinfoviewimpl" filter="s60" name="Phonebook Info View Implementation" introduced="^1">
-        <unit bldFile="voiceui/pbkinfoviewimpl/group"/>
-      </component>
-      <component id="aiwpbkinfoviewprovider" filter="s60" name="AIW Phonebook Info View Provider" class="plugin" introduced="^1">
-        <unit bldFile="voiceui/aiwpbkinfoviewprovider/group"/>
-      </component>
-      <component id="vccontrolpanelplugin" filter="s60" name="Voice Commands Control Panel Plugin" class="plugin" introduced="^1">
-        <unit bldFile="voiceui/vccontrolpanelplugin/group"/>
-      </component>
-      <component id="voiceui_build" filter="s60" name="Voice UI Build" introduced="^1">
-        <unit bldFile="voiceui/group"/>
-      </component>
-    </collection>
-    <collection id="srsf" name="Speech Recognition and Synthesis Framework" level="framework">
-      <component id="sispeechrecognitiondata" filter="s60" name="SI Speech Recognition Data">
-        <unit bldFile="srsf/sispeechrecognitiondata/group"/>
-      </component>
-      <component id="ttscommon" filter="s60" name="TTS Common">
-        <unit bldFile="srsf/ttscommon/group"/>
-      </component>
-      <component id="devtts" filter="s60" name="Text to Speech">
-        <unit bldFile="srsf/devtts/group"/>
-      </component>
-      <component id="ttscustomcommands" filter="s60" name="TTS Custom Commands">
-        <unit bldFile="srsf/ttscustomcommands/group"/>
-      </component>
-      <component id="ttscontrollerplugin" filter="s60" name="TTS Controller Plugin" class="plugin">
-        <unit bldFile="srsf/ttscontrollerplugin/group"/>
-      </component>
-      <component id="ttsutility" filter="s60" name="TTS Utility">
-        <unit bldFile="srsf/ttsutility/group"/>
-      </component>
-      <component id="speechsynthesis" filter="s60" name="Speech Synthesis">
-     	<!-- can only have one unit. #include these from a common bld.inf -->
-        <unit bldFile="srsf/speechsynthesis/client/group"/>
-        <unit bldFile="srsf/speechsynthesis/server/group"/>
-        <unit bldFile="srsf/speechsynthesis/tsrc/speechsynthesistest/group"/>
-        <!-- <unit bldFile="srsf/speechsynthesis/tsrc/testapplication/group"/> -->
-        <!-- <unit bldFile="srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
-      </component>
-      <component id="devasr" filter="s60" name="Audio Recording and Speech Recognition">
-        <unit bldFile="srsf/devasr/group"/>
-      </component>
-      <component id="sicc" filter="s60" name="Speaker Independent Custom Commands">
-        <unit bldFile="srsf/sicc/group"/>
-      </component>
-      <component id="sisrscontrollerplugin" filter="s60" name="SI SRS Controller Plugin" class="plugin">
-        <unit bldFile="srsf/sisrscontrollerplugin/group"/>
-      </component>
-      <component id="siutility" filter="s60" name="Speaker Independent Utility">
-        <unit bldFile="srsf/siutility/group"/>
-      </component>
-      <component id="nssvasapi" filter="s60" name="NSS VAS API">
-        <unit bldFile="srsf/nssvasapi/group"/>
-        <!-- <unit bldFile="srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
-      </component>
-      <component id="nssvascontacthdlr" filter="s60" name="NSS VAS Contact Handler">
-        <unit bldFile="srsf/nssvascontacthdlr/group"/>
-      </component>
-      <component id="vcommandhandler" filter="s60" name="Voice Command Handler">
-        <unit bldFile="srsf/vcommandhandler/group"/>
-      </component>
-      <component id="vuiphandler" filter="s60" name="Voice UI Plugin Handler">
-        <unit bldFile="srsf/vuiphandler/group"/>
-      </component>
-      <component id="vcommandexecutor" filter="s60" name="Voice Command Executor">
-        <unit bldFile="srsf/vcommandexecutor/group"/>
-      </component>
-      <component id="vcommandexecutorbearer" filter="s60" name="Voice Command Executor Bearer">
-        <unit bldFile="srsf/vcommandexecutorbearer/group"/>
-      </component>
-      <component id="vcommandmanager" filter="s60" name="Voice Command Manager">
-        <unit bldFile="srsf/vcommandmanager/group"/>
-      </component>
-      <component id="vcexecutorapp" filter="s60" name="Voice Command Executor Application">
-        <unit bldFile="srsf/vcexecutorapp/group"/>
-      </component>
-      <component id="profileobserverplugin" filter="s60" name="Profile Observer Plugin" class="plugin">
-        <unit bldFile="srsf/profileobserverplugin/group"/>
-      </component>
-      <component id="srsf_build" filter="s60" name="Speech Recognition and Synthesis Framework Build">
-      	<!-- should distribute this into the above components -->
-        <unit bldFile="srsf/group"/>
-      </component>
-    </collection>
-    <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
-      <component id="speechsrv_test" filter="s60" purpose="development" name="Speech Recognition UIs Test">
-        <!-- <unit bldFile="tsrc/group"/> -->
-      </component>
-      <component id="speechsrv_plat" filter="s60" name="Speech Recognition UIs Platform Interfaces" class="api">
-        <unit bldFile="speechsrv_plat/group"/>
-        	<!-- can only have one unit: can this be #included in the above? -->
-        <unit bldFile="speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
diff -r f096c31e006a -r b2f9a76933e1 srsf/profileobserverplugin/src/vuipprofileobserverecomsupport.cpp
--- a/srsf/profileobserverplugin/src/vuipprofileobserverecomsupport.cpp	Mon Mar 15 12:40:40 2010 +0200
+++ b/srsf/profileobserverplugin/src/vuipprofileobserverecomsupport.cpp	Wed Mar 31 21:32:56 2010 +0300
@@ -19,7 +19,7 @@
 #include "vuipprofileobserverplugin.h"
 
 #include <implementationproxy.h>
-#include <NssVuipf.hrh>
+#include <nssvuipf.hrh>
 
 
 const TImplementationProxy ImplementationTable[] = 
diff -r f096c31e006a -r b2f9a76933e1 srsf/vcexecutorapp/src/appcontroller.cpp
--- a/srsf/vcexecutorapp/src/appcontroller.cpp	Mon Mar 15 12:40:40 2010 +0200
+++ b/srsf/vcexecutorapp/src/appcontroller.cpp	Wed Mar 31 21:32:56 2010 +0300
@@ -75,7 +75,7 @@
 #include <aiwdialdata.h>
 #include <AiwDialDataTypes.h>
 #include <AiwServiceHandler.h>
-#include <GSLauncher.h>
+#include <gslauncher.h>
 
 
 // Cover UI start
diff -r f096c31e006a -r b2f9a76933e1 srsf/vcommandmanager/src/vcmanagerappui.cpp
--- a/srsf/vcommandmanager/src/vcmanagerappui.cpp	Mon Mar 15 12:40:40 2010 +0200
+++ b/srsf/vcommandmanager/src/vcmanagerappui.cpp	Wed Mar 31 21:32:56 2010 +0300
@@ -21,7 +21,7 @@
 #include <akntitle.h>
 #include <f32file.h>
 #include <apgwgnam.h>
-#include <aknsgcc.h>
+#include <AknSgcc.h>
 #include <nssvasccontacthandler.h>
 #include <data_caging_path_literals.hrh>
 #include "nssvoiceuipluginhandler.h"
diff -r f096c31e006a -r b2f9a76933e1 srsf/vuiphandler/src/nssvoiceuipluginhandler.cpp
--- a/srsf/vuiphandler/src/nssvoiceuipluginhandler.cpp	Mon Mar 15 12:40:40 2010 +0200
+++ b/srsf/vuiphandler/src/nssvoiceuipluginhandler.cpp	Wed Mar 31 21:32:56 2010 +0300
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 #include <ecom.h>
-#include <NssVuipf.hrh>
+#include <nssvuipf.hrh>
 #include "nssvoiceuipluginhandler.h" 
 #include "rubydebug.h"
 #include <nssvoicestatus.h>
diff -r f096c31e006a -r b2f9a76933e1 voiceui/vccontrolpanelplugin/inc/vccontrolpanelplugin.h
--- a/voiceui/vccontrolpanelplugin/inc/vccontrolpanelplugin.h	Mon Mar 15 12:40:40 2010 +0200
+++ b/voiceui/vccontrolpanelplugin/inc/vccontrolpanelplugin.h	Wed Mar 31 21:32:56 2010 +0300
@@ -20,9 +20,9 @@
 
 #include <gsplugininterface.h>
 #include <aknview.h>
-#include <coneresloader.h>
+#include <ConeResLoader.h>
 #include <eikclb.h>
-#include <aknserverapp.h>
+#include <AknServerApp.h>
 #include "vccontrolpanelpluginuids.hrh"
 
 class CAknNavigationDecorator;
diff -r f096c31e006a -r b2f9a76933e1 voiceui/vccontrolpanelplugin/src/vccontrolpanelplugin.cpp
--- a/voiceui/vccontrolpanelplugin/src/vccontrolpanelplugin.cpp	Mon Mar 15 12:40:40 2010 +0200
+++ b/voiceui/vccontrolpanelplugin/src/vccontrolpanelplugin.cpp	Wed Mar 31 21:32:56 2010 +0300
@@ -19,11 +19,11 @@
 // GS Framework and this plugin.
 #include    "vccontrolpanelplugin.h"
 #include    <vccontrolpanelplugin.mbg>
-#include    <GSParentPlugin.h>
-#include    <GSCommon.hrh>
+#include    <gsparentplugin.h>
+#include    <gscommon.hrh>
 #include    <vccontrolpanelpluginrsc.rsg>
-#include    <GSPrivatePluginProviderIds.h>
-#include    <GSFWViewUIDs.h>
+#include    <gsprivatepluginproviderids.h>
+#include    <gsfwviewuids.h>
 #include    <AknsUtils.h> 
 
 // General services.