--- a/phoneengine/servicehandling/inc/cpeservicehandling.h Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneengine/servicehandling/inc/cpeservicehandling.h Fri Mar 19 09:28:42 2010 +0200
@@ -20,7 +20,9 @@
#define C_PESERVICEHANDLING_H
#include <e32base.h>
-#include <cch.h>
+// <-- QT PHONE START -->
+// #include <cch.h>
+// <-- QT PHONE END -->
#include "mpeservicehandling.h"
class MPEPhoneModelInternal;
@@ -33,29 +35,31 @@
* @since S60 v5.0
*/
NONSHARABLE_CLASS( CPEServiceHandling ): public CBase,
- public MCchServiceStatusObserver,
+// <-- QT PHONE START -->
+ //public MCchServiceStatusObserver,
+// <-- QT PHONE END -->
public MPEServiceHandling
{
- public: // Constructors and destructor
+ public: // Constructors and destructor
- /**
- * Two-phased constructor.
- */
- IMPORT_C static CPEServiceHandling* NewL( MPEPhoneModelInternal& aModel );
+ /**
+ * Two-phased constructor.
+ */
+ IMPORT_C static CPEServiceHandling* NewL( MPEPhoneModelInternal& aModel );
- /**
- * Two-phased constructor.
- */
- IMPORT_C static CPEServiceHandling* NewLC( MPEPhoneModelInternal& aModel );
+ /**
+ * Two-phased constructor.
+ */
+ IMPORT_C static CPEServiceHandling* NewLC( MPEPhoneModelInternal& aModel );
- /**
- * Destructors.
- */
- IMPORT_C virtual ~CPEServiceHandling();
+ /**
+ * Destructors.
+ */
+ IMPORT_C virtual ~CPEServiceHandling();
- public: // from MPEServiceHandling
-
+ public: // from MPEServiceHandling
+
/**
* From MPEServiceHandling.
* Enables service defined by the given identifier.
@@ -65,15 +69,15 @@
*
* @since S60 5.0
* @param aServiceId Identifier of the service.
- */
- void EnableServiceL( TInt aServiceId );
-
+ */
+ void EnableServiceL( TInt aServiceId );
+
/**
* From MPEServiceHandling.
* Cancel current service.
*/
- void CancelServiceEnabling() const;
-
+ void CancelServiceEnabling() const;
+
/**
* From MPEServiceHandling.
* Disable service.
@@ -90,10 +94,12 @@
* @param aType Service type.
* @param aServiceStatus Service status.
*/
- void ServiceStatusChanged( TInt aServiceId,
+ // <-- QT PHONE START -->
+ /*void ServiceStatusChanged( TInt aServiceId,
const TCCHSubserviceType aType,
- const TCchServiceStatus& aServiceStatus );
- private: // Constructors
+ const TCchServiceStatus& aServiceStatus );*/
+ // <-- QT PHONE END -->
+ private: // Constructors
/**
* C++ default constructor.
@@ -104,7 +110,7 @@
* By default Symbian 2nd phase constructor is private.
*/
void ConstructL();
-
+
private: // functions
/**
@@ -114,34 +120,39 @@
* @param aService Service.
* @return Error code.
*/
- TInt EnableServiceIfNeeded( const TCCHSubserviceState& aState,
- CCchService& aService );
+ // <-- QT PHONE START -->
+ /*TInt EnableServiceIfNeeded( const TCCHSubserviceState& aState,
+ CCchService& aService );*/
+
/**
* Sends ServiceHandlingError message to PhoneEngine and saves
* errorcode to member variable.
*
* @param aErrorCode, Cch errorcode.
- */
- void SendErrorMessage( TInt aErrorCode );
+ */
+ //void SendErrorMessage( TInt aErrorCode );
+ // <-- QT PHONE END -->
- private: // data
-
- /**
- * CCH client.
- * Own.
- */
- CCch* iCchClient;
+ private: // data
+
+ /**
+ * CCH client.
+ * Own.
+ */
+ // <-- QT PHONE START -->
+ //CCch* iCchClient;
+ // <-- QT PHONE END -->
- /**
- * PhoneModel.
- * Not own.
- */
- MPEPhoneModelInternal& iModel;
-
- /**
- * Current service identifier.
- */
- TInt iCurrentServiceId;
+ /**
+ * PhoneModel.
+ * Not own.
+ */
+ MPEPhoneModelInternal& iModel;
+
+ /**
+ * Current service identifier.
+ */
+ TInt iCurrentServiceId;
};
#endif // C_PESERVICEHANDLING_H