--- a/src/hbwidgets/popups/hbprogressdialog.cpp Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog.cpp Wed Aug 18 10:05:37 2010 +0300
@@ -134,21 +134,19 @@
*/
void HbProgressDialogPrivate::createPrimitives()
{
- Q_Q(HbProgressDialog);
-
if( !mContentWidget->mProgressBar ){
mContentWidget->mProgressBar = new HbProgressBar(mContentWidget);
HbStyle::setItemName(mContentWidget->mProgressBar, "pbar");
}
if ( !mContentWidget->mTextItem ) {
- mContentWidget->mTextItem = q->style()->createPrimitive(HbStyle::P_ProgressDialog_text,mContentWidget);
+ mContentWidget->mTextItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_ProgressDialog_text,mContentWidget);
HbStyle::setItemName(mContentWidget->mTextItem, "text");
}
if ( !mIcon.isNull() ) {
if ( !mContentWidget->mIconItem ) {
- mContentWidget->mIconItem = q->style()->createPrimitive(HbStyle::P_ProgressDialog_icon, mContentWidget);
+ mContentWidget->mIconItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_ProgressDialog_icon, mContentWidget);
HbStyle::setItemName(mContentWidget->mIconItem, "icon");
}
} else {
@@ -508,9 +506,9 @@
Q_D(const HbProgressDialog);
switch (primitive) {
- case HbStyle::P_ProgressDialog_icon:
+ case HbStylePrivate::P_ProgressDialog_icon:
return d->mContentWidget->mIconItem;
- case HbStyle::P_ProgressDialog_text:
+ case HbStylePrivate::P_ProgressDialog_text:
return d->mContentWidget->mTextItem;
default:
return 0;
@@ -664,7 +662,7 @@
{
HbStyleOptionProgressDialog progressDialogOption;
initStyleOption(&progressDialogOption);
- style()->updatePrimitive(d->mContentWidget->mTextItem, HbStyle::P_ProgressDialog_text, &progressDialogOption);
+ HbStylePrivate::updatePrimitive(d->mContentWidget->mTextItem, HbStylePrivate::P_ProgressDialog_text, &progressDialogOption);
}
}
}
@@ -703,7 +701,7 @@
HbStyleOptionProgressDialog progressDialogOption;
initStyleOption(&progressDialogOption);
- style()->updatePrimitive(d->mContentWidget->mIconItem, HbStyle::P_ProgressDialog_icon, &progressDialogOption);
+ HbStylePrivate::updatePrimitive(d->mContentWidget->mIconItem, HbStylePrivate::P_ProgressDialog_icon, &progressDialogOption);
}
else
{