--- a/templates/com.nokia.carbide.cpp.templates/plugin.properties	Thu May 20 17:31:02 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.properties	Thu May 20 18:40:28 2010 -0500
@@ -1,15 +1,11 @@
 SymbianOS.label=Symbian OS
 GenericSymbianOS.label=Generic Symbian OS
 S60.3.label=S60
-S80.label=Series 80
-UIQ.label=UIQ
-Tutorials.label=Tutorials
 gui.label=GUI Application
 dll.label=Basic dynamically linked library (DLL)
 exe.label=Basic console application (EXE)
 lib.label=Basic static library (LIB)
 empty.label=Empty Project for Symbian
-uiq3.label=3.x GUI Application
 openc.label=Open C Console Application
 cclass.label=Simple Symbian Style C++ Class
 activeobject.label=Active Object Class
\ No newline at end of file

--- a/templates/com.nokia.carbide.cpp.templates/plugin.xml	Thu May 20 17:31:02 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.xml	Thu May 20 18:40:28 2010 -0500
@@ -44,14 +44,6 @@
             wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
 
       <template
-      		displayName="%uiq3.label"
-            filterArguments="UIQ:3.0-3.9"
-            groupLabel="%UIQ.label"
-            image="icons/icon_UIQ.png"
-            location="templates/projecttemplates/UIQ30-HelloWorld/template.xml"
-            templateId="com.nokia.carbide.cpp.templates.uiq30.helloworld"
-            wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
-      <template
       		displayName="%openc.label"
             filterArguments="S60:3.0-5.9"
             groupLabel="%S60.3.label"

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Group/Bld.inf	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-============================================================================
- Name		: bld.inf
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : This file provides the information required for building the
-				whole of a $(baseName).
-============================================================================
-*/
-
-PRJ_MMPFILES
-$(baseName).mmp
-
-PRJ_PLATFORMS
-// Specify the platforms your component needs to be built for here.
-WINSCW
-GCCE
-ARMV5

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Group/baseName.mmp	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName).mmp
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : This is the project specification file for $(baseName).
-				For more information see the "MMP file syntax" section in 
-				the SDK documentation.
-============================================================================
-*/
-
-// Specify the file generated by the project
-TARGET			$(baseName).exe
-// UID1 - System level identifier.
-TARGETTYPE		EXE
-
-// UID specify UID2 and UID3 for the project.
-// UID2 - Can be thought of as an interface identifier.
-// UID3 - Can be thought of as a project identifier.
-// For more information about UID see "How to use UIDs" section 
-// in the SDK documentation. 
-// The UID3 is also specified in $(baseName)_reg.rss, $(baseName)Globals.h
-// and the .pkg files.
-// For all SDK examples test range UID is used (>0x8000000), these will not 
-// work in released products.
-UID				0x100039CE $(uid3)
-
-// SOURCEPATH - Define the location of the project and its work files
-SOURCEPATH		..\$(dataDir) 
-
-// Specifies how a resource file should be compiled
-// TARGETPATH - Define the directory where the resource should be built into.
-// HEADER - Tells the resource compiler to produce a file
-// \epoc32\include\<appname>.rsg, which defines macro constants through which
-// C++ programs can refer to resource structures.
-// LANG - Indicate languages code for the project. The default language code is SC.
-START RESOURCE 	$(baseName).rss
-HEADER
-TARGETPATH 		\Resource\Apps
-LANG			SC
-END
-
-// Application must provide a registration file, which gives 
-// non-localisable information. 
-// TARGETPATH - All registration files in the system shall be located in the 
-// same path, this due to security reasons. On the emulator, all registration 
-// files should be located in \private\10003a3f\apps. For applications 
-// installed onto a phone using the standard software installation method, 
-// their registration files should be installed into 
-// \private\10003a3f\import\apps, but that is defined in the pkg file.
-START RESOURCE	$(baseName)_reg.rss
-TARGETPATH		\private\10003a3f\apps
-END
-
-// This file defines the application's captions and the name of the icon file
-// TARGETPATH - Define the directory where the resource should be built into.
-// LANG - Indicate languages code for the project. The default language code is SC.
-START RESOURCE	$(baseName)_loc.rss
-TARGETPATH		\Resource\Apps
-LANG			SC
-END
-
-// SOURCEPATH - Define the location of the project and its work files
-// USERINCLUDE - Define directories to be scanned for files specified in 
-// #include statements in source and resource files.
-SOURCEPATH		..\$(sourceDir)
-USERINCLUDE		..\$(incDir)
-SOURCE			$(baseName)Application.cpp
-SOURCE			$(baseName)Document.cpp
-SOURCE			$(baseName)AppUi.cpp
-SOURCE			$(baseName)View.cpp
-
-// SYSTEMINCLUDE - Define directories to be scanned for files specified in 
-// #include statements in source and resource files.
-SYSTEMINCLUDE	\EPOC32\INCLUDE
-
-// Specifies import libraries
-LIBRARY			euser.lib 
-LIBRARY			apparc.lib 
-LIBRARY			cone.lib 
-LIBRARY			eikcore.lib 
-LIBRARY			eikcoctl.lib 
-LIBRARY			qikcore.lib
-
-// New heap allocator, which is more effective in out of memory situations.
-// You only need to include the libs in the mmp file to use the new heap allocator.
-STATICLIBRARY	qikalloc.lib
-LIBRARY			qikallocdll.lib
-
-// This section has bitmaps for application icons.
-// Specifies how to compile bitmap (.bmp) files into a Symbian OS 
-// format multi-bitmap (.mbm) file. 
-// Different sizes of source bitmap should be supplied. The OS selects the 
-// most appropriate icon size for the UI's current zoom state. This avoids the 
-// need for the icon to be dynamically scaled when it is drawn at a different size. 
-// For each image, an image bitmap and a mask bitmap are needed. The mask 
-// should be black for the parts of the image that should be visible, and white
-// for the transparent areas.
-// For more information about UID see "Defining application icons, captions 
-// and properties" section in the SDK documentation. 
-START BITMAP	$(baseName)AppIcon.mbm
-HEADER
-TARGETPATH		\Resource\Apps
-SOURCEPATH		..\$(imagesDir)
-// Source Color-depth Source-bitmap-list
-// c denotes whether the bitmap is a colour bitmap and the digits represent the
-// colour-depth of the bitmap and the bitmap mask respectively
-SOURCE	c24		$(baseName)_Small.bmp
-SOURCE	8		$(baseName)_Small_mask.bmp
-SOURCE	c24		$(baseName)_Large.bmp
-SOURCE	8		$(baseName)_Large_mask.bmp
-SOURCE	c24		$(baseName)_xLarge.bmp
-SOURCE	8		$(baseName)_xLarge_mask.bmp
-END
-
-#ifdef ENABLE_ABIV2_MODE
-  DEBUGGABLE_UDEBONLY
-#endif

