diff -r 6bcf277166c1 -r 451b2e1545b2 radioapp/radiopresetstorage/inc/radiopresetstorage_p.h
--- a/radioapp/radiopresetstorage/inc/radiopresetstorage_p.h	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/radiopresetstorage/inc/radiopresetstorage_p.h	Thu Jul 22 16:33:45 2010 +0100
@@ -19,28 +19,14 @@
 #define RADIOPRESETSTORAGE_P_H_
 
 // System includes
-#ifndef COMPILE_WITH_NEW_PRESET_UTILITY
-#   include <RadioPresetUtility.h>
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
-
 #include <QScopedPointer>
-#include <e32std.h>
 
 // User includes
 
 // Forward declarations
-#ifdef COMPILE_WITH_NEW_PRESET_UTILITY
-    class CPresetUtility;
-    typedef QScopedPointer<CPresetUtility> PresetUtilityPtr;
-#else
-    class CRadioFmPresetUtility;
-    typedef QScopedPointer<CRadioFmPresetUtility> PresetUtilityPtr;
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
+class CPresetUtility;
 
 class RadioPresetStoragePrivate
-#ifndef COMPILE_WITH_NEW_PRESET_UTILITY
-                                : public MRadioPresetObserver
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
 {
 public:
 
@@ -49,14 +35,9 @@
 
     bool init();
 
-#ifndef COMPILE_WITH_NEW_PRESET_UTILITY
-private:
-    void MrpeoPresetChanged( TPresetChangeEvent /*aChange*/, TInt /*aIndex*/ ) {}
-#endif // COMPILE_WITH_NEW_PRESET_UTILITY
-
 public: // data
 
-    PresetUtilityPtr   mPresetUtility;
+    QScopedPointer<CPresetUtility>  mPresetUtility;
 
 };