# HG changeset patch
# User hgs
# Date 1270150122 -10800
# Node ID 9960575038463a64d753b4e13f64a42f7e457fad
# Parent  bdf78597b41cf7262d8e17a1e6cde976257bc7e4
201002

diff -r bdf78597b41c -r 996057503846 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Jan 26 12:55:56 2010 +0200
+++ b/layers.sysdef.xml	Thu Apr 01 22:28:42 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/mw/videoutils" >
 ]>
 
-<SystemDefinition name="videoutils" schema="1.4.0">
+<SystemDefinition name="videoutils" schema="1.5.1">
   <systemModel>
     <layer name="mw_layer">
       <module name="videoutils">
diff -r bdf78597b41c -r 996057503846 videoconnutility/connutility/src/vcxconnutilimpl.cpp
--- a/videoconnutility/connutility/src/vcxconnutilimpl.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoconnutility/connutility/src/vcxconnutilimpl.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -22,12 +22,12 @@
 #include <bldvariant.hrh>
 #include <commdb.h>            // CMDBSession
 #include <commsdattypesv1_1.h> // CCDWAPIPBearerRecord
-#include <ConnectionUiUtilities.h> 
+#include <connectionuiutilities.h> 
 #include <cmdestination.h>
 #include <cdbcols.h>
 #include <commdbconnpref.h>
 #include <eikbtgrp.h>
-#include <WlanCdbCols.h>
+#include <wlancdbcols.h>
 #include <connpref.h>
 #include <extendedconnpref.h>
 #include <mpxlog.h>
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerClient/src/CCseScheduledProgram.cpp
--- a/videoscheduler/SchedulerClient/src/CCseScheduledProgram.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/CCseScheduledProgram.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDES
-#include <ipvideo/CCseScheduledProgram.h>   // Header file for this class
+#include <ipvideo/ccsescheduledprogram.h>   // Header file for this class
 #include "CseDebug.h"               // Debug macros
 
 // EXTERNAL DATA STRUCTURES
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerClient/src/CCseSchedulerAPI.cpp
--- a/videoscheduler/SchedulerClient/src/CCseSchedulerAPI.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/CCseSchedulerAPI.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -17,10 +17,10 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/CCseSchedulerAPI.h>                   // Header file for this class
-#include <ipvideo/CCseScheduledProgram.h>               // Represent one schedule in database
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Common defines for client and server
-#include <ipvideo/RCseSchedulerClient.h>                // Client common methods (server start up etc)
+#include <ipvideo/ccseschedulerapi.h>                   // Header file for this class
+#include <ipvideo/ccsescheduledprogram.h>               // Represent one schedule in database
+#include <ipvideo/cseschedulerclientservercommon.h>     // Common defines for client and server
+#include <ipvideo/rcseschedulerclient.h>                // Client common methods (server start up etc)
 #include "CseDebug.h"                           // Debug macros
 #include <s32mem.h>
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerClient/src/RCseSchedulerClient.cpp
--- a/videoscheduler/SchedulerClient/src/RCseSchedulerClient.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/RCseSchedulerClient.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -17,9 +17,9 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/RCseSchedulerClient.h>            // Header for this class
+#include <ipvideo/rcseschedulerclient.h>            // Header for this class
 #include "CseDebug.h"                       // Debug macros
-#include <ipvideo/CseSchedulerClientServerCommon.h> // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h> // Common defines for client and server
 #include <e32math.h>
 #include <f32file.h>
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerClient/src/RCseSchedulerService.cpp
--- a/videoscheduler/SchedulerClient/src/RCseSchedulerService.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/RCseSchedulerService.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -19,10 +19,10 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/RCseSchedulerService.h>               // Header fo this class
-#include <ipvideo/CCseScheduledProgram.h>               // Represent one schedule in database
+#include <ipvideo/rcseschedulerservice.h>               // Header fo this class
+#include <ipvideo/ccsescheduledprogram.h>               // Represent one schedule in database
 #include "CseDebug.h"                           // Debug macros
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Client common methods (server start up etc)
+#include <ipvideo/cseschedulerclientservercommon.h>     // Client common methods (server start up etc)
 #include <s32mem.h>
 
 // EXTERNAL DATA STRUCTURES
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerClient/src/RCseSchedulerServiceBase.cpp
--- a/videoscheduler/SchedulerClient/src/RCseSchedulerServiceBase.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerClient/src/RCseSchedulerServiceBase.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -19,10 +19,10 @@
 
 
 // INCLUDE FILES
