--- a/clock/clockui/clockapplication/src/main.cpp	Tue Jul 06 14:14:56 2010 +0300
+++ b/clock/clockui/clockapplication/src/main.cpp	Wed Aug 18 09:47:38 2010 +0300
@@ -17,13 +17,16 @@
 
 // System includes
 #include <QtGui>
-#include <QScopedPointer>
 #include <HbTranslator>
-#include <HbApplication>
 #include <HbMainWindow>
 
 // User includes
-#include "clockappcontroller.h"
+#include "clockapplication.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "mainTraces.h"
+#endif
+
 
 /*!
 	The main entry point of the clock application.
@@ -32,9 +35,11 @@
  */
 int main(int argc, char *argv[])
 {
-	// Initialization
-	HbApplication app(argc, argv);
-
+	OstTraceFunctionEntry0( _MAIN_ENTRY );
+	// Create and initialize an ClockApplication instance
+	QScopedPointer<ClockApplication> application(
+				new ClockApplication(argc, argv));
+	
 	// Main window widget.
 	// Includes decorator such as signal strength and battery life indicator.
 	HbMainWindow window;
@@ -47,14 +52,13 @@
 	translator.loadCommon();
 	
 	// Construct the application controller.
-	QScopedPointer<ClockAppController> controller(new ClockAppController);
-	Q_UNUSED(controller)
+	application->createController();
 
 	// Show widget
 	window.show();
 
-	// Enter event loop
-	return app.exec();
+	// Start the event loop for the application
+	return application->execution();
 }
 
 // End of file	--Don't remove this.