diff -r 66b5fe3c07fd -r e6f74eb7f69f homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp --- a/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp Wed Oct 06 16:06:24 2010 +0300 +++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/src/hsclockwidget.cpp Mon Oct 18 10:20:15 2010 +0300 @@ -56,12 +56,12 @@ mWidget(0), mLayout(0), mClockType(ANALOG), - mTimeType(TIME12) + mTimeFormat(TIME12) { #ifdef Q_OS_SYMBIAN mClockSettingsNotifier = new HsClockSettingsNotifier(this); - mClockType = mClockSettingsNotifier->clockFormat(); - mTimeType = mClockSettingsNotifier->timeFormat(); + mClockType = mClockSettingsNotifier->clockType(); + mTimeFormat = mClockSettingsNotifier->timeFormat(); #endif } @@ -140,10 +140,10 @@ /*! \internal */ -void HsClockWidget::onSettingsChanged(const QString &clockFormat, const QString &timeFormat) +void HsClockWidget::onSettingsChanged(const QString &clockType, const QString &timeFormat) { - if (mClockType != clockFormat) { - mClockType = clockFormat; + if (mClockType != clockType) { + mClockType = clockType; mLayout->removeItem(mWidget); delete mWidget; mWidget = 0; @@ -151,10 +151,10 @@ mLayout->addItem(mWidget); } - if (mTimeType != timeFormat) { - mTimeType = timeFormat; + if (mTimeFormat != timeFormat) { + mTimeFormat = timeFormat; if (mClockType == DIGITAL) { - if (mTimeType == TIME12) { + if (mTimeFormat == TIME12) { static_cast(mWidget)->setAmPm(true); } else { static_cast(mWidget)->setAmPm(false); @@ -171,10 +171,10 @@ #ifndef Q_OS_SYMBIAN if (mClockType == ANALOG) { mClockType = DIGITAL; - if (mTimeType == TIME12) { - mTimeType = TIME24; + if (mTimeFormat == TIME12) { + mTimeFormat = TIME24; } else { - mTimeType = TIME12; + mTimeFormat = TIME12; } } else { mClockType = ANALOG; @@ -213,7 +213,7 @@ if (mClockType == DIGITAL) { bool useAmPm = true; - if (mTimeType == TIME24) { + if (mTimeFormat == TIME24) { useAmPm = false; } clockWidget = new HsDigitalClockWidget(useAmPm);