--- a/main/main.cpp	Fri May 28 21:11:54 2010 +0530
+++ b/main/main.cpp	Fri Jun 11 17:53:15 2010 +0530
@@ -16,9 +16,6 @@
 */
 
 
-
-#include <hbapplication.h>
-#include <glxstatemanager.h>
 #include <hbmainwindow.h>
 #include <glxloggerenabler.h>
 
@@ -26,7 +23,10 @@
 #include <QDebug>
 #include <QTranslator>
 #include <xqserviceutil.h>
-#include <glxaiwservicehandler.h>
+
+#include "glxstatemanager.h"
+#include "glxaiwservicehandler.h"
+#include "glxapplication.h"
 
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
@@ -42,18 +42,15 @@
     OstTraceExt3( TRACE_NORMAL, DUP1__MAIN, "::main Time at Launch HHMMSS =%d::%d::%d",
             localTime.hour(), localTime.minute(), localTime.second() );
 
-    HbApplication app(argc, argv);	
-    
-	bool loaded(false);	
-    
+    GlxApplication app(argc, argv);	
+    bool loaded(false);	
     QTranslator translator;
     QString path = "Z:/resource/qt/translations/";
+    
     loaded = translator.load("photos_" + QLocale::system().name(), path);
-    if(loaded)
-        {
+    if(loaded) {
          qApp->installTranslator(&translator);
-        }
-    
+    }
     
     GlxStateManager* stateMgr = NULL;
     GlxAiwServiceHandler* mainWindow = NULL;
@@ -61,13 +58,12 @@
     OstTraceEventStart0( EVENT_DUP1__MAIN_START, "launch" );
 
     if(!XQServiceUtil::isService()){
-	      stateMgr = new GlxStateManager();
+        stateMgr = new GlxStateManager();
         app.setApplicationName("Photos");          
         stateMgr->launchApplication();  
     }
-    else
-    {
-	      mainWindow = new GlxAiwServiceHandler();
+    else {
+        mainWindow = new GlxAiwServiceHandler();
         mainWindow->show();
     }
     OstTraceEventStop( EVENT_DUP1__MAIN_STOP, "launch", EVENT_DUP1__MAIN_START );