--- a/filebrowser/ui/inc/searchview.h	Fri Jun 11 16:29:34 2010 +0100
+++ b/filebrowser/ui/inc/searchview.h	Thu Jul 22 16:33:59 2010 +0100
@@ -18,16 +18,16 @@
 #ifndef SEARCHVIEW_H
 #define SEARCHVIEW_H
 
-#include <hbview.h>
-#include <hbmainwindow.h>
+#include <HbView>
+
+#include <QDateTime>
 
-#include <qdatetime.h>
+class QStringList;
 
-class QDir;
 class EngineWrapper;
-class QStringList;
 class HbDataForm;
 class HbDataFormModelItem;
+class HbProgressDialog;
 
 /**
   * Settings class that is used for 
@@ -51,8 +51,8 @@
 class SearchResults
 {
 public:
-    int         mNumberOfFoundFiles;
-    QStringList* mFoundFilesList;
+    int mNumberOfFoundFiles;
+    QStringList *mFoundFilesList;
 };
 
 class SearchView : public HbView
@@ -60,24 +60,27 @@
     Q_OBJECT
 
 public:
-    SearchView(HbView &mainView, HbMainWindow &mainWindow, EngineWrapper &engineWrapper);
+    explicit SearchView(EngineWrapper &engineWrapper);
     ~SearchView();
     void open(const QString &path);
 
+signals:
+    void finished(bool ok);
 
 private slots:
-    void backButtonClicked();
-    void startFileSearch();
+    void accept();
+    void reject();
+
+private:
+    void initDataForm();
+    void createToolbar();
     void loadAttributes();
     void readFormItems();
-    
-private:
+
+    void startFileSearch();
     void fileSearchResults();
 
-    /* Main Window of folderbrowser */
-    HbMainWindow &mMainWindow;
-    /* Main View of folderbrowser*/
-    HbView &mMainView;
+private:
     /* EngineWrapper */
     EngineWrapper &mEngineWrapper;  
 
@@ -97,6 +100,8 @@
     HbDataFormModelItem *mMaxDate;
 
     QString mPath;
+
+    HbProgressDialog *mProgressDialog;
 };
 
 #endif // SEARCHVIEW_H