diff -r 1f002146abb4 -r 8d5d7fcf9b59 satui/satapp/inc/satappmainhandler.h --- a/satui/satapp/inc/satappmainhandler.h Tue Jul 06 14:53:02 2010 +0300 +++ b/satui/satapp/inc/satappmainhandler.h Wed Jul 21 18:26:52 2010 +0300 @@ -20,11 +20,15 @@ #define SATAPPMAINHANDLER_H #include +#include class HbMainWindow; -class SatAppUiProvider; -class SatAppEventProvider; -class SatAppCommandHandler; +class SatAppServerDispatcher; +class SatAppMenuProvider; +class SatAppInputProvider; +class SatAppToneProvider; +class SatAppPopupProvider; +class SatAppConfirmProvider; class SatAppMainHandler : public QObject { @@ -36,11 +40,23 @@ private: void initConnections(); + +private slots: + void updateActivity(); + void saveActivity(); +private: + void removeActivity(); + private: // data - SatAppEventProvider *mEvent; - SatAppUiProvider *mUi; - SatAppCommandHandler *mCommand; + + SatAppServerDispatcher* mServer; + SatAppMenuProvider* mMenu; + SatAppInputProvider* mInput; + SatAppToneProvider* mTone; + SatAppPopupProvider* mPopup; + SatAppConfirmProvider *mConfirm; + QVariantHash mActivity; }; #endif // SATAPPMAINHANDLER_H