diff -r 1ef5359bf0f4 -r a10844a9914d hgcacheproxymodel/tsrc/fute/HgCacheProxyModelTestApp/src/mywindow.h --- a/hgcacheproxymodel/tsrc/fute/HgCacheProxyModelTestApp/src/mywindow.h Fri Sep 03 10:22:04 2010 +0300 +++ b/hgcacheproxymodel/tsrc/fute/HgCacheProxyModelTestApp/src/mywindow.h Fri Sep 17 15:55:58 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * -* Version : %version: 6 % +* Version : %version: 8 % */ #ifndef CONTENTWIDGET_H #define CONTENTWIDGET_H @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -37,8 +36,8 @@ class QTimer; class HbMenu; -class HbMainWindow; -class HbGridView; +class HgGrid; +class HgMediawall; class HbAction; class HbMenuItem; class QFileSystemWatcher; @@ -58,6 +57,7 @@ void processAction( HbAction* action ); void sortTestTimeout(); void filterTestTimeout(); + void resetTestTimeout(); private: HbMenu *createMainMenu(); @@ -65,18 +65,29 @@ void addChangeViewMenu(HbMenu* parent); void addCacheProxyModelMenu(HbMenu* parent); void addDataProviderMenu(HbMenu* parent); + void scrollTo(int pos); -private: - HbWidget* mView; +private: + HbWidget* mCurrentWidget; + HbGridView* mGridWidget; + HbListView* mListWidget; + HgMediawall * mMediaWallWidget; + HgGrid * mHgGridWidget; + HgCacheProxyModel *mModel; MyDataProvider *mMyDataProvider; HbView* mMainView; + QTimer *mSortTestTimer; int mSortTestVal; QTimer *mFilterTestTimer; int mFilterTestVal; + + QTimer *mResetTestTimer; + int mResetTestVal; + }; #endif // CONTENTWIDGET_H