# HG changeset patch
# User jake
# Date 1288170389 -10800
# Node ID 6967ff0a31f594dd7ed09de848a0fc038b0a534d
# Parent  60b6f8b0e3a0343ecea1d91de7589b617558752f
renderer updated

diff -r 60b6f8b0e3a0 -r 6967ff0a31f5 WidgetGen.pro.user
--- a/WidgetGen.pro.user	Tue Oct 26 15:54:59 2010 +0300
+++ b/WidgetGen.pro.user	Wed Oct 27 12:06:29 2010 +0300
@@ -83,7 +83,7 @@
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/WidgetGen-build-desktop</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">11</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
+    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
    </valuemap>
    <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
    <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
diff -r 60b6f8b0e3a0 -r 6967ff0a31f5 data/renderingplugin/inc/renderer.h
--- a/data/renderingplugin/inc/renderer.h	Tue Oct 26 15:54:59 2010 +0300
+++ b/data/renderingplugin/inc/renderer.h	Wed Oct 27 12:06:29 2010 +0300
@@ -17,14 +17,14 @@
 *
 */
 
-#ifndef MYRENDERINGPLUGIN_H
-#define MYRENDERINGPLUGIN_H
+#ifndef __#replace#RENDERER_H
+#define __#replace#RENDERER_H
 
 #include <xnextrenderingpluginadapter.h>
 
 // FORWARD DECLARATIONS
 