Binary file templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Images/baseName_Large.bmp has changed

Binary file templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Images/baseName_Large_mask.bmp has changed

Binary file templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Images/baseName_Small.bmp has changed

Binary file templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Images/baseName_Small_mask.bmp has changed

Binary file templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Images/baseName_xLarge.bmp has changed

Binary file templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Images/baseName_xLarge_mask.bmp has changed

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Inc/baseName.hrh	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName) resource header file $(baseName).hrh
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : This file defines the command IDs that are shared by both the C++ code and
-				the resource definition. This file should be #included in both the 
-				application's resource file and header file.
-============================================================================
-*/
-
-// This file defines the command IDs that are shared by both the C++ code and
-// the resource definition. This file should be #included in both the 
-// application's resource file and header file.
-
-#ifndef $(baseNameUpper)_HRH
-#define $(baseNameUpper)_HRH
-
-/**
-Identifies the value for the commands in the application.
-Commands shall first start on 0x1000.
-Values before 0x1000 is reserved for commands in the framework.
-@since UIQ 3.0
-*/
-enum T$(baseName)Command
-	{
-	E$(baseName)InfoPrint1Cmd = 0x1000,
-	E$(baseName)InfoPrint2Cmd,
-	E$(baseName)InfoPrint3Cmd
-	};
-
-/**
-Unique controls in view.
-@since UIQ 3.0
-*/
-enum T$(baseName)Control
-	{
-	E$(baseName)ViewPage = 1,
-	E$(baseName)LabelCtrl
-	};
-
-
-#endif // $(baseNameUpper)_HRH

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Inc/baseNameAppUi.h	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)AppUi from $(baseName)AppUi.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : Declares main application UI class.
-============================================================================
-*/
-
-#ifndef $(baseNameUpper)APPUI_H
-#define $(baseNameUpper)APPUI_H
-
-#include <QikAppUi.h>
-
-/**
-This class represents the application UI in $(baseName) application,
-It has responsibility to create the view.
-
-@since UIQ 3.0
-*/
-class C$(baseName)AppUi : public CQikAppUi
-	{
-public:
-	// from CQikAppUi
-	void ConstructL();
-	};
-#endif // $(baseNameUpper)APPUI_H

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Inc/baseNameApplication.h	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)Application from $(baseName)Application.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : Declares main application class.
-============================================================================
-*/
-
-#ifndef $(baseNameUpper)APPAPPLICATION_H
-#define $(baseNameUpper)APPAPPLICATION_H
-
-#include <QikApplication.h>
-
-/**
-This class is the entry point to the application.
-
-@since UIQ 3.0
-*/
-class C$(baseName)Application : public CQikApplication
-	{
-private:
-	CApaDocument* CreateDocumentL();
-	TUid AppDllUid() const;
-	CApaApplication* NewApplication();
-	};
-
-#endif // $(baseNameUpper)APPAPPLICATION_H

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Inc/baseNameDocument.h	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)Document from $(baseName)Document.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : Declares main application document class.
-============================================================================
-*/
-
-
-#ifndef $(baseNameUpper)DOCUMENT_H
-#define $(baseNameUpper)DOCUMENT_H
-
-#include <QikDocument.h>
-
-/**
-This class represents the document in $(baseName) application,
-For an UIQ application to work properly the document class need to be
-derived from CQikDocument.
-
-@since UIQ 3.0
-*/
-class C$(baseName)Document : public CQikDocument
-	{
-public:
-	static C$(baseName)Document* NewL(CQikApplication& aApp);
-
-private:
-	// from CQikDocument
-	CEikAppUi* CreateAppUiL();
-
-	C$(baseName)Document(CQikApplication& aApp);
-	void ConstructL();
-	};
-#endif // $(baseNameUpper)DOCUMENT_H

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Inc/baseNameGlobals.h	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)Globals from $(baseName)Globals.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : Declares main application globals class.
-============================================================================
-*/
-
-#ifndef $(baseNameUpper)GLOBALS_H
-#define $(baseNameUpper)GLOBALS_H
-
-/**
-Identifies the application’s UID3.
-
-@since UIQ 3.0
-*/
-const TUid KUid$(baseName)App = {$(uid3)};
-
-/**
-Identifies the $(baseName) application’s view.
-Each view need an unique UID in the application.
-
-@since UIQ 3.0
-*/
-const TUid KUid$(baseName)View = {0x00000001};
-
-#endif // $(baseNameUpper)GLOBALS_H
-

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Inc/baseNameView.h	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)View from $(baseName)View.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : Declares main application view class.
-============================================================================
-*/
-
-#ifndef $(baseNameUpper)VIEW_H
-#define $(baseNameUpper)VIEW_H
-
-#include <QikViewBase.h>
-
-/**
-A very simple view that displays the text "$(baseName)", drawn using the default title
-font supplied by UIQ. It also consist of three commands that will bring up infoprints.
-
-@since UIQ 3.0
-*/
-class C$(baseName)View : public CQikViewBase
-	{
-public:
-	static C$(baseName)View* NewLC(CQikAppUi& aAppUi);
-	~C$(baseName)View();
-
-	// from CQikViewBase
-	TVwsViewId ViewId()const;
-	void HandleCommandL(CQikCommand& aCommand);
-
-protected:
-	// from CQikViewBase
-	void ViewConstructL();
-
-private:
-	C$(baseName)View(CQikAppUi& aAppUi);
-	void ConstructL();
-	};
-
-#endif // $(baseNameUpper)VIEW_H

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Src/baseNameAppUi.cpp	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)AppUi from $(baseName)AppUi.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : C$(baseName)AppUi implementation
-============================================================================
-*/
-
-#include "$(baseName)AppUi.h"
-#include "$(baseName)View.h"
-
-/**
-2nd stage construction of the App UI.
-Create view and add it to the framework.
-The framework will take over the ownership.
-*/
-void C$(baseName)AppUi::ConstructL()
-	{
-	// Calls ConstructL that initiate the standard values.
-	CQikAppUi::ConstructL();
-
-	// Create the view and add it to the framework
-	C$(baseName)View* appView = C$(baseName)View::NewLC(*this);
-	AddViewL(*appView);
-	CleanupStack::Pop(appView);
-	}

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Src/baseNameApplication.cpp	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)Application from $(baseName)Application.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : C$(baseName)Application implementation
-============================================================================
-*/
-
-#include <eikstart.h>
-
-#include "$(baseName)Application.h"
-#include "$(baseName)Document.h"
-#include "$(baseName)Globals.h" // contains the applications UID
-
-/**
-The function is called by the UI framework to ask for the
-application's UID. The returned value is defined by the
-constant KUid$(baseName)App and must match the second value
-defined in the project definition file.
-*/
-TUid C$(baseName)Application::AppDllUid() const
-	{
-	return KUid$(baseName)App;
-	}
-
-/**
-This function is called by the UI framework at application start-up.
-It creates an instance of the document class.
-*/
-CApaDocument* C$(baseName)Application::CreateDocumentL()
-	{
-	return C$(baseName)Document::NewL(*this);
-	}
-
-/**
-The function is called by the framework immediately after it has started the
-application's EXE. It is called by the framework and is expected to have
-exactly this prototype.
-
-@return Instance of the application class.
-*/
-CApaApplication* NewApplication()
-	{
-	return new C$(baseName)Application;
-	}
-
-/**
-E32Main() contains the program's start up code, the entry point for an EXE.
-*/
-GLDEF_C TInt E32Main()
-	{
-	return EikStart::RunApplication(NewApplication);
-	}

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Src/baseNameDocument.cpp	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)Document from $(baseName)Document.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : C$(baseName)Document implementation
-============================================================================
-*/
-
-#include <s32strm.h>
-#include <QikApplication.h>
-
-#include "$(baseName)Document.h"
-#include "$(baseName)AppUi.h"
-#include "$(baseName)Globals.h"
-
-/**
-Creates and constructs the document. This is called by
-C$(baseName)Application::CreateDocumentL() which in turn is called by the
-UI framework.
-*/
-C$(baseName)Document* C$(baseName)Document::NewL(CQikApplication& aApp)
-	{
-	C$(baseName)Document* self = new (ELeave) C$(baseName)Document(aApp);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-/**
-The constructor of the document class just passes the
-supplied reference to the constructor initialization list.
-*/
-C$(baseName)Document::C$(baseName)Document(CQikApplication& aApp)
-	: CQikDocument(aApp)
-	{
-	}
-
-/**
-2nd stage construction of the model.
-All code that shall be called in initializing phase and might leave shall be
-added here.
-*/
-void C$(baseName)Document::ConstructL()
-	{
-	}
-
-/**
-This is called by the UI framework as soon as the document has been created.
-It creates an instance of the ApplicationUI. The Application UI class is an
-instance of a CEikAppUi derived class.
-*/
-CEikAppUi* C$(baseName)Document::CreateAppUiL()
-	{
-	return new (ELeave) C$(baseName)AppUi;
-	}
-

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/Src/baseNameView.cpp	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
-============================================================================
- Name		: C$(baseName)View from $(baseName)View.h
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : C$(baseName)View implementation
-============================================================================
-*/
-
-#include <QikCommand.h>
-#include <$(baseName).rsg>
-#include <eiklabel.h> // CEikLabel
-
-#include "$(baseName)AppUi.h"
-#include "$(baseName)View.h"
-#include "$(baseName).hrh"
-#include "$(baseName)Globals.h"
-
-/**
-Creates and constructs the view.
-
-@param aAppUi Reference to the AppUi
-@return Pointer to a C$(baseName)View object
-*/
-C$(baseName)View* C$(baseName)View::NewLC(CQikAppUi& aAppUi)
-	{
-	C$(baseName)View* self = new(ELeave) C$(baseName)View(aAppUi);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-/**
-Constructor for the view.
-Passes the application UI reference to the construction of the super class.
-
-KNullViewId should normally be passed as parent view for the applications
-default view. The parent view is the logical view that is normally activated
-when a go back command is issued. KNullViewId will activate the system
-default view.
-
-@param aAppUi Reference to the application UI
-*/
-C$(baseName)View::C$(baseName)View(CQikAppUi& aAppUi)
-	: CQikViewBase(aAppUi, KNullViewId)
-	{
-	}
-
-/**
-Destructor for the view
-*/
-C$(baseName)View::~C$(baseName)View()
-	{
-	}
-
-/**
-2nd stage construction of the App UI.
-*/
-void C$(baseName)View::ConstructL()
-	{
-	// Calls ConstructL that initialises the standard values.
-	// This should always be called in the concrete view implementations.
-	CQikViewBase::ConstructL();
-	}
-
-/**
-Inherited from CQikViewBase and called upon by the UI Framework.
-It creates the view from resource.
-*/
-void C$(baseName)View::ViewConstructL()
-	{
-	// Loads information about the UI configurations this view supports
-	// together with definition of each view.
-	ViewConstructFromResourceL(R_UI_CONFIGURATIONS);
-	}
-
-/**
-Returns the view Id
-
-@return Returns the Uid of the view
-*/
-TVwsViewId C$(baseName)View::ViewId()const
-	{
-	return TVwsViewId(KUid$(baseName)App, KUid$(baseName)View);
-	}
-
-/*
-Handles all commands in the view
-Called by the UI framework when a command has been issued.
-The command Ids are defined in the .hrh file.
-
-@param aCommand The command to be executed
-@see CQikViewBase::HandleCommandL
-*/
-void C$(baseName)View::HandleCommandL(CQikCommand& aCommand)
-	{
-	switch(aCommand.Id())
-		{
-		// Just issue simple info messages to show that
-		// the commands have been selected
-
-		case E$(baseName)InfoPrint1Cmd:
-			{
-			// Shows an infoprint
-			iEikonEnv->InfoMsg(R_INFOPRINT1_TEXT);
-			break;
-			}
-		case E$(baseName)InfoPrint2Cmd:
-			{
-			// Shows an infoprint
-			iEikonEnv->InfoMsg(R_INFOPRINT2_TEXT);
-			break;
-			}
-		case E$(baseName)InfoPrint3Cmd:
-			{
-			// Shows an infoprint
-			iEikonEnv->InfoMsg(R_INFOPRINT3_TEXT);
-			break;
-			}
-		// Go back and exit command will be passed to the CQikViewBase to handle.
-		default:
-			CQikViewBase::HandleCommandL(aCommand);
-			break;
-		}
-	}

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/data/baseName.rls	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName)_loc.rls
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : An .rls file defines symbolic identifiers for strings, to 
-				which the resource file refers when it needs the associated 
-				string. For more information about .rls see "How to localise 
-				resources" section in the SDK documentation. 
-============================================================================
-*/
-
-// Text showed in the view
-rls_string STRING_r_$(baseName)_text "$(baseName)"
-
-// Infoprint text
-rls_string STRING_r_$(baseName)_infoprint1_text "Infoprint 1"
-rls_string STRING_r_$(baseName)_infoprint2_text "Infoprint 2"
-rls_string STRING_r_$(baseName)_infoprint3_text "Infoprint 3"
-
-// Text for commands in the view
-rls_string STRING_r_$(baseName)_close_debug_cmd "Close (debug)"
-rls_string STRING_r_$(baseName)_infoprint1_cmd "Infoprint 1"
-rls_string STRING_r_$(baseName)_infoprint2_cmd "Infoprint 2"
-rls_string STRING_r_$(baseName)_infoprint3_cmd "Infoprint 3"

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/data/baseName.rss	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName).rss
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : This file contains all the resources for the $(baseName).
-============================================================================
-*/
-
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <qikon.rh>
-#include <qikon.hrh>
-#include <uikon.rh>
-#include <uikon.hrh>
-
-#include <QikCommand.rh>
-
-#include "$(baseName).hrh" // Application specific commands
-// Strings that should be localised should not be defined in the resource file itself, 
-// but in separate files with the extension .rls. 
-#include "$(baseName).rls" // Defines localisable strings
-
-
-// Use this statement to ensure that the resources in the file have a unique ID
-// so that an application can use multiple resource files without resource ID
-// conflict. This statement must be the first non-comment statement in the file.
-NAME $(rezId)
-
-// The three following resources are mandatory fields and need to be the 
-// first resource fields in the resource file. Need to be defined in this order.
-// These resources don't need to contain any useful info, just need to be there.
-
-// RSS_SIGNATURE can be used to specify version information
-RESOURCE RSS_SIGNATURE { }
-
-// Defines the name of the default file the application framework creates.
-// This resource must always be the second resource in the resource file.
-RESOURCE TBUF { buf = "$(baseName)"; }
-
-// This resource is NOT used by UIQ.
-// Otherwise this resources is used to define an application's GUI.
-RESOURCE EIK_APP_INFO {	}
-
-//----------------------------------------------------
-//------------------ TEXT CONSTANTS ------------------
-//----------------------------------------------------
-// These resources hold strings that are used in the C++ source code, 
-// these strings are used as infoprint text. 
-// The actual string is defined in the .rls file.
-RESOURCE TBUF r_infoprint1_text { buf = STRING_r_$(baseName)_infoprint1_text; }
-RESOURCE TBUF r_infoprint2_text { buf = STRING_r_$(baseName)_infoprint2_text; }
-RESOURCE TBUF r_infoprint3_text { buf = STRING_r_$(baseName)_infoprint3_text; }
-
-//----------------------------------------------------
-//-------------- CONFIGURATION FOR VIEW --------------
-//----------------------------------------------------
-// A view shall use the QIK_VIEW_CONFIGURATIONS resource struct to define which 
-// UI configurations it supports. Can also use QIK_VIEW_CONFIGURATIONS to setup 
-// the view to switch layout and command list automatically when changes of UI 
-// configuration occur. This is done with the view and command_list members of 
-// the QIK_VIEW_CONFIGURATIONS.
-
-// The application supports the reference UI Configurations that are supported
-// in the UIQ 3 SDK. Use the UiqEnv tool, to change the UI Configuration in the
-// emulator in order to develop and test the application with varying phone styles.
-RESOURCE QIK_VIEW_CONFIGURATIONS r_ui_configurations
-	{
-	configurations = 
-		{
-		QIK_VIEW_CONFIGURATION
-			{
-			ui_config_mode = KQikPenStyleTouchPortrait;
-			command_list = r_$(baseName)_commands;
-			view = r_$(baseName)_layout;
-			},
-		QIK_VIEW_CONFIGURATION
-			{
-			ui_config_mode = KQikPenStyleTouchLandscape;
-			command_list = r_$(baseName)_commands;
-			view = r_$(baseName)_layout;
-			},
-		QIK_VIEW_CONFIGURATION
-			{
-			ui_config_mode = KQikSoftkeyStyleTouchPortrait;
-			command_list = r_$(baseName)_commands;
-			view = r_$(baseName)_layout;
-			},
-		QIK_VIEW_CONFIGURATION
-			{
-			ui_config_mode = KQikSoftkeyStylePortrait;
-			command_list = r_$(baseName)_commands;
-			view = r_$(baseName)_layout;
-			},
-		QIK_VIEW_CONFIGURATION
-			{
-			ui_config_mode = KQikSoftkeyStyleSmallPortrait;
-			command_list = r_$(baseName)_commands;
-			view = r_$(baseName)_layout;
-			}
-		};
-	}
-
-//----------------------------------------------------
-//------------------ VIEW COMMANDS -------------------
-//----------------------------------------------------
-// Commands are defined with the QIK_COMMAND_LIST struct, 
-// commands can also be created in code by instantiating CQikCommand.
-// The control command id for debug command is a reserved id from uikon.hrh.
-// The id for each infoprint command is defined in the $(baseName).hrh file.
-// The string for each command is defined in the $(baseName).rls file, 
-// due to localisation.
-RESOURCE QIK_COMMAND_LIST r_$(baseName)_commands
-	{
-	items =
-		{
-		/**
-		This command shall only be visible in debug mode because it is only 
-		used to find memory leaks during development of the application.
-		*/
-		QIK_COMMAND
-			{
-			id = EEikCmdExit;
-			type = EQikCommandTypeScreen;
-			// Indicate that this command will only be visible in debug
-			stateFlags = EQikCmdFlagDebugOnly;
-			text = STRING_r_$(baseName)_close_debug_cmd;
-			},
-		QIK_COMMAND
-			{
-			id = E$(baseName)InfoPrint1Cmd;
-			type = EQikCommandTypeScreen;
-			text = STRING_r_$(baseName)_infoprint1_cmd;
-			},
-		QIK_COMMAND
-			{
-			id = E$(baseName)InfoPrint2Cmd;
-			type = EQikCommandTypeScreen;
-			text = STRING_r_$(baseName)_infoprint2_cmd;
-			},
-		QIK_COMMAND
-			{
-			id = E$(baseName)InfoPrint3Cmd;
-			type = EQikCommandTypeScreen;
-			text = STRING_r_$(baseName)_infoprint3_cmd;
-			}
-		};
-	}
-//----------------------------------------------------
-//------------------- VIEW LAYOUT --------------------
-//----------------------------------------------------
-// Defines the view by linking to the pages.
-RESOURCE QIK_VIEW r_$(baseName)_layout
-	{
-	pages = r_$(baseName)_layout_pages;
-	}
-
-// Defines the pages of a view. 
-// In this application there only exist one page for the label to be displayed in.
-RESOURCE QIK_VIEW_PAGES r_$(baseName)_layout_pages
-	{
-	pages = 
-		{
-		QIK_VIEW_PAGE
-			{
-			page_id = E$(baseName)ViewPage;
-			page_content = r_$(baseName)_page_control;
-			}
-		};
-	}
-
-//----------------------------------------------------
-//------------------ VIEW CONTROLS -------------------
-//----------------------------------------------------
-// Defines the content of the page.
-// The page consist of one label that is displayed in the middle of the view.
-RESOURCE QIK_CONTAINER_SETTINGS r_$(baseName)_page_control
-	{
-	layout_manager_type = EQikGridLayoutManager;
-	layout_manager = r_grid_layout_manager;
-	controls =
-		{
-		QIK_CONTAINER_ITEM_CI_LI
-			{
-			unique_handle = E$(baseName)LabelCtrl;
-			type = EEikCtLabel;
-			control = r_$(baseName)_label;
-			}
-		};
-	}
-	
-//----------------------------------------------------
-//---------------------- LABEL -----------------------
-//----------------------------------------------------
-// Defines the label and specifies the labels font and text.
-RESOURCE LABEL r_$(baseName)_label
-	{
-	standard_font = EEikLabelFontLegend;
-	txt = STRING_r_$(baseName)_text;
-	}
-
-//----------------------------------------------------
-//-------------- GRID LAYOUT MANAGER -----------------
-//----------------------------------------------------
-// Defines the grid layout manager that places the label control in the middle 
-// of the view.
-RESOURCE QIK_GRID_LAYOUT_MANAGER r_grid_layout_manager
-	{
-	default_layout_data = QIK_GRID_LAYOUT_DATA 
-		{
-		horizontal_alignment = EQikLayoutHAlignCenter;
-		vertical_alignment = EQikLayoutVAlignCenter;	
-		};
-	}

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/data/baseName_loc.rls	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName)_loc.rls
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : An .rls file defines symbolic identifiers for strings, to 
-				which the resource file refers when it needs the associated 
-				string. For more information about .rls see "How to localise 
-				resources" section in the SDK documentation. 
-============================================================================
-*/
-
-// Text showed in the applauncher
-rls_string STRING_r_$(baseName)_caption "$(baseName)"

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/data/baseName_loc.rss	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName)_loc.rss
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : This file localise the applications icons and caption
-				for $(baseName).
-============================================================================
-*/
-
-#include <AppInfo.rh>
-#include "$(baseName)_loc.rls"
-
-RESOURCE LOCALISABLE_APP_INFO
-	{
-	caption_and_icon =
-		{
-		CAPTION_AND_ICON_INFO
-			{
-			// The caption text is defined in the rls file
-			caption = STRING_r_$(baseName)_caption;
-			// Icons are used to represent applications in the 
-			// application launcher and application title bar.
-			// The number_of_icons value identifies how many icons 
-			// that exist in the icon_file.
-			number_of_icons = 3;
-			// Using the application icons.
-			icon_file = "\\Resource\\Apps\\$(baseName)AppIcon.mbm";
-			}
-		};
-	}
-

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/data/baseName_reg.rss	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-============================================================================
- Name		: $(baseName)_reg.rss
- Author	  : $(author)
- Version	 :
- Copyright   : $(copyright)
- Description : This is the registration file for $(baseName).
-============================================================================
-*/
-
-// All registration files need to #include appinfo.rh. 
-#include <AppInfo.rh>
-
-// All registration files must define UID2, which is always 
-// KUidAppRegistrationResourceFile, and UID3, which is the application's UID.
-UID2 KUidAppRegistrationResourceFile
-UID3 $(uid3) // application UID
-
-// Registration file need to containo an APP_REGISTRATION_INFO resource that
-// minimally needs to provide the name of the application binary (using the 
-// app_file statement). 
-RESOURCE APP_REGISTRATION_INFO
-	{
-	app_file = "$(baseName)"; // filename of application binary (minus extension)
-	// Specify the location of the localisable icon/caption definition file
-	localisable_resource_file = "\\Resource\\Apps\\$(baseName)_loc";
-	}
-

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/sis/baseName.pkg	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-; Installation file for $(baseName) application
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-;
-;Language - standard language definitions
-&EN
-
-; List of localised vendor names - one per language. At least one must be provided (English [EN]). 
-; List must correspond to list of languages specified elsewhere in the .pkg
-%{"Vendor-EN"}
-
-; The non-localised, globally unique vendor name (mandatory)
-:"Vendor"
-
-; Package header
-; Name, UID3, Major, Minor, Build, Package-type
-#{"$(baseName)"},($(uid3)),1,0,0, TYPE=SA
-
-; ProductID for UIQ 3.0
-; Product/platform version UID, Major, Minor, Build, Product ID
-(0x101F6300), 3, 0, 0, {"UIQ30ProductID"}
-
-;Files to install
-;You should change the source paths to match that of your environment
-;<source> <destination>
-"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe"		-"!:\sys\bin\$(baseName).exe"
-"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower).rsc"		-"!:\resource\apps\$(baseName).rsc"
-"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower)_loc.rsc"		-"!:\resource\apps\$(baseName)_loc.rsc"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_reg.rsc"	-"!:\private\10003a3f\import\apps\$(baseName)_reg.rsc"
-"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName)AppIcon.mbm" -"!:\resource\apps\$(baseName)AppIcon.mbm"
-

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/template.properties	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-template.label=3.x GUI Application
-template.desc=A simple GUI application for UIQ 3.x. \
-The wizard creates a simple platform security executable with a menu and dialog. \r\n\
-This project type can only be used with UIQ SDKs with platform security.
-basics.label=Basic Settings
-basics.desc=Basic properties of a project
-basics.uid3.label=Application UID:
-basics.uid3.desc=The UID3 (Application UID) can be thought of as a project identifier.\r\n\
-The UID3 may be shared by all objects belonging to a given program, including library DLLs if any, \
-framework DLLs, and all documents.\r\n\
-The developer range UID3 must be between 0xE0000000 - 0xEFFFFFFF.\r\n\
-The template wizard creates a random UID3 for your project testing. \
-Release UIDs are provided by Symbian.
-basics.author.label=Author:
-basics.author.desc=Name of the author
-basics.copyright.label=Copyright notice:
-basics.copyright.desc=Your copyright notice
-directories.label=Project Directories
-directories.imagesDir.label=Images:
-directories.imagesDir.desc=Directory for image files
-#projectDirsPageCommonFields
-projectDirsPageCommonFields.desc=Generated files will be copied to the specified directories under the \
-project root directory
-projectDirsPageCommonFields.incDir.label=Include:
-projectDirsPageCommonFields.incDir.desc=Directory for C++ header files
-projectDirsPageCommonFields.sourceDir.label=Source:
-projectDirsPageCommonFields.sourceDir.desc=Directory for C++ source files
-projectDirsPageCommonFields.groupDir.label=Group:
-projectDirsPageCommonFields.groupDir.desc=Directory for Symbian project files
-projectDirsPageCommonFields.dataDir.label=Data:
-projectDirsPageCommonFields.dataDir.desc=Directory for resource files
-projectDirsPageCommonFields.sisDir.label=Install:
-projectDirsPageCommonFields.sisDir.desc=Directory for installation files
-
-
-
-
-

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/template.xml	Thu May 20 17:31:02 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE template [
-<!ENTITY projectDirsPageCommonFields SYSTEM "../../shared/projectDirsPageCommonFields.inc">
-<!ENTITY projectCreateAndCommonFoldersProcess SYSTEM "../../shared/projectCreateAndCommonFoldersProcess.inc">
-]>
-<template 
-		version="1.0" 
-		label="%template.label">
-	<description>%template.desc</description>
-	<wizardPage 
-		id="basics" 
-		label="%basics.label">
-		<description>%basics.desc</description>
-		<uidField 
-				id="uid3"
-				label="%basics.uid3.label"
-				min="0xe0000000"
-				max="0xefffffff"
-				mandatory="true">
-				<description>%basics.uid3.desc</description>
-		</uidField>
-		<textField 
-				id="author"
-				label="%basics.author.label"
-				persist="true">
-				<description>%basics.author.desc</description>
-		</textField>
-		<textField 
-				id="copyright"
-				label="%basics.copyright.label"
-				multiline="true"
-				default="Your copyright notice"
-				persist="true">
-				<description>%basics.copyright.desc</description>
-		</textField>
-	</wizardPage>
-
-	<wizardPage 
-		id="directories" 
-		label="%directories.label">
-
-		&projectDirsPageCommonFields;
-
-		<filenameField 
-				id="imagesDir"
-				label="%directories.imagesDir.label"
-				default="images"
-				mandatory="true"
-				persist="true">
-				<description>%directories.imagesDir.desc</description>
-		</filenameField>
-	</wizardPage>
-	
-	&projectCreateAndCommonFoldersProcess;	
-
-	<process class="com.nokia.carbide.templatewizard.processes.CreateFolders"
-	 	bundle="com.nokia.carbide.templatewizard">
-		<parameter name="project" projectName="$(projectName)" />
-		<parameter name="folder" path="$(imagesDir)" /> 
-	</process>
-
-	<process class="com.nokia.carbide.templatewizard.processes.CopyFiles"
-	 	bundle="com.nokia.carbide.templatewizard">
-		<parameter name="project" projectName="$(projectName)" />
-		
-		<parameter name="file"
-			sourcePath="data/baseName_loc.rls"
-			targetPath="$(dataDir)/$(baseName)_loc.rls"
-			/> 
-		<parameter name="file"
-			sourcePath="data/baseName_loc.rss"
-			targetPath="$(dataDir)/$(baseName)_loc.rss"
-			/> 
-		<parameter name="file"
-			sourcePath="data/baseName.rss"
-			targetPath="$(dataDir)/$(baseName).rss"
-			/> 
-		<parameter name="file"
-			sourcePath="data/baseName_reg.rss"
-			targetPath="$(dataDir)/$(baseName)_reg.rss"
-			/> 
-		<parameter name="file"
-			sourcePath="data/baseName.rls"
-			targetPath="$(dataDir)/$(baseName).rls"
-			/> 
-		<parameter name="file"
-			sourcePath="Group/baseName.mmp"
-			targetPath="$(groupDir)/$(baseName).mmp"
-			/> 
-		<parameter name="file"
-			sourcePath="Group/Bld.inf"
-			targetPath="$(groupDir)/bld.inf"
-			/> 
-		<parameter name="file"
-			sourcePath="sis/baseName.pkg"
-			targetPath="$(sisDir)/$(baseName).pkg"
-			/> 
-		<parameter name="file"
-			sourcePath="Images/baseName_Large.bmp"
-			targetPath="$(imagesDir)/$(baseName)_Large.bmp"
-			substitute="false"
-			/> 
-		<parameter name="file"
-			sourcePath="Images/baseName_Large_mask.bmp"
-			targetPath="$(imagesDir)/$(baseName)_Large_mask.bmp"
-			substitute="false"
-			/> 
-		<parameter name="file"
-			sourcePath="Images/baseName_Small.bmp"
-			targetPath="$(imagesDir)/$(baseName)_Small.bmp"
-			substitute="false"
-			/> 
-		<parameter name="file"
-			sourcePath="Images/baseName_Small_mask.bmp"
-			targetPath="$(imagesDir)/$(baseName)_Small_mask.bmp"
-			substitute="false"
-			/> 
-		<parameter name="file"
-			sourcePath="Images/baseName_xLarge.bmp"
-			targetPath="$(imagesDir)/$(baseName)_xLarge.bmp"
-			substitute="false"
-			/> 
-		<parameter name="file"
-			sourcePath="Images/baseName_xLarge_mask.bmp"
-			targetPath="$(imagesDir)/$(baseName)_xLarge_mask.bmp"
-			substitute="false"
-			/> 
-	</process>
-	
-	<process class="com.nokia.carbide.cpp.project.core.processes.CopyFilesAndFormatAsCpp"
-		bundle="com.nokia.carbide.cpp.project.core">
-		<parameter name="project" projectName="$(projectName)" />			
-			
-		<parameter name="file"
-			sourcePath="Inc/baseName.hrh" 
-			targetPath="$(incDir)/$(baseName).hrh" 
-			/> 
-		<parameter name="file"
-			sourcePath="Inc/baseNameApplication.h"
-			targetPath="$(incDir)/$(baseName)Application.h"
-			/> 
-		<parameter name="file"
-			sourcePath="Inc/baseNameAppUi.h"
-			targetPath="$(incDir)/$(baseName)AppUi.h"
-			/> 
-		<parameter name="file"
-			sourcePath="Inc/baseNameView.h"
-			targetPath="$(incDir)/$(baseName)View.h"
-			/> 
-		<parameter name="file"
-			sourcePath="Inc/baseNameDocument.h"
-			targetPath="$(incDir)/$(baseName)Document.h"
-			/> 
-		<parameter name="file"
-			sourcePath="Inc/baseNameGlobals.h"
-			targetPath="$(incDir)/$(baseName)Globals.h"
-			/> 
-		<parameter name="file"
-			sourcePath="Src/baseNameApplication.cpp"
-			targetPath="$(sourceDir)/$(baseName)Application.cpp"
-			/> 
-		<parameter name="file"
-			sourcePath="Src/baseNameAppUi.cpp"
-			targetPath="$(sourceDir)/$(baseName)AppUi.cpp"
-			/> 
-		<parameter name="file"
-			sourcePath="Src/baseNameView.cpp"
-			targetPath="$(sourceDir)/$(baseName)View.cpp"
-			/> 
-		<parameter name="file"
-			sourcePath="Src/baseNameDocument.cpp"
-			targetPath="$(sourceDir)/$(baseName)Document.cpp"
-			/> 
-	</process>
-
-	<process class="com.nokia.carbide.cpp.project.ui.processes.ProjectCreatedTasks"
-	 	bundle="com.nokia.carbide.cpp.project.ui">
-		<parameter name="project" projectName="$(projectName)"
-			bldInfPath="$(groupDir)/bld.inf"
-			targetMMPFileName="$(baseName).mmp" 
-			pkgFilePath="$(sisDir)/$(baseName).pkg" /> 
-	</process>
-
-</template>
-