--- a/javaextensions/pim/framework/inc.s60/cpimmanager.h Wed Sep 15 12:05:25 2010 +0300
+++ b/javaextensions/pim/framework/inc.s60/cpimmanager.h Wed Oct 13 14:23:59 2010 +0300
@@ -43,7 +43,6 @@
class CPIMEventValidator;
class CPIMToDoValidator;
class MPIMAdapterAccess;
-class CCalSession;
// CLASS DECLARATION
@@ -78,7 +77,6 @@
* Destructor.
*/
virtual ~CPIMManager();
- void DeleteSessions();
public: // New functions
@@ -115,8 +113,6 @@
* @param aPimListName Name of the list. The name must be valid list
* name. If not present, name is resolved to the default list
* of the given type.
- * @param aCalName Name of the Canlendar. The name must be valid Canlendar
- * name. If not present, name is resolved to the default Canlendar.
*
* @return PIM list. Type of the list corresponds to
* \a aPimListType argument.
@@ -134,7 +130,6 @@
pimbaselist* openPimList(
const TPIMListType& aPimListType,
jstring aPimListName,
- jstring aCalName,
JNIEnv* aJniEnv);
/**
@@ -154,48 +149,6 @@
const TPIMListType& aPimListType,
jintArray aError,
JNIEnv* aJniEnv);
- /**
- * Lists list of Calendars existsing the mobile database.
- *
- * @return Array of list names.
- * Caller takes the ownership of the returned object.
- *
- */
- jobjectArray listCalendars(jintArray aError, JNIEnv* aJniEnv);
-
- /**
- * Lists list of Calendars names existsing the mobile database.
- *
- * @return Array of list names.
- * Caller takes the ownership of the returned object.
- */
- jobjectArray listCalendarNames(jintArray aError, JNIEnv* aJniEnv);
-
- /**
- * create new calendar which you given name.
- *
- * @param calendar name Sting type this is used as filename.
- *
- * @param calendar name Sting type this is used as diaplay to the user.
- *
- * @return void.
- *
- * @par Leaving:
- * @li \c KErrArgument - \if name already exists
- */
- void createCalendar(jstring aCalName, jstring aDisplayName, JNIEnv* aJniEnv);
-
- /**
- * delete the calendar which you given name.
- *
- * @param calendar name Sting type this is used as canlader filename
- * which it will delete.
- * @return void.
- *
- * @par Leaving:
- * @li \c KErrArgument - \a calendar name is not valid or not exists.
- */
- void deleteCalendar(jstring aCalName, JNIEnv* aJniEnv);
/**
* Provides a Contact validator.
@@ -234,102 +187,28 @@
* @return A new list or NULL if no matching list was found.
*/
CPIMEventList* DoOpenEventListL(
- const TDesC* aListName, const TDesC* aCalName);
+ const TDesC* aListName);
/**
* Opens a to-do list.
*
* @param aListName Name of the list or NULL to indicate
* default list.
- * @param aCalName Name of the calendar or NULL to indicate
- * default calendar.
- * @return A new list or NULL if no matching list and calendar was found.
+ *
+ * @return A new list or NULL if no matching list was found.
*/
- CPIMToDoList* DoOpenToDoListL(const TDesC* aListName, const TDesC* aCalName);
-
+ CPIMToDoList* DoOpenToDoListL(
+ const TDesC* aListName);
- /**
- * Opens a to-do list.
- *
- * @param aPimListType Name of the list or NULL to indicate
- * default list.
- * @return A new list or NULL if no matching list and calendar was found.
- */
- CDesCArray* CPIMManager::DoListPimListsL(
+ CDesCArray* DoListPimListsL(
const TPIMListType& aPimListType);
- /**
- * list all the calendars this function will call by ListCalendars function
- *
- * @return void.
- */
- void CPIMManager::DoListCalendarsL();
-
- /**
- * list all the calendars names this function will call by ListCalendatNames function
- *
- * @return void.
- */
- void CPIMManager::DoListCalendarNamesL();
-
-
- /**
- * creates the new calendar by given name.
- *
- * @param aFileName name of the calendar file this is string type.
- *
- * @param aDisplayName name of the calendar to display this is string type
- *
- * @return void.
- */
- void CPIMManager::DoCreateCalFileL(const TDesC &aFileName,const TDesC &aDisplayName);
-
- /**
- * delets the calendar by given name.
- *
- * @param aFileName name of the calendar file this is string type.
- *
- * @return void.
- */
- void CPIMManager::DoDeleteCalFileL(const TDesC& aFileName);
-
- /**
- * Opens a PIM list of given type.
- *
- * @param aPimListType List type.
- * @param aPimListName Name of the list. The name must be valid list
- * name. If not present, name is resolved to the default list
- * of the given type.
- * @param aCalName Name of the Canlendar. The name must be valid Canlendar
- * name. If not present, name is resolved to the default Canlendar.
- *
- * @return PIM list. Type of the list corresponds to
- * \a aPimListType argument.
- *
- * @par Leaving:
- * The method leaves on error. Error codes should be interpreted as
- * follows:
- * @li \c KErrArgument - \a aPimListType is invalid.
- * @li \c KErrNotSupported - \a aPimListType is not supported.
- * @li \c KErrNotFound - No list was found by \a aPimListName.
- * @li \c KErrAlreadyExists - The list was already opened and multiple
- * instances of the list are not supported.
- * @li Other - Internal error.
- */
- pimbaselist* CPIMManager::DoOpenPimListL(
+ pimbaselist* DoOpenPimListL(
const TPIMListType& aPimListType,
- const TDesC* aPimListName,
- const TDesC* aCalName);
- /**
- * this method will create the Sessions with every calendar using file server.
- *
- */
-
- void CPIMManager::createCalSessionL();
+ const TDesC* aPimListName);
void dispose();
-
private: // Constructors
/**
@@ -361,23 +240,6 @@
/** Owned. */
CPIMToDoValidator* iToDoValidator;
- /** (Owned.) */
- RLibrary iLocalizationLibrary;
-
- CDesCArray* iCalList;
- /** Session to calendar server. Owned. */
- //CCalSession* iCalSession;
-
- RPointerArray<CCalSession> iCalSessions;
-
- CDesCArray* iCalendarNamesDesCArray;
-
- CDesCArray* iCalSessionArray;
-
- CDesCArray* iCalListName;
- CDesCArrayFlat* iDesCArray;
- CCalSession* iCalSession;
-
};