diff -r bab96b7ed1a4 -r f39ed5e045e0 phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h --- a/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h Tue Jun 15 14:14:38 2010 +0100 +++ b/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h Thu Jul 22 16:33:21 2010 +0100 @@ -28,7 +28,6 @@ #include #include #include "mphoneviewcommandhandle.h" -#include "mphonepubsubobserver.h" #include "phoneaction.h" class PhoneUIQtViewIF; @@ -42,11 +41,12 @@ class TelephonyService; class QKeyEvent; class PhoneIndicatorController; +class PhoneVisibilityHandler; +class PhoneAppLauncher; class PHONEUIQTVIEWADAPTER_EXPORT PhoneUIQtViewAdapter : public QObject, - public MPhoneViewCommandHandle, - public MPhonePubSubObserver + public MPhoneViewCommandHandle { Q_OBJECT @@ -148,20 +148,7 @@ Returns pointer to PhoneNoteController */ PhoneNoteController* noteController() const; - -public: // from MPhonePubSubObserver - /** - * This function is called when there is property value change. - * @param aCategory Category of the property - * @param aKey Property key that is changed - * @param aValue New property value - */ - void HandlePropertyChangedL( - const TUid& aCategory, - const TUint aKey, - const TInt aValue); - private slots: @@ -425,6 +412,13 @@ void bringToForeground(); /*! + \fn void PhoneUIQtViewAdapter::hideDeviceDialogs() + + This method brings application top of devicedialogs. + */ + void hideDeviceDialogs(TPhoneCommandParam *commandParam); + + /*! \fn void PhoneUIQtViewAdapter::showGlobalNote() This method shows global note. @@ -537,6 +531,24 @@ This method opens contacts application. */ void openContacts(); + + /*! + /fn void openLogs() + This method opens logs/dialer application. + */ + void openLogs(TPhoneCommandParam *commandParam); + + /*! + /fn void setCommonButtonFlags() + This method sets common button flags. + */ + void setCommonButtonFlags(); + + /*! + /fn void convertKey() + This method converts key. + */ + bool convertKey(TKeyCode symbianKey, Qt::Key &qtKey); private: @@ -552,7 +564,10 @@ PhoneIndicatorController *m_indicatorController; bool m_dialpadAboutToClose; bool m_homeScreenToForeground; - bool m_carModeEnabled; + PhoneVisibilityHandler *m_visibilityHandler; + PhoneAppLauncher *m_appLauncher; + bool m_clearDialpadOnClose; + bool m_speakerAsDefaultButton; }; #endif // PHONEUIQTVIEWADAPTER_H