--- a/controlpanel/controlpanel_plat/inc/cpsettingformentryitemdata.h Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpsettingformentryitemdata.h Thu Jun 10 16:03:48 2010 +0800
@@ -92,8 +92,7 @@
Q_DISABLE_COPY(CpSettingFormEntryItemData)
Q_DECLARE_PRIVATE_D(d_ptr, CpSettingFormEntryItemData)
Q_PRIVATE_SLOT(d_func(), void _q_itemPressed(const QModelIndex &index))
- Q_PRIVATE_SLOT(d_func(), void _q_itemReleased(const QModelIndex &index))
- Q_PRIVATE_SLOT(d_func(), void _q_scrollingStarted())
+ Q_PRIVATE_SLOT(d_func(), void _q_itemActivated(const QModelIndex &index))
private:
CpSettingFormEntryItemDataPrivate *d_ptr;
};
--- a/controlpanel/rom/controlpanel.iby Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/rom/controlpanel.iby Thu Jun 10 16:03:48 2010 +0800
@@ -25,8 +25,9 @@
file=ABI_DIR\BUILD_DIR\cpframework.dll SHARED_LIB_DIR\cpframework.dll
-data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem.css resource\controlpanel\widgetml\cpdataformlistentryviewitem.css
-data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem.widgetml resource\controlpanel\widgetml\cpdataformlistentryviewitem.widgetml
-data= \epoc32\data\c\resource\controlpanel\icon\qgn_prop_set_default_sub.svg resource\controlpanel\icon\qgn_prop_set_default_sub.svg
+data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem.css resource\controlpanel\widgetml\cpdataformlistentryviewitem.css
+data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem_color.css resource\controlpanel\widgetml\cpdataformlistentryviewitem_color.css
+data= \epoc32\data\c\resource\controlpanel\widgetml\cpdataformlistentryviewitem.widgetml resource\controlpanel\widgetml\cpdataformlistentryviewitem.widgetml
+data= \epoc32\data\c\resource\controlpanel\icon\qgn_prop_set_default_sub.svg resource\controlpanel\icon\qgn_prop_set_default_sub.svg
#endif
--- a/controlpanel/src/cpframework/cpframework.pro Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/cpframework.pro Thu Jun 10 16:03:48 2010 +0800
@@ -55,7 +55,8 @@
# export widgetml files
widgetmls.path = C:/resource/controlpanel/widgetml
widgetmls.sources += widgetml/cpdataformlistentryviewitem.css \
- widgetml/cpdataformlistentryviewitem.widgetml
+ widgetml/cpdataformlistentryviewitem.widgetml \
+ widgetml/cpdataformlistentryviewitem_color.css
for(widgetmlfile, widgetmls.sources):BLD_INF_RULES.prj_exports += "./$$widgetmlfile $$widgetmls.path/$$basename(widgetmlfile)"
# export icon files
--- a/controlpanel/src/cpframework/src/cpbasesettingview_p.cpp Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpbasesettingview_p.cpp Thu Jun 10 16:03:48 2010 +0800
@@ -54,7 +54,7 @@
mBaseSettingView->setWidget(widget);
- mBaseSettingView->setTitle("Control Panel"); //give a default title, sub classes need set it correctly
+ mBaseSettingView->setTitle(hbTrId("txt_cp_title_control_panel")); //give a default title, sub classes need set it correctly
mSoftKeyBackAction = new HbAction(Hb::BackNaviAction , mBaseSettingView);
QObject::connect(mSoftKeyBackAction,
--- a/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp Thu Jun 10 16:03:48 2010 +0800
@@ -26,8 +26,7 @@
CpSettingFormEntryItemDataPrivate::CpSettingFormEntryItemDataPrivate()
: mDataForm(0),
mItemDataHelper(0),
- mItemPressed(false),
- mDataFormScrolling(false)
+ mItemPressed(false)
{
}
@@ -35,8 +34,7 @@
CpSettingFormEntryItemDataPrivate::CpSettingFormEntryItemDataPrivate(CpItemDataHelper *itemDataHelper)
: mDataForm(0),
mItemDataHelper(itemDataHelper),
- mItemPressed(false),
- mDataFormScrolling(false)
+ mItemPressed(false)
{
}
@@ -44,8 +42,7 @@
CpSettingFormEntryItemDataPrivate::CpSettingFormEntryItemDataPrivate(HbDataForm *dataForm)
: mDataForm(dataForm),
mItemDataHelper(0),
- mItemPressed(false),
- mDataFormScrolling(false)
+ mItemPressed(false)
{
}
@@ -62,13 +59,11 @@
{
if (mItemDataHelper) {
mItemDataHelper->connectToForm(SIGNAL(pressed (QModelIndex)),mParent,SLOT(_q_itemPressed(QModelIndex)));
- mItemDataHelper->connectToForm(SIGNAL(released (QModelIndex)),mParent,SLOT(_q_itemReleased(QModelIndex)));
- mItemDataHelper->connectToForm(SIGNAL(scrollingStarted ()),mParent,SLOT(_q_scrollingStarted()));
+ mItemDataHelper->connectToForm(SIGNAL(activated(QModelIndex)),mParent,SLOT(_q_itemActivated(QModelIndex)));
}
else if (mDataForm) {
QObject::connect( mDataForm,SIGNAL(pressed(QModelIndex)),mParent,SLOT(_q_itemPressed(QModelIndex)) );
- QObject::connect( mDataForm,SIGNAL(released(QModelIndex)),mParent,SLOT(_q_itemReleased(QModelIndex)) );
- QObject::connect( mDataForm,SIGNAL(scrollingStarted()),mParent,SLOT(_q_scrollingStarted()) );
+ QObject::connect( mDataForm,SIGNAL(activated(QModelIndex)),mParent,SLOT(_q_itemActivated(QModelIndex)) );
}
}
break;
@@ -200,18 +195,15 @@
mItemPressed = ( modelItemFromModelIndex(index) == mParent );
}
-void CpSettingFormEntryItemDataPrivate::_q_itemReleased(const QModelIndex &index)
-{
- if (!mDataFormScrolling && mItemPressed && modelItemFromModelIndex(index) == mParent) {
+
+void CpSettingFormEntryItemDataPrivate::_q_itemActivated(const QModelIndex &index)
+{
+ if (mItemPressed && modelItemFromModelIndex(index) == mParent) {
mParent->onLaunchView();
}
- mDataFormScrolling = false;
+ mItemPressed = false;
}
-void CpSettingFormEntryItemDataPrivate::_q_scrollingStarted()
-{
- mDataFormScrolling = true;
-}
HbDataFormModelItem *CpSettingFormEntryItemDataPrivate::modelItemFromModelIndex(const QModelIndex &index)
{
--- a/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.h Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.h Thu Jun 10 16:03:48 2010 +0800
@@ -50,10 +50,9 @@
HbIcon entryItemIcon() const;
void setEntryItemIcon(const HbIcon &icon);
- //SLOTS
+ //private slots
void _q_itemPressed(const QModelIndex &index);
- void _q_itemReleased(const QModelIndex &index);
- void _q_scrollingStarted();
+ void _q_itemActivated(const QModelIndex &index);
HbDataFormModelItem *modelItemFromModelIndex(const QModelIndex &index);
@@ -62,7 +61,6 @@
CpItemDataHelper *mItemDataHelper;
QPointer<HbView> mSettingViewPtr;
bool mItemPressed;
- bool mDataFormScrolling;
};
--- a/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.css Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.css Thu Jun 10 16:03:48 2010 +0800
@@ -1,31 +1,39 @@
+
+/*
+ Layout selection
+*/
+
CpDataFormListEntryViewItem {
layout:default;
}
-CpDataFormListEntryViewItem::dataItem_Icon
+CpDataFormListEntryViewItem::dataItem_Background
+{
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon:portrait
{
- fixed-height:60;
- fixed-width:60;
+ fixed-height: var(hb-param-graphic-size-image-portrait);
+ fixed-width: var(hb-param-graphic-size-image-portrait);
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon:landscape
+{
+ fixed-height: var(hb-param-graphic-size-image-landscape);
+ fixed-width: var(hb-param-graphic-size-image-landscape);
}
CpDataFormListEntryViewItem::dataItem_Label
{
size-policy-horizontal: preferred;
- text-height: 3.0un;
- top: -1.0un;
- left: -2.0un;
+ font-variant: primary;
+ text-align: left;
}
-
CpDataFormListEntryViewItem::dataItem_Description
{
- text-height: 3.0un;
- bottom:1.0un;
- left: -2.0un;
+ font-variant: secondary;
+ text-align: left;
}
-
-
-
-
--- a/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.widgetml Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem.widgetml Thu Jun 10 16:03:48 2010 +0800
@@ -1,26 +1,25 @@
<hbwidget version="0.1" type="CpDataFormListEntryViewItem">
<layout name="default" type="mesh">
-
- <meshitem src="dataItem_Icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="dataItem_Icon" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="dataItem_Icon" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
- <meshitem src="dataItem_Label" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="dataItem_Label" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
- <meshitem src="dataItem_Label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
-
- <meshitem src="dataItem_Description" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
- <meshitem src="dataItem_Description" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="dataItem_Description" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
+
<meshitem src="dataItem_Background" srcEdge="TOP" dst="" dstEdge="TOP" />
<meshitem src="dataItem_Background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
<meshitem src="dataItem_Background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
<meshitem src="dataItem_Background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="dataItem_Icon" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <meshitem src="dataItem_Icon" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="dataItem_Label" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="dataItem_Label" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
+ <meshitem src="dataItem_Label" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="dataItem_Label" srcEdge="BOTTOM" dst="dataItem_Description" dstEdge="TOP" />
+
+ <meshitem src="dataItem_Description" srcEdge="TOP" dst="dataItem_Label" dstEdge="BOTTOM" />
+ <meshitem src="dataItem_Description" srcEdge="LEFT" dst="dataItem_Icon" dstEdge="RIGHT" />
+ <meshitem src="dataItem_Description" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="dataItem_Description" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
</layout>
-
+
</hbwidget>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/controlpanel/src/cpframework/widgetml/cpdataformlistentryviewitem_color.css Thu Jun 10 16:03:48 2010 +0800
@@ -0,0 +1,41 @@
+
+/*
+ CpDataFormListEntryViewItem default color definitions.
+*/
+
+CpDataFormListEntryViewItem::dataItem_Icon {
+ color: var(qtc_list_item_title_normal);
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon[state="pressed"]{
+ color: var(qtc_list_item_pressed);
+}
+
+CpDataFormListEntryViewItem::dataItem_Icon[state="disabled"] {
+ color: var(qtc_list_item_disabled);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label {
+ color: var(qtc_list_item_title_normal);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label[state="pressed"] {
+ color: var(qtc_list_item_pressed);
+}
+
+CpDataFormListEntryViewItem::dataItem_Label[state="disabled"] {
+ color: var(qtc_list_item_disabled);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description {
+ color: var(qtc_list_item_title_normal);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description[state="pressed"] {
+ color: var(qtc_list_item_pressed);
+}
+
+CpDataFormListEntryViewItem::dataItem_Description[state="disabled"] {
+ color: var(qtc_list_item_disabled);
+}
+
--- a/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Thu Jun 10 16:03:48 2010 +0800
@@ -18,7 +18,7 @@
TARGET = ut_cpapi
QT += testlib
CONFIG += hb qtestlib
-#CONFIG += symbian_test
+CONFIG += symbian_test
unix {
test.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe
autotest.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml
--- a/ftuwizardmodel/inc/ftuwizard.h Tue May 25 04:13:06 2010 +0800
+++ b/ftuwizardmodel/inc/ftuwizard.h Thu Jun 10 16:03:48 2010 +0800
@@ -25,7 +25,7 @@
#include <QObject>
#include <QRectF>
#include <QDate>
-#include <HbMenu>
+#include <hbmenu>
class QGraphicsWidget;
@@ -42,22 +42,6 @@
typedef struct {
/**
- * The default icon to be shown in menustrip UI component.
- */
- QFileInfo mMenustripDefaultIcon;
- /**
- * The pressed icon to be shown in menustrip UI component.
- */
- QFileInfo mMenustripPressedIcon;
- /**
- * The focussed icon to be shown in menustrip UI component.
- */
- QFileInfo mMenustripFocussedIcon;
- /**
- * The text to be shown in menustrip UI component.
- */
- QString mMenustripLabel;
- /**
* The default icon to be shown in table of contents UI component.
*/
QFileInfo mTocDefaultIcon;
@@ -212,20 +196,6 @@
void viewChanged(FtuWizard *caller, QGraphicsWidget* viewWidget);
/**
- * Emit this signal to put the ftu view to full-screen view, i.e. no
- * titlebar, infotext & menustrip.
- * @param caller The calling wizard plugin instance.
- */
- void fullScreenModeRequested(FtuWizard *caller);
-
- /**
- * Emit this signal to come out of fullscreen mode, i.e. show the titlebar,
- * infotext and menustrip
- * @param caller The calling wizard plugin instance.
- */
- void partialScreenModeRequested(FtuWizard *caller);
-
- /**
* Adds an over-lay widget on top of the current view, used to add an
* overlay animation on top of the current view
* @param caller The calling wizard plugin instance.
@@ -262,6 +232,13 @@
* @param menu The HbMenu instance that needs to be shown on the view
*/
void updateMainMenu(FtuWizard *caller, HbMenu * menu);
+
+ /**
+ * Emit this signal to indicate that the wizard plugin wants to be deactivated.
+ * Wizard is deactivated and Table of Contents is shown by the application.
+ * @param caller The calling wizard plugin instance.
+ */
+ void wizardDeactivated(FtuWizard *caller);
};
--- a/gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h Tue May 25 04:13:06 2010 +0800
+++ b/gsprofilesrv_plat/ftuwizardmodel_api/inc/ftuwizard.h Thu Jun 10 16:03:48 2010 +0800
@@ -25,7 +25,7 @@
#include <QObject>
#include <QRectF>
#include <QDate>
-#include <HbMenu>
+#include <hbmenu>
class QGraphicsWidget;
@@ -42,22 +42,6 @@
typedef struct {
/**
- * The default icon to be shown in menustrip UI component.
- */
- QFileInfo mMenustripDefaultIcon;
- /**
- * The pressed icon to be shown in menustrip UI component.
- */
- QFileInfo mMenustripPressedIcon;
- /**
- * The focussed icon to be shown in menustrip UI component.
- */
- QFileInfo mMenustripFocussedIcon;
- /**
- * The text to be shown in menustrip UI component.
- */
- QString mMenustripLabel;
- /**
* The default icon to be shown in table of contents UI component.
*/
QFileInfo mTocDefaultIcon;
@@ -211,20 +195,6 @@
void viewChanged(FtuWizard *caller, QGraphicsWidget* viewWidget);
/**
- * Emit this signal to put the ftu view to full-screen view, i.e. no
- * titlebar, infotext & menustrip.
- * @param caller The calling wizard plugin instance.
- */
- void fullScreenModeRequested(FtuWizard *caller);
-
- /**
- * Emit this signal to come out of fullscreen mode, i.e. show the titlebar,
- * infotext and menustrip
- * @param caller The calling wizard plugin instance.
- */
- void partialScreenModeRequested(FtuWizard *caller);
-
- /**
* Adds an over-lay widget on top of the current view, used to add an
* overlay animation on top of the current view
* @param caller The calling wizard plugin instance.
@@ -261,6 +231,13 @@
* @param menu The HbMenu instance that needs to be shown on the view
*/
void updateMainMenu(FtuWizard *caller, HbMenu * menu);
+
+ /**
+ * Emit this signal to indicate that the wizard plugin wants to be deactivated.
+ * Wizard is deactivated and Table of Contents is shown by the application.
+ * @param caller The calling wizard plugin instance.
+ */
+ void wizardDeactivated(FtuWizard *caller);
};
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/group/bld.inf Tue May 25 04:13:06 2010 +0800
+++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/group/bld.inf Thu Jun 10 16:03:48 2010 +0800
@@ -39,8 +39,3 @@
../inc/MProEngToneSettings.h MW_LAYER_PUBLIC_EXPORT_PATH(MProEngToneSettings.h)
../inc/MProEngProfileNameArrayObserver.h MW_LAYER_PUBLIC_EXPORT_PATH(MProEngProfileNameArrayObserver.h)
../inc/MProEngEngine.h MW_LAYER_PUBLIC_EXPORT_PATH(MProEngEngine.h)
-//Since 10.1
-../inc/MProEngActiveSettingsObserver.h MW_LAYER_PUBLIC_EXPORT_PATH(MProEngActiveSettingsObserver.h)
-../inc/MProEngMasterSettingsObserver.h MW_LAYER_PUBLIC_EXPORT_PATH(MProEngMasterSettingsObserver.h)
-../inc/MProEngNotifyHandler2.h MW_LAYER_PUBLIC_EXPORT_PATH(MProEngNotifyHandler2.h)
-../inc/ProEngFactory2.h MW_LAYER_PUBLIC_EXPORT_PATH(ProEngFactory2.h)
\ No newline at end of file
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/inc/MProEngActiveSettingsObserver.h Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Abstract interface for handling the active profile events.
-*
-*/
-
-
-#ifndef MPROENGACTIVESETTINGSOBSERVER_H
-#define MPROENGACTIVESETTINGSOBSERVER_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-class MProEngActiveSettingsObserverExt;
-
-// CLASS DECLARATION
-
-/**
-* Active profile settings modification observer interface.
-* Implement this interface to get notifications of changes in the active profile settings
-* data.
-*
-* @lib ProfileEngine.lib
-* @since 10.1
-*/
-class MProEngActiveSettingsObserver
- {
- public: // New functions
-
- /**
- * Abstract method for handling active profile settings modification event.
- * This method is called when the current active profile settings has been
- * modified some way. (e.g. switch active profile, change active profile)
- *
- * @since Series 10.1
- */
- virtual void HandleActiveSettingsModifiedL() = 0;
-
- /**
- * Error handler for handling the errors in the active profile settings
- * modification notification process. If HandleActiveSettingsModifiedL()
- * leaves, this method is called with the leave code. This method has
- * default empty implementation.
- * @since 10.1
- * @param aError the code of the error which occurred during
- * notification process.
- */
- virtual void HandleActiveSettingsNotificationError(
- TInt /* aError */ ) {};
-
- protected:
-
- /**
- * Destructor.
- */
- virtual ~MProEngActiveSettingsObserver() {}
-
- private: // Extension interface
-
- /**
- * This member is internal and not intended for use.
- */
- virtual MProEngActiveSettingsObserverExt* Extension() { return NULL; }
-
- };
-
-#endif // MPROENGACTIVESETTINGSOBSERVER_H
-
-// End of File
-
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/inc/MProEngMasterSettingsObserver.h Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Abstract interface for handling the master settings change events.
-*
-*/
-
-
-
-#ifndef MPROENGMASTERSETTINGSOBSERVER_H
-#define MPROENGMASTERSETTINGSOBSERVER_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-class MProEngMasterSettingsObserverExt;
-
-// CLASS DECLARATION
-
-/**
-* master settings modification observer interface.
-* Implement this interface to get notifications of changes in the master settings
-* data.
-*
-* @lib ProfileEngine.lib
-* @since Series 10.1
-*/
-class MProEngMasterSettingsObserver
- {
- public: // New functions
-
- /**
- * Abstract method for handling master settings modification event.
- * This method is called when the master settings has been
- * modified some way.
- *
- * @since Series 10.1
- */
- virtual void HandleMasterSettingsModifiedL() = 0;
-
- /**
- * Error handler for handling the errors in the master settings
- * modification notification process. If HandleMasterSettingsModifiedL()
- * leaves, this method is called with the leave code. This method has
- * default empty implementation.
- * @since 10.1
- * @param aError the code of the error which occurred during
- * notification process.
- */
- virtual void HandleMasterSettingsNotificationError(
- TInt /* aError */ ) {};
-
- protected:
-
- /**
- * Destructor.
- */
- virtual ~MProEngMasterSettingsObserver() {}
-
- private: // Extension interface
-
- /**
- * This member is internal and not intended for use.
- */
- virtual MProEngMasterSettingsObserverExt* Extension() { return NULL; }
-
- };
-
-#endif // MPROENGMASTERSETTINGSOBSERVER_H
-
-// End of File
-
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/inc/MProEngNotifyHandler2.h Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Abstract interface for handling profile change notification
-*
-*/
-
-
-
-#ifndef MPROENGNOTIFYHANDLER2_H
-#define MPROENGNOTIFYHANDLER2_H
-
-// INCLUDES
-#include <MProEngNotifyHandler.h>
-
-// FORWARD DECLARATIONS
-class MProEngNotifyHandler2Ext;
-class MProEngActiveSettingsObserver;
-class MProEngMasterSettingsObserver;
-
-
-// CLASS DECLARATION
-
-/**
-* Profiles change notification handler.
-* This class is used for registration to get notifications about changes in
-* Profiles data.
-*
-* @lib ProfileEngine.lib
-* @since S60 3.1
-*/
-class MProEngNotifyHandler2 : public MProEngNotifyHandler
- {
- public: // New functions
-
-
- /**
- * Request notifications of active profile settings. The notifications are
- * received as long as CancelActiveSettingsNotificationsL() or
- * CancelAll() is called. If the client wants to change the observer,
- * he should first cancel these notifications and then re-request them
- * with the new observer instance.
- * @since 10.1
- * @param aObserver Reference to the observer to be notified in the
- * event of profile activation.
- * @return KErrNone if succesful, KErrAlreadyExists if this notification
- * handler is already used for requesting profile activation
- * notifications. In other cases another system wide error code.
- */
- virtual TInt RequestActiveSettingsNotificationsL(
- MProEngActiveSettingsObserver &aObserver ) = 0;
-
- /**
- * Request notifications of master settings. The notifications are
- * received as long as CanceltMasterSettingsNotificationsL() or
- * CancelAll() is called. If the client wants to change the observer,
- * he should first cancel these notifications and then re-request them
- * with the new observer instance.
- * @since 10.1
- * @param aObserver Reference to the observer to be notified in the
- * event of profile activation.
- * @return KErrNone if succesful, KErrAlreadyExists if this notification
- * handler is already used for requesting profile activation
- * notifications. In other cases another system wide error code.
- */
- virtual TInt RequestMasterSettingsNotificationsL(
- MProEngMasterSettingsObserver &aObserver ) = 0;
-
-
- /**
- * Cancel the registration for receiving notifications about the active
- * settings modification events.
- * @since 10.1
- */
- virtual void CancelActiveSettingsNotificationsL() = 0;
-
- /**
- * Cancel the registration for receiving notifications about the master
- * settings modification events.
- * @since 10.1
- */
- virtual void CancelMasterSettingsNotificationsL() = 0;
-
- public:
-
- /**
- * Destructor.
- */
- virtual ~MProEngNotifyHandler2() {}
-
- private: // Extension interface
-
- /**
- * This member is internal and not intended for use.
- */
- virtual MProEngNotifyHandler2Ext* Extension2() { return NULL; }
-
- };
-
-#endif // MPROENGNOTIFYHANDLER2_H
-
-// End of File
-
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/inc/ProEngFactory2.h Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Factory for Profiles Engine Wrapper.
-*
-*/
-
-
-
-#ifndef PROENGFACTORY2_H
-#define PROENGFACTORY2_H
-
-// INCLUDES
-#include <ProEngFactory.h>
-
-// FORWARD DECLARATIONS
-
-class MProEngNotifyHandler2;
-
-// CLASS DECLARATION
-
-/**
-* Factory for Profiles Engine Wrapper.
-* You can create new instances of Profiles Engines, Notification Handlers and
-* Alert Tone Seekers by using this factory.<br><br>
-* Example:
-* @code
-* // Create a new instance of Profiles Engine:
-* MProEngEngine* engine =
-* ProEngFactory2::NewEngineLC();
-*
-* // Create a new instance of Notification Handler:
-* MProEngNotifyHandler* notifyHandler =
-* ProEngFactory2::NewNotifyHandlerL();
-*
-* // Create a new instance of Alert Tone Seeker:
-* MProEngAlertToneSeeker* toneSeeker =
-* ProEngFactory2::NewAlertToneSeekerL();
-* @endcode
-*
-* @lib ProfileEngine.lib
-* @since 10.1
-*/
-class ProEngFactory2 : public ProEngFactory
- {
- public: // New functions
- /**
- * Create a new instance of Profiles Notification Handler 2.
- * @since 10.1
- * @return New instance of Notification Handler.
- * Ownership is transferred to the client application.
- */
- IMPORT_C static MProEngNotifyHandler2* NewNotifyHandler2L();
-
- private:
-
- // Prohibit C++ default constructor.
- ProEngFactory2();
- // Prohibit Destructor.
- ~ProEngFactory2();
-
- };
-
-#endif // PROENGFACTORY2_H
-
-// End of File
-
--- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI_DoxyFile.txt Tue May 25 04:13:06 2010 +0800
+++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group/ProEngWrapAPI_DoxyFile.txt Thu Jun 10 16:03:48 2010 +0800
@@ -11,7 +11,7 @@
*
* Contributors:
*
-* Description: ?Description
+* Description: ?Description
*
*/
--- a/profilesservices/ProfileEngine/BWINS/PROFILEENGINEU.DEF Tue May 25 04:13:06 2010 +0800
+++ b/profilesservices/ProfileEngine/BWINS/PROFILEENGINEU.DEF Thu Jun 10 16:03:48 2010 +0800
@@ -5,5 +5,4 @@
?NewEngineLC@ProEngFactory@@SAPAVMProEngEngine@@AAVRFs@@@Z @ 4 NONAME ; class MProEngEngine * ProEngFactory::NewEngineLC(class RFs &)
?NewEngineLC@ProEngFactory@@SAPAVMProEngEngine@@XZ @ 5 NONAME ; class MProEngEngine * ProEngFactory::NewEngineLC(void)
?NewNotifyHandlerL@ProEngFactory@@SAPAVMProEngNotifyHandler@@XZ @ 6 NONAME ; class MProEngNotifyHandler * ProEngFactory::NewNotifyHandlerL(void)
- ?NewNotifyHandler2L@ProEngFactory2@@SAPAVMProEngNotifyHandler2@@XZ @ 7 NONAME ; class MProEngNotifyHandler2 * ProEngFactory2::NewNotifyHandler2L(void)
--- a/profilesservices/ProfileEngine/EABI/ProfileEngineU.DEF Tue May 25 04:13:06 2010 +0800
+++ b/profilesservices/ProfileEngine/EABI/ProfileEngineU.DEF Thu Jun 10 16:03:48 2010 +0800
@@ -5,5 +5,4 @@
_ZN13ProEngFactory11NewEngineLCEv @ 4 NONAME
_ZN13ProEngFactory17NewNotifyHandlerLEv @ 5 NONAME
_ZN13ProEngFactory19NewAlertToneSeekerLEv @ 6 NONAME
- _ZN14ProEngFactory218NewNotifyHandler2LEv @ 7 NONAME
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngActiveSettingsEventDelegate.cpp Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of CProEngActiveSettingsEventDelegate
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "CProEngActiveSettingsEventDelegate.h"
-#include <MProEngActiveSettingsObserver.h>
-
-namespace
- {
- // CONSTANTS
- const TInt KProEngActiveId( 0x7E000000 );
- const TUint32 KProEngProfileIdMask( 0xFF000000 );
- }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CProEngActiveSettingsEventDelegate::CProEngActiveSettingsEventDelegate
-// -----------------------------------------------------------------------------
-//
-CProEngActiveSettingsEventDelegate::CProEngActiveSettingsEventDelegate(
- TUint32 aPartialCenRepKey,
- TUint32 aKeyMask,
- MProEngActiveSettingsObserver& aObserver )
- : CProEngCenRepObserverBase( aPartialCenRepKey, aKeyMask ),
- iObserver( aObserver )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CProEngActiveSettingsEventDelegate::NewL
-// -----------------------------------------------------------------------------
-//
-CProEngActiveSettingsEventDelegate* CProEngActiveSettingsEventDelegate::NewL(
- MProEngActiveSettingsObserver& aObserver )
- {
- CProEngActiveSettingsEventDelegate* self = new ( ELeave )
- CProEngActiveSettingsEventDelegate( KProEngActiveId,
- KProEngProfileIdMask, aObserver );
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
-
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CProEngActiveSettingsEventDelegate::NotifyObserverL
-// -----------------------------------------------------------------------------
-//
-void CProEngActiveSettingsEventDelegate::NotifyObserverL()
- {
- iObserver.HandleActiveSettingsModifiedL( );
- }
-
-// -----------------------------------------------------------------------------
-// CProEngActiveSettingsEventDelegate::NotifyError
-// -----------------------------------------------------------------------------
-//
-void CProEngActiveSettingsEventDelegate::NotifyError( TInt aError )
- {
- iObserver.HandleActiveSettingsNotificationError( aError );
- }
-
-// End of File
-
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngActiveSettingsEventDelegate.h Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Delegate notifications about active settings modifications
-* to the observer.
-*
-*/
-
-
-
-#ifndef CPROENGACTIVESETTINGSEVENTDELEGATE_H
-#define CPROENGACTIVESETTINGSEVENTDELEGATE_H
-
-// INCLUDES
-#include "CProEngCenRepObserverBase.h"
-
-// FORWARD DECLARATIONS
-class MProEngActiveSettingsObserver;
-
-// CLASS DECLARATION
-
-/**
-* This class delegates notifications about active profile settings modifications to the observer
-* implemented by the client of Profiles Engine Wrapper API. This is a helper
-* class for CProEngNotifyHandlerImpl.
-*
-* @lib ProfileEngine.lib
-* @since 10.1
-*/
-NONSHARABLE_CLASS( CProEngActiveSettingsEventDelegate )
- : public CProEngCenRepObserverBase
- {
- public: // constructor and destructor
-
- static CProEngActiveSettingsEventDelegate* NewL(
- MProEngActiveSettingsObserver& aObserver );
-
- virtual ~CProEngActiveSettingsEventDelegate() {};
-
- public: // Functions from base classes
-
- /**
- * From CProEngObserverBase.
- */
- void NotifyObserverL();
-
- /**
- * From CProEngObserverBase.
- */
- void NotifyError( TInt aError );
-
-
- public: // New functions
-
- private: // constructor
-
- CProEngActiveSettingsEventDelegate( TUint32 aPartialCenRepKey,
- TUint32 aKeyMask,
- MProEngActiveSettingsObserver& aObserver );
-
- private: // Data:
-
- // The client implemented observer for profile modification events:
- MProEngActiveSettingsObserver& iObserver;
-
- };
-
-#endif // CPROENGACTIVESETTINGSEVENTDELEGATE_H
-
-// End of File
-
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngMasterSettingsEventDelegate.cpp Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of CProEngMasterSettingsEventDelegate
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "CProEngMasterSettingsEventDelegate.h"
-#include <MProEngMasterSettingsObserver.h>
-
-namespace
- {
- // CONSTANTS
- const TInt KProEngMasterSettingsPartialKey( 0x80000200 );
- const TUint32 KProEngMasterSettingsMask( 0xFFFFFF00 );
- }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CProEngMasterSettingsEventDelegate::CProEngMasterSettingsEventDelegate
-// -----------------------------------------------------------------------------
-//
-CProEngMasterSettingsEventDelegate::CProEngMasterSettingsEventDelegate(
- TUint32 aPartialCenRepKey,
- TUint32 aKeyMask,
- MProEngMasterSettingsObserver& aObserver )
- : CProEngCenRepObserverBase( aPartialCenRepKey, aKeyMask ),
- iObserver( aObserver )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CProEngMasterSettingsEventDelegate::NewL
-// -----------------------------------------------------------------------------
-//
-CProEngMasterSettingsEventDelegate* CProEngMasterSettingsEventDelegate::NewL(
- MProEngMasterSettingsObserver& aObserver )
- {
- CProEngMasterSettingsEventDelegate* self = new ( ELeave )
- CProEngMasterSettingsEventDelegate( KProEngMasterSettingsPartialKey,
- KProEngMasterSettingsMask, aObserver );
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
-
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CProEngMasterSettingsEventDelegate::NotifyObserverL
-// -----------------------------------------------------------------------------
-//
-void CProEngMasterSettingsEventDelegate::NotifyObserverL()
- {
- iObserver.HandleMasterSettingsModifiedL( );
- }
-
-// -----------------------------------------------------------------------------
-// CProEngMasterSettingsEventDelegate::NotifyError
-// -----------------------------------------------------------------------------
-//
-void CProEngMasterSettingsEventDelegate::NotifyError( TInt aError )
- {
- iObserver.HandleMasterSettingsNotificationError( aError );
- }
-
-// End of File
-
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngMasterSettingsEventDelegate.h Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Delegate notifications about master settings modifications
-* to the observer.
-*
-*/
-
-
-
-#ifndef CPROENGMASTERSETTINGSEVENTDELEGATE_H
-#define CPROENGMASTERSETTINGSEVENTDELEGATE_H
-
-// INCLUDES
-#include "CProEngCenRepObserverBase.h"
-
-// FORWARD DECLARATIONS
-class MProEngMasterSettingsObserver;
-
-// CLASS DECLARATION
-
-/**
-* This class delegates notifications about master settings modifications to the observer
-* implemented by the client of Profiles Engine Wrapper API. This is a helper
-* class for CProEngNotifyHandlerImpl.
-*
-* @lib ProfileEngine.lib
-* @since 10.1
-*/
-NONSHARABLE_CLASS( CProEngMasterSettingsEventDelegate )
- : public CProEngCenRepObserverBase
- {
- public: // constructor and destructor
-
- static CProEngMasterSettingsEventDelegate* NewL(
- MProEngMasterSettingsObserver& aObserver );
-
- virtual ~CProEngMasterSettingsEventDelegate() {};
-
- public: // Functions from base classes
-
- /**
- * From CProEngObserverBase.
- */
- void NotifyObserverL();
-
- /**
- * From CProEngObserverBase.
- */
- void NotifyError( TInt aError );
-
-
- public: // New functions
-
- private: // constructor
-
- CProEngMasterSettingsEventDelegate( TUint32 aPartialCenRepKey,
- TUint32 aKeyMask,
- MProEngMasterSettingsObserver& aObserver );
-
- private: // Data:
-
- // The client implemented observer for profile modification events:
- MProEngMasterSettingsObserver& iObserver;
-
- };
-
-#endif // CPROENGMASTERSETTINGSEVENTDELEGATE_H
-
-// End of File
-
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.cpp Tue May 25 04:13:06 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.cpp Thu Jun 10 16:03:48 2010 +0800
@@ -30,8 +30,7 @@
#include <MProEngProfileNameArrayObserver.h>
#include <ProfileEngineConstants.h>
#include <ProfileEnginePrivatePSKeys.h>
-#include "CProEngActiveSettingsEventDelegate.h"
-#include "CProEngMasterSettingsEventDelegate.h"
+
// ============================= LOCAL FUNCTIONS ===============================
@@ -57,9 +56,7 @@
CProEngNotifyHandlerImpl::CProEngNotifyHandlerImpl() :
iActiveIdEventDelegate( NULL ),
iActiveProfileEventDelegate( NULL ),
- iNameArrayEventDelegate( NULL ),
- iActiveSettingEventDelegate( NULL ),
- iMasterSettingEventDelegate( NULL )
+ iNameArrayEventDelegate( NULL )
{
}
@@ -200,60 +197,6 @@
return result;
}
-
-// -----------------------------------------------------------------------------
-// CProEngNotifyHandlerImpl::RequestActiveSettingsNotificationsL
-// -----------------------------------------------------------------------------
-//
-TInt CProEngNotifyHandlerImpl::RequestActiveSettingsNotificationsL(
- MProEngActiveSettingsObserver &aObserver )
- {
- if( iActiveSettingEventDelegate )
- {
- return KErrAlreadyExists;
- }
-
- iActiveSettingEventDelegate = CProEngActiveSettingsEventDelegate::NewL(
- aObserver );
-
- // make the actual request to the Central Repository:
- TInt result( iActiveSettingEventDelegate->RequestNotification() );
- if( result != KErrNone )
- {
- delete iActiveSettingEventDelegate;
- iActiveSettingEventDelegate = NULL;
- }
-
- return result;
- }
-
-// -----------------------------------------------------------------------------
-// CProEngNotifyHandlerImpl::RequestMasterSettingsNotificationsL
-// -----------------------------------------------------------------------------
-//
-TInt CProEngNotifyHandlerImpl::RequestMasterSettingsNotificationsL(
- MProEngMasterSettingsObserver &aObserver )
- {
- if( iMasterSettingEventDelegate )
- {
- return KErrAlreadyExists;
- }
-
- iMasterSettingEventDelegate = CProEngMasterSettingsEventDelegate::NewL(
- aObserver );
-
- // make the actual request to the Central Repository:
- TInt result( iMasterSettingEventDelegate->RequestNotification() );
- if( result != KErrNone )
- {
- delete iMasterSettingEventDelegate;
- iMasterSettingEventDelegate = NULL;
- }
-
- return result;
- }
-
-
// -----------------------------------------------------------------------------
// CProEngNotifyHandlerImpl::CancelProfileActivationNotifications
// -----------------------------------------------------------------------------
@@ -316,35 +259,6 @@
}
}
-
-// -----------------------------------------------------------------------------
-// CProEngNotifyHandlerImpl::CancelActiveSettingsNotificationsL
-// -----------------------------------------------------------------------------
-//
-void CProEngNotifyHandlerImpl::CancelActiveSettingsNotificationsL()
- {
- if( iActiveSettingEventDelegate )
- {
- iActiveSettingEventDelegate->Cancel();
- delete iActiveSettingEventDelegate;
- iActiveSettingEventDelegate = NULL;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CProEngNotifyHandlerImpl::CancelMasterSettingsNotificationsL
-// -----------------------------------------------------------------------------
-//
-void CProEngNotifyHandlerImpl::CancelMasterSettingsNotificationsL()
- {
- if( iMasterSettingEventDelegate )
- {
- iMasterSettingEventDelegate->Cancel();
- delete iMasterSettingEventDelegate;
- iMasterSettingEventDelegate = NULL;
- }
- }
-
// -----------------------------------------------------------------------------
// CProEngNotifyHandlerImpl::CancelAll
// -----------------------------------------------------------------------------
@@ -354,9 +268,6 @@
CancelProfileActivationNotifications();
CancelActiveProfileNotifications();
CancelProfileNameArrayNotifications();
- CancelActiveSettingsNotificationsL();
- CancelMasterSettingsNotificationsL();
-
TInt count = iProfileEventDelegates.Count();
for( TInt i( 0 ); i<count; ++i )
{
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h Tue May 25 04:13:06 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngNotifyHandlerImpl.h Thu Jun 10 16:03:48 2010 +0800
@@ -21,7 +21,7 @@
#define CPROENGNOTIFYHANDLERIMPL_H
// INCLUDES
-#include <MProEngNotifyHandler2.h>
+#include <MProEngNotifyHandler.h>
#include <e32base.h>
// FORWARD DECLARATIONS
@@ -29,8 +29,6 @@
class CProEngActiveProfileDelegate;
class CProEngProfileNameArrayEventDelegate;
class CProEngProfileEventDelegate;
-class CProEngActiveSettingsEventDelegate;
-class CProEngMasterSettingsEventDelegate;
// CLASS DECLARATION
@@ -41,7 +39,7 @@
* @since 3.1
*/
NONSHARABLE_CLASS( CProEngNotifyHandlerImpl ) : public CBase,
- public MProEngNotifyHandler2
+ public MProEngNotifyHandler
{
public: // Constructors and destructor
@@ -83,18 +81,6 @@
MProEngProfileNameArrayObserver& aObserver );
/**
- * From MProEngNotifyHandler2
- */
- virtual TInt RequestActiveSettingsNotificationsL(
- MProEngActiveSettingsObserver &aObserver );
-
- /**
- * From MProEngNotifyHandler2
- */
- virtual TInt RequestMasterSettingsNotificationsL(
- MProEngMasterSettingsObserver &aObserver );
-
- /**
* From MProEngNotifyHandler
*/
void CancelProfileActivationNotifications();
@@ -115,20 +101,9 @@
void CancelProfileNameArrayNotifications();
/**
- * From MProEngNotifyHandler2
- */
- virtual void CancelActiveSettingsNotificationsL();
-
- /**
- * From MProEngNotifyHandler2
- */
- virtual void CancelMasterSettingsNotificationsL();
-
- /**
* From MProEngNotifyHandler
*/
void CancelAll();
-
private:
@@ -150,12 +125,6 @@
// Own: Array of profile change observers
RPointerArray< CProEngProfileEventDelegate > iProfileEventDelegates;
-
- // Own: Delegate for active settings modification events
- CProEngActiveSettingsEventDelegate *iActiveSettingEventDelegate;
-
- // Own: Delegate for master settings modification events
- CProEngMasterSettingsEventDelegate *iMasterSettingEventDelegate;
};
--- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandlerDrmFull.cpp Tue May 25 04:13:06 2010 +0800
+++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandlerDrmFull.cpp Thu Jun 10 16:03:48 2010 +0800
@@ -24,8 +24,6 @@
#include <DRMCommon.h>
#include <ProEngWrapper.rsg>
-#include <caf/caf.h>
-
// ============================ LOCAL FUNCTIONS ================================
--- a/profilesservices/ProfileEngine/WrapperSrc/ProEngFactory2.cpp Tue May 25 04:13:06 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of the ProEngFactory2.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <ProEngFactory2.h>
-#include "CProEngNotifyHandlerImpl.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// ProEngFactory::NewNotifyHandlerL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C MProEngNotifyHandler2* ProEngFactory2::NewNotifyHandler2L()
- {
- return CProEngNotifyHandlerImpl::NewL();
- }
-
-// End of File
-
--- a/profilesservices/ProfileEngine/group/ProfileEngine.mmp Tue May 25 04:13:06 2010 +0800
+++ b/profilesservices/ProfileEngine/group/ProfileEngine.mmp Thu Jun 10 16:03:48 2010 +0800
@@ -51,9 +51,6 @@
SOURCE CProEngPostFilter.cpp
SOURCE ProEngFactory.cpp
SOURCE ProEngMmfInfoUtility.cpp
-SOURCE CProEngActiveSettingsEventDelegate.cpp
-SOURCE CProEngMasterSettingsEventDelegate.cpp
-SOURCE ProEngFactory2.cpp
START RESOURCE ProEngWrapper.rss
HEADER
@@ -66,6 +63,7 @@
USERINCLUDE ../EngInc
MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
LIBRARY bafl.lib
LIBRARY euser.lib