-class #replace#Renderer : public CXnExtRenderingPluginAdapter
+class C#replace#Renderer : public CXnExtRenderingPluginAdapter
     {
 public:
 
@@ -32,18 +32,18 @@
     * Two-phased constructor.
     * @return Pointer to created object.
     */
-    static #replace#Renderer* NewL();
+    static C#replace#Renderer* NewL();
 
     /**
     * Two-phased constructor.
     * @return Pointer to created object.
     */
-    static #replace#Renderer* NewLC();
+    static C#replace#Renderer* NewLC();
     
     /**
     * Destructor.
     */
-    virtual ~#replace#Renderer();
+    virtual ~C#replace#Renderer();
 
 public: // from base classes
 
@@ -124,7 +124,7 @@
     /**
     * C++ default constructor.
     */
-    #replace#Renderer();
+    C#replace#Renderer();
     
     /**
     * By default Symbian 2nd phase constructor is private.
@@ -135,4 +135,4 @@
 
     };
 
-#endif // MYRENDERINGPLUGIN_H
+#endif // __#replace#RENDERER_H
diff -r 60b6f8b0e3a0 -r 6967ff0a31f5 data/renderingplugin/src/renderer.cpp
--- a/data/renderingplugin/src/renderer.cpp	Tue Oct 26 15:54:59 2010 +0300
+++ b/data/renderingplugin/src/renderer.cpp	Wed Oct 27 12:06:29 2010 +0300
@@ -18,7 +18,7 @@
 */
 
 #include <ecom/implementationproxy.h>
-#include "#replace#Renderer.h"
+#include "#replace#renderer.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -26,9 +26,9 @@
 // Symbian static 1st phase constructor
 // -----------------------------------------------------------------------------
 //
-#replace#Renderer* #replace#Renderer::NewL()
+C#replace#Renderer* C#replace#Renderer::NewL()
     {
-    #replace#Renderer* self = #replace#Renderer::NewLC();
+    C#replace#Renderer* self = C#replace#Renderer::NewLC();
     CleanupStack::Pop( self );
     return self;
     }
@@ -36,9 +36,9 @@
 // Symbian static 1st phase constructor
 // -----------------------------------------------------------------------------
 //
-#replace#Renderer* #replace#Renderer::NewLC()
+C#replace#Renderer* C#replace#Renderer::NewLC()
     {
-    #replace#Renderer* self = new( ELeave ) #replace#Renderer();
+    C#replace#Renderer* self = new( ELeave ) C#replace#Renderer();
     CleanupStack::PushL( self );
     self->ConstructL();
     return self;
@@ -48,7 +48,7 @@
 // C++ destructor
 // -----------------------------------------------------------------------------
 //
-#replace#Renderer::~#replace#Renderer()
+C#replace#Renderer::~C#replace#Renderer()
     {
     }
 
@@ -56,7 +56,7 @@
 // Handles key events.
 // -----------------------------------------------------------------------------
 //
-TKeyResponse #replace#Renderer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
+TKeyResponse C#replace#Renderer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
     TEventCode aType )
     {
     }
@@ -65,7 +65,7 @@
 // Set window for this control
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::SetContainerWindowL( const CCoeControl &aContainer )
+void C#replace#Renderer::SetContainerWindowL( const CCoeControl &aContainer )
     {
     CCoeControl::SetContainerWindowL( aContainer );
     }
@@ -74,7 +74,7 @@
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::HandlePointerEventL( const TPointerEvent& aPointerEvent )
+void C#replace#Renderer::HandlePointerEventL( const TPointerEvent& aPointerEvent )
     {
     CCoeControl::HandlePointerEventL( aPointerEvent );
     }
@@ -83,7 +83,7 @@
 // Returns the number of component controls
 // -----------------------------------------------------------------------------
 //
-TInt #replace#Renderer::CountComponentControls() const
+TInt C#replace#Renderer::CountComponentControls() const
     {
     return 0;
     }
@@ -92,7 +92,7 @@
 // Returns the specified control
 // -----------------------------------------------------------------------------
 //
-CCoeControl* #replace#Renderer::ComponentControl( TInt aIndex ) const
+CCoeControl* C#replace#Renderer::ComponentControl( TInt aIndex ) const
     {
     return NULL;
     }
@@ -101,7 +101,7 @@
 // Skin change notification.
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::SkinChanged()
+void C#replace#Renderer::SkinChanged()
     {
     }
 
@@ -109,7 +109,7 @@
 // EnterPowerSaveModeL
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::EnterPowerSaveModeL()
+void C#replace#Renderer::EnterPowerSaveModeL()
     {
     }
 
@@ -118,7 +118,7 @@
 //
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::ExitPowerSaveModeL()
+void C#replace#Renderer::ExitPowerSaveModeL()
     {
     }
 
@@ -126,7 +126,7 @@
 // Called if focus changes
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::FocusChanged( TDrawNow /*aDrawNow*/ )
+void C#replace#Renderer::FocusChanged( TDrawNow /*aDrawNow*/ )
     {
     }
 
@@ -134,7 +134,7 @@
 // Called if position or size changes
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::SizeChanged()
+void C#replace#Renderer::SizeChanged()
     {
     }
 
@@ -142,7 +142,7 @@
 // Draws the carousel component
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::Draw( const TRect& aRect ) const
+void C#replace#Renderer::Draw( const TRect& aRect ) const
     {
     CWindowGc& gc( SystemGc() );
     gc.DrawEllipse( aRect );
@@ -152,7 +152,7 @@
 // C++ default constructor
 // -----------------------------------------------------------------------------
 //
-#replace#Renderer::#replace#Renderer()
+C#replace#Renderer::C#replace#Renderer()
     {
     // Do nothing
     }
@@ -161,7 +161,7 @@
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
-void #replace#Renderer::ConstructL()
+void C#replace#Renderer::ConstructL()
     {
     }
 
@@ -170,9 +170,9 @@
 const TImplementationProxy KImplementationTable[] =
     {
 #ifdef __EABI__
-    IMPLEMENTATION_PROXY_ENTRY( 0x22334455, #replace#Renderer::NewL )
+    IMPLEMENTATION_PROXY_ENTRY( 0x22334455, C#replace#Renderer::NewL )
 #else
-    { { 0x22334455 }, #replace#Renderer::NewL }
+    { { 0x22334455 }, C#replace#Renderer::NewL }
 #endif
     };
 
diff -r 60b6f8b0e3a0 -r 6967ff0a31f5 releases/WidgetBuilder_0_1_c.zip
Binary file releases/WidgetBuilder_0_1_c.zip has changed
diff -r 60b6f8b0e3a0 -r 6967ff0a31f5 renderercreator.cpp
--- a/renderercreator.cpp	Tue Oct 26 15:54:59 2010 +0300
+++ b/renderercreator.cpp	Wed Oct 27 12:06:29 2010 +0300
@@ -29,7 +29,7 @@
     QString widgetName( iUi.widgetName().toLower() );
     QString rendererName( iUi.rendererName().toLower() );
 
-    iUi.replaceData("data/renderingplugin/data/renderer.rss",
+    replaceData("data/renderingplugin/data/renderer.rss",
                 widgetName + "/renderingplugin/data/" + rendererName +  "renderer.rss");
 }
 
@@ -37,7 +37,7 @@
 {
     QString widgetName( iUi.widgetName().toLower() );
 
-    iUi.replaceData("data/renderingplugin/group/bld.inf",
+    replaceData("data/renderingplugin/group/bld.inf",
                  widgetName + "/renderingplugin/group/bld.inf");
 }
 
@@ -46,7 +46,7 @@
     QString widgetName( iUi.widgetName().toLower() );
     QString rendererName( iUi.rendererName().toLower() );
 
-    iUi.replaceData("data/renderingplugin/group/renderer.mmp",
+    replaceData("data/renderingplugin/group/renderer.mmp",
                 widgetName + "/renderingplugin/group/" + rendererName +  "renderer.mmp");
 }
 
@@ -55,7 +55,7 @@
     QString widgetName( iUi.widgetName().toLower() );
     QString rendererName( iUi.rendererName().toLower() );
 
-    iUi.replaceData("data/renderingplugin/inc/renderer.h",
+    replaceData("data/renderingplugin/inc/renderer.h",
                  widgetName + "/renderingplugin/inc/" + rendererName +  "renderer.h");
 }
 
@@ -64,7 +64,7 @@
     QString widgetName( iUi.widgetName().toLower() );
     QString rendererName( iUi.rendererName().toLower() );
 
-    iUi.replaceData("data/renderingplugin/src/renderer.cpp",
+    replaceData("data/renderingplugin/src/renderer.cpp",
                 widgetName + "/renderingplugin/src/" + rendererName +  "renderer.cpp");
 }
 
@@ -85,10 +85,15 @@
     while (!in.atEnd())
     {
         QString line = in.readLine();
-        if( line.contains("#replace#Renderer.h", Qt::CaseInsensitive ))
+        if( line.contains("#replace#renderer.h", Qt::CaseInsensitive ))
         {
-            line.replace(QString("#replace#"), iUi.rendererName().toLower());
+            line.replace(QString("#replace#"), iUi.rendererName().toLower() );
         }
+        else if( line.contains("RENDERER_H", Qt::CaseSensitive ))
+        {
+            line.replace(QString("#replace#"), iUi.rendererName().toUpper());
+        }
+
         else
         {
             line.replace(QString("#replace#"), iUi.rendererName());