diff -r f7ac710697a9 -r 06ff229162e9 src/hbwidgets/devicedialogs/hbdevicemessagebox.h --- a/src/hbwidgets/devicedialogs/hbdevicemessagebox.h Mon May 03 12:48:33 2010 +0300 +++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox.h Fri May 14 16:09:54 2010 +0300 @@ -38,9 +38,9 @@ { Q_OBJECT + Q_PROPERTY(HbMessageBox::MessageBoxType messageBoxType READ messageBoxType WRITE setMessageBoxType) Q_PROPERTY(QString text READ text WRITE setText) Q_PROPERTY(QString iconName READ iconName WRITE setIconName) - Q_PROPERTY(Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment) Q_PROPERTY(bool iconVisible READ iconVisible WRITE setIconVisible) Q_PROPERTY(int timeout READ timeout WRITE setTimeout) Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition) @@ -72,10 +72,10 @@ void show(); void update(); void close(); - HbAction *exec(); // deprecated - const QAction *exec() const; // tbd. remove const when HbAction *exec() is removed + const QAction *exec(); const QAction *triggeredAction() const; bool isAcceptAction(const QAction *action) const; + void setMessageBoxType(HbMessageBox::MessageBoxType type); HbMessageBox::MessageBoxType messageBoxType() const; @@ -85,9 +85,6 @@ void setIconName(const QString &iconName); QString iconName() const; - void setIconAlignment(Qt::Alignment align); - Qt::Alignment iconAlignment() const; - void setIconVisible(bool visible); bool iconVisible() const; @@ -101,12 +98,6 @@ void setDismissPolicy(HbPopup::DismissPolicy dismissPolicy); HbPopup::DismissPolicy dismissPolicy() const; - HbAction *primaryAction() const; // deprecated - void setPrimaryAction(HbAction *action); // deprecated - - HbAction *secondaryAction() const; // deprecated - void setSecondaryAction(HbAction *action); // deprecated - void setAction(QAction *action, ActionRole role); QAction *action(ActionRole role) const;