--- a/radioapp/radioapplication/inc/radioapplication.h	Mon May 03 12:31:41 2010 +0300
+++ b/radioapp/radioapplication/inc/radioapplication.h	Fri May 14 15:52:32 2010 +0300
@@ -25,12 +25,9 @@
 #include <QSharedPointer>
 
 // Forward declarations
-class RadioUiEngine;
-class RadioMainWindow;
+class RadioWindow;
 class RadioStationModel;
 
-typedef QSharedPointer<RadioMainWindow> RadioMainWindowPtr;
-
 #ifdef BUILD_WIN32
     class Win32Window;
 #endif // BUILD_WIN32
@@ -54,20 +51,14 @@
 private: // data
 
 #ifdef BUILD_WIN32
-    QScopedPointer<Win32Window> mWin32Window;
+    QScopedPointer<Win32Window>     mWin32Window;
 #endif // BUILD_WIN32
 
     /**
      * Application main window
      * Own
      */
-    RadioMainWindowPtr  mMainWindow;
-
-    /**
-     * Radio engine
-     * Own
-     */
-    RadioUiEngine*      mUiEngine;
+    QScopedPointer<RadioWindow> mMainWindow;
 
 };