diff -r 63aabac4416d -r f54ebcfc1b80 radioapp/radiowidgets/src/radioxmluiloader.cpp
--- a/radioapp/radiowidgets/src/radioxmluiloader.cpp	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radiowidgets/src/radioxmluiloader.cpp	Mon May 03 12:31:41 2010 +0300
@@ -17,87 +17,11 @@
 
 // User includes
 #include "radioxmluiloader.h"
-#include "radiomainwindow.h"
-#include "radiostationsview.h"
-#include "radiotuningview.h"
-#include "radiowizardview.h"
-#include "radioplaylogview.h"
-#include "radiostationcarousel.h"
-#include "radiostationcontrolwidget.h"
-#include "radiofrequencystrip.h"
-#include "radiobannerlabel.h"
-#include "radiofadinglabel.h"
-#include "radiocontextmenu.h"
-#include "radiostationmodel.h"
-#include "radiouiengine.h"
-
-/*!
- *
- */
-RadioXmlUiLoader::RadioXmlUiLoader( RadioMainWindow& mainWindow ) :
-    HbDocumentLoader(),
-    mMainWindow( mainWindow )
-{
-}
 
 /*!
  *
  */
-QObject* RadioXmlUiLoader::createObject( const QString& type, const QString &name )
+RadioXmlUiLoader::RadioXmlUiLoader() :
+    HbDocumentLoader()
 {
-    QObject* object = 0;
-
-    if ( type == RadioTuningView::staticMetaObject.className() )
-    {
-        object = new RadioTuningView( this );
-    }
-    else if ( type == RadioStationCarousel::staticMetaObject.className() )
-    {
-        object = new RadioStationCarousel( mMainWindow.uiEngine() );
-    }
-    else if ( type == RadioStationControlWidget::staticMetaObject.className() )
-    {
-        object = new RadioStationControlWidget( mMainWindow.uiEngine() );
-    }
-    else if ( type == RadioFrequencyStrip::staticMetaObject.className() )
-    {
-        RadioUiEngine& engine = mMainWindow.uiEngine();
-        object = new RadioFrequencyStrip( engine.minFrequency(),
-                                          engine.maxFrequency(),
-                                          engine.frequencyStepSize(),
-                                          engine.currentFrequency(),
-                                          &engine );
-    }
-    else if ( type == RadioStationsView::staticMetaObject.className() )
-    {
-        object = new RadioStationsView( this );
-    }
-    else if ( type == RadioBannerLabel::staticMetaObject.className() )
-    {
-        object = new RadioBannerLabel();
-    }
-    else if ( type == RadioFadingLabel::staticMetaObject.className() )
-    {
-        object = new RadioFadingLabel();
-    }
-    else if ( type == RadioWizardView::staticMetaObject.className() )
-    {
-        object = new RadioWizardView( this );
-    }
-    else if ( type == RadioContextMenu::staticMetaObject.className() )
-    {
-        object = new RadioContextMenu( mMainWindow.uiEngine() );
-    }
-    else if ( type == RadioPlayLogView::staticMetaObject.className() )
-    {
-        object = new RadioPlayLogView( this );
-    }
-
-    if ( object )
-    {
-        object->setObjectName( name );
-        return object;
-    }
-
-    return HbDocumentLoader::createObject( type, name );
 }