--- a/radioapp/radiowidgets/inc/radiofrequencyscanner.h	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radiowidgets/inc/radiofrequencyscanner.h	Mon May 03 12:31:41 2010 +0300
@@ -20,11 +20,17 @@
 
 // System includes
 #include <QObject>
+#include <QScopedPointer>
 
 // Forward declarations
 class HbProgressDialog;
 class RadioStation;
 class RadioUiEngine;
+class RadioXmlUiLoader;
+class RadioMainWindow;
+class RadioFrequencyStrip;
+class RadioStationCarousel;
+class RadioScannerEngine;
 
 // Class declaration
 class RadioFrequencyScanner : public QObject
@@ -33,9 +39,10 @@
 
 public:
 
-    RadioFrequencyScanner( RadioUiEngine& uiEngine, QObject* parent = 0 );
+    RadioFrequencyScanner( RadioUiEngine& uiEngine, QObject* parent );
+    ~RadioFrequencyScanner();
 
-    void startScanning();
+    void startScanning( RadioXmlUiLoader& uiLoader );
 
 signals:
 
@@ -43,8 +50,14 @@
 
 private slots:
 
+    void delayedStart();
     void updateScanAndSaveProgress( const RadioStation& station );
+    void continueScanning();
     void scanAndSavePresetsCancelled();
+    void restoreUiControls();
+
+private:
+
     void scanAndSavePresetsFinished();
 
 private: // data
@@ -54,6 +67,10 @@
      */
     RadioUiEngine&      mUiEngine;
 
+    bool                mInTuningView;
+
+    QScopedPointer<RadioScannerEngine> mScannerEngine;
+
     /**
      * Scanning progress note
      * Own.
@@ -65,10 +82,8 @@
      */
     uint                mChannelCount;
 
-    /**
-     * Low frequency band edge. The lowest valid frequency at the current region
-     */
-    uint                mMinFrequency;
+    int                 mStripScrollTime;
+    int                 mCarouselScrollTime;
 
 };