-#include <ipvideo/RCseSchedulerServiceBase.h>       // Client common methods (open, close etc)
-#include <ipvideo/RCseSchedulerClient.h>            // Client common methods (server start up etc)
+#include <ipvideo/rcseschedulerservicebase.h>       // Client common methods (open, close etc)
+#include <ipvideo/rcseschedulerclient.h>            // Client common methods (server start up etc)
 #include "CseDebug.h"                       // Debug macros
-#include <ipvideo/CseSchedulerClientServerCommon.h> // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h> // Common defines for client and server
 
 // EXTERNAL DATA STRUCTURES
 // None.
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/data/102750D5.rss
--- a/videoscheduler/SchedulerServer/data/102750D5.rss	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/data/102750D5.rss	Thu Apr 01 22:28:42 2010 +0300
@@ -18,7 +18,7 @@
 
 
 
-#include <StartupItem.rh>
+#include <startupitem.rh>
 
 RESOURCE STARTUP_ITEM_INFO CseSchedulerServer
 {
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/inc/CCseSchedulerPluginControllerBase.h
--- a/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginControllerBase.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginControllerBase.h	Thu Apr 01 22:28:42 2010 +0300
@@ -22,8 +22,8 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <ipvideo/MCsePluginObserver.h>
-#include <ipvideo/MCseScheduleObserver.h>
+#include <ipvideo/mcsepluginobserver.h>
+#include <ipvideo/mcsescheduleobserver.h>
 #include "MCseSchedulerTimerObserver.h"
 #include "MCsePluginControllerObserver.h"
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/inc/CCseSchedulerPluginStarter.h
--- a/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginStarter.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/inc/CCseSchedulerPluginStarter.h	Thu Apr 01 22:28:42 2010 +0300
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <e32base.h>
-#include <ipvideo/MCsePluginObserver.h>
+#include <ipvideo/mcsepluginobserver.h>
 #include "MCseSemaphoreSignalObserver.h"
 
 // CONSTANTS
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/inc/CCseSchedulerServerEngine.h
--- a/videoscheduler/SchedulerServer/inc/CCseSchedulerServerEngine.h	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/inc/CCseSchedulerServerEngine.h	Thu Apr 01 22:28:42 2010 +0300
@@ -21,7 +21,7 @@
 #define __CCSESCHEDULERSERVERENGINE_H
 
 //  INCLUDES
-#include <ipvideo/MCseScheduleObserver.h>   // Observer so that CCseSchedulerTimer can inform engine.
+#include <ipvideo/mcsescheduleobserver.h>   // Observer so that CCseSchedulerTimer can inform engine.
 #include "MCsePluginControllerObserver.h"   // Observer so that CCseSchedulerTimer can inform engine.
 #include "CseSchedulerServer.pan"   // Panic codes
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp
--- a/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "CCseScheduleDB.h"         // Header file for this class
-#include <ipvideo/CCseScheduledProgram.h>   // Represent one schedule in database
+#include <ipvideo/ccsescheduledprogram.h>   // Represent one schedule in database
 #include <bautils.h>
 #include "CseDebug.h"               // Debug macros
 #include <babackup.h>
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerLandLord.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerLandLord.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerLandLord.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -19,9 +19,9 @@
 
 #include "CCseSchedulerLandLord.h"
 #include "CCseSchedulerPluginStarter.h"
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerThreadPacket.h"
-#include <ipvideo/MCseScheduleObserver.h>   // Observer for informing engine
+#include <ipvideo/mcsescheduleobserver.h>   // Observer for informing engine
 #include <e32std.h>
 #include "CseDebug.h"               // Debug macros
 #include "CCseSemaphoreController.h"
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerMultiPluginController.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerMultiPluginController.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerMultiPluginController.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -23,7 +23,7 @@
 #include "CseDebug.h"                           // Debug macros
 #include "CCseSchedulerPluginStarter.h"
 #include "CCseSchedulerLandLord.h"
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerTimer.h"
 #include "CCseSchedulerServerEngine.h"
 #include "CCseSchedulerThreadPacket.h"
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerPluginControllerBase.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerPluginControllerBase.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerPluginControllerBase.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include "CCseSchedulerPluginControllerBase.h"
 #include "CseDebug.h"                           // Debug macros
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerTimer.h"
 #include "CCseSchedulerServerEngine.h"
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerPluginStarter.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerPluginStarter.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerPluginStarter.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 #include "CCseSchedulerPluginStarter.h"
 #include "CseDebug.h"                           // Debug macros
-#include <ipvideo/CCseScheduledProgram.h>   // Represent one schedule in database
-#include <ipvideo/CCseSchedulerPluginIF.h>
+#include <ipvideo/ccsescheduledprogram.h>   // Represent one schedule in database
+#include <ipvideo/ccseschedulerpluginif.h>
 #include "CCseSchedulerThreadPacket.h"
 #include "CCseSemaphoreController.h"
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -21,7 +21,7 @@
 #include "CCseSchedulerServer.h"                // Header file for this class
 #include "CCseSchedulerServerSession.h"         // Server session
 #include "CCseSchedulerServerEngine.h"          // Server intelligence aka engine
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h>     // Common defines for client and server
 #include "CseSchedulerServer.pan"               // Server panic codes
 #include "CseDebug.h"                           // Debug macros
 #include <e32svr.h>
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -23,12 +23,12 @@
 #include <e32def.h>
 #include <e32const.h>
 #include "CCseSchedulerServerEngine.h"      // Common methods for server
-#include <ipvideo/CseSchedulerClientServerCommon.h> // Common defines for client and server
-#include <ipvideo/CCseScheduledProgram.h>           // Represent one schedule in database
+#include <ipvideo/cseschedulerclientservercommon.h> // Common defines for client and server
+#include <ipvideo/ccsescheduledprogram.h>           // Represent one schedule in database
 #include "CseDebug.h"                       // Debug macros
 #include "CCseScheduleDB.h"                 // Schedule database
 #include "CCseSchedulerTimer.h"             // Schedule timer for determining schedule times
-#include <ipvideo/CCseSchedulerPluginIF.h>          // Scheduler plugin interface
+#include <ipvideo/ccseschedulerpluginif.h>          // Scheduler plugin interface
 #include "CCseSchedulerUniPluginController.h"
 #include "CCseSchedulerMultiPluginController.h"
 #include "CCseSchedulerServer.h"
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerServerSession.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerServerSession.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServerSession.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -22,7 +22,7 @@
 #include "CCseSchedulerServer.h"                // Common methods for server
 #include "CCseSchedulerServerEngine.h"          // Intelligence aka engine of server
 #include "CseSchedulerServer.pan"               // Server panic codes
-#include <ipvideo/CseSchedulerClientServerCommon.h>     // Common defines for client and server
+#include <ipvideo/cseschedulerclientservercommon.h>     // Common defines for client and server
 #include "CseDebug.h"                           // Debug macros
 
 // EXTERNAL DATA STRUCTURES
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerThreadPacket.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerThreadPacket.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerThreadPacket.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "CCseSchedulerThreadPacket.h"
-#include <ipvideo/CCseScheduledProgram.h>   // Represent one schedule in database
+#include <ipvideo/ccsescheduledprogram.h>   // Represent one schedule in database
 #include <e32std.h>
 #include "CseDebug.h"               // Debug macros
 
diff -r bdf78597b41c -r 996057503846 videoscheduler/SchedulerServer/src/CCseSchedulerUniPluginController.cpp
--- a/videoscheduler/SchedulerServer/src/CCseSchedulerUniPluginController.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoscheduler/SchedulerServer/src/CCseSchedulerUniPluginController.cpp	Thu Apr 01 22:28:42 2010 +0300
@@ -23,7 +23,7 @@
 #include "CseDebug.h"                           // Debug macros
 #include "CCseSchedulerPluginStarter.h"
 #include "CCseSchedulerLandLord.h"
-#include <ipvideo/CCseScheduledProgram.h>
+#include <ipvideo/ccsescheduledprogram.h>
 #include "CCseSchedulerTimer.h"
 #include "CCseSchedulerServerEngine.h"
 
diff -r bdf78597b41c -r 996057503846 videoutils.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videoutils.pro	Thu Apr 01 22:28:42 2010 +0300
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building Videoutils components
+#
+#
+
+TEMPLATE = subdirs
+CONFIG += ordered
+symbian: {
+BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videoutils_plat/group/bld.inf\""
+BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"videoconnutility/group/bld.inf\""
+}