--- a/radioapp/radiouiengine/radiouiengine.pro	Fri Jun 04 10:21:36 2010 +0100
+++ b/radioapp/radiouiengine/radiouiengine.pro	Fri Jun 11 13:38:32 2010 +0300
@@ -17,32 +17,23 @@
 include(../buildflags.pri)
 
 TEMPLATE    = lib
-TARGET      = radiouiengine
+TARGET      = fmradiouiengine
 CONFIG      += dll
 DEFINES     += BUILD_UI_ENGINE_DLL
-win32:DESTDIR = ../bin
+
+symbian:TARGET.UID3 = 0x2002EADA
 
 # Wrapper does not depend on QtGui or Orbit
 QT          = core gui network sql
 CONFIG      -= hb
-CONFIG      += mobility
-MOBILITY    = systeminfo
-
-symbian: {
-    DEFINES += SYMBIAN
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = CAP_GENERAL_DLL
-}
 
 INCLUDEPATH += inc
 INCLUDEPATH += ../radiopresetstorage/inc
 INCLUDEPATH += ../radioenginewrapper/inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
 
-win32:LIBS += -L../bin
-
-LIBS += -lradiopresetstorage
-LIBS += -lradioenginewrapper
+LIBS += -lfmradiopresetstorage
+LIBS += -lfmradioenginewrapper
 
 symbian:LIBS += -lxqservice
 symbian:LIBS += -lxqserviceutil
@@ -57,23 +48,19 @@
 HEADERS += radiouiengineexport.h
 HEADERS += radiostation.h
 HEADERS += radiostationmodel.h
-HEADERS += radiostationfiltermodel.h
 HEADERS += radiouiengine.h
 HEADERS += radiohistoryitem.h
 HEADERS += radiohistorymodel.h
-HEADERS += radiocarouselmodel.h
 HEADERS += radioscannerengine.h
 HEADERS += radioservicedef.h
 HEADERS += radionotificationdata.h
-
-symbian:HEADERS += radiocontrolservice.h
-symbian:HEADERS += radiomonitorservice.h
-win32:HEADERS += radiomonitorservice_win32.h
+HEADERS += radiogenrelocalizer.h
+HEADERS += radiocontrolservice.h
+HEADERS += radiomonitorservice.h
 
 INTERNAL_HEADERS += radiostation_p.h
 INTERNAL_HEADERS += radiohistoryitem_p.h
 INTERNAL_HEADERS += radiohistorymodel_p.h
-INTERNAL_HEADERS += radiocarouselmodel_p.h
 INTERNAL_HEADERS += radiouiengine_p.h
 INTERNAL_HEADERS += radiostationmodel_p.h
 INTERNAL_HEADERS += radioscannerengine_p.h
@@ -84,18 +71,13 @@
 SOURCES += radiostation_p.cpp
 SOURCES += radiostationmodel.cpp
 SOURCES += radiostationmodel_p.cpp
-SOURCES += radiostationfiltermodel.cpp
 SOURCES += radiouiengine.cpp
 SOURCES += radiouiengine_p.cpp
 SOURCES += radiohistoryitem.cpp
 SOURCES += radiohistoryitem_p.cpp
 SOURCES += radiohistorymodel.cpp
 SOURCES += radiohistorymodel_p.cpp
-SOURCES += radiocarouselmodel.cpp
-SOURCES += radiocarouselmodel_p.cpp
 SOURCES += radioscannerengine.cpp
 SOURCES += radioscannerengine_p.cpp
-
-symbian:SOURCES += radiocontrolservice.cpp
-symbian:SOURCES += radiomonitorservice.cpp
-win32:SOURCES += radiomonitorservice_win32.cpp
+SOURCES += radiocontrolservice.cpp
+SOURCES += radiomonitorservice.cpp