--- a/smf/smfservermodule/smfserver/server/smfserver.h	Tue May 18 17:37:12 2010 +0530
+++ b/smf/smfservermodule/smfserver/server/smfserver.h	Fri May 21 15:45:10 2010 +0100
@@ -72,7 +72,7 @@
    *simply return
    *else
    *it'll start the server exe and initialize all other SMF components
-   *returns whether server is started successfully or not  
+   *returns whether server is started successfully or not  
    */
   bool startServer();
   
@@ -84,7 +84,7 @@
    * been authorized previously.
    * SmfClientAuthID may be same as SID of the client which can be retrieved
    * if using Symbian Client-Server private implementation. Not supported for
-   * other platforms
+   * other platforms
    */
   bool isClientAuthorized(SmfClientAuthID clientID);
   
@@ -94,35 +94,35 @@
    * The SLOT clientAuthorizationFinished is called once its done.
    * SmfClientAuthID may be same as SID of the client which can be retrieved
    * if using Symbian Client-Server private implementation. Not supported for
-   * other platforms.
+   * other platforms.
    */
   void authorizeClient(SmfClientAuthID clientID);
   
   /*
    * Requests Plugin Manager to get a list of plugin IDs who implement
    * the interface interfaceID.
-   * This is used got SmfClient::GetServices () where we need a list of plugins
+   * This is used got SmfClient::GetServices () where we need a list of plugins
    */
   void getPlugins(SmfInterfaceID interfaceID, QMap<SmfPluginID,SmfProvider>& pluginIDMap);
   /**
    * Same as above, except this is used for rest of the requests where we need
-   * a particular plugin
+   * a particular plugin
    */
   SmfPluginID getPlugin(SmfInterfaceID interfaceID,SmfProvider provider);
   
   /*
    * Requests the Credential Manager to filter out non-authorized plugin IDs
-   * from the list and get authorized plugins into authList. 
+   * from the list and get authorized plugins into authList. 
    */
   void getAuthorizedPlugins(QList<SmfPluginID>& list,QList<SmfPluginID>& authList);
   
   /*
    * Prepares the transport.
-   * What it'll do is not yet clear
+   * What it'll do is not yet clear
    */
   void prepareTransport();
   /**
-   * DEbugging purpose only
+   * DEbugging purpose only
    */
   void writeLog(QString log) const;
   /*
@@ -136,21 +136,17 @@
    * Note:- Should there be an overloaded function which takes
    * list of SmfPluginID ?
    * Note:- SmfPluginManager will invoke resultsAvailable on session object once
-   * it receives parsed data.
+   * it receives parsed data.
    */
-#ifdef Q_OS_SYMBIAN
   /**
    * Request the Plugin manager to get the data.
    * @param requestID Corresponds to a client's session
    * @param pluginID Plugin for which the request is intended
    * @param interfaceID Interface name
    * @param dataForPlugin Data to be sent for this request
-   * 
+   * 
    */
   void getRequestedData(int requestID,SmfPluginID pluginID,SmfInterfaceID interfaceID, SmfRequestTypeID requestTypeID,QByteArray dataForPlugin = QByteArray());
-#else
-  void getRequestedData(SmfServerQtSession* session,SmfPluginID pluginID, SmfRequestTypeID requestTypeID);
-#endif
   
 public slots:
 
@@ -158,7 +154,7 @@
 	 * This slot is called when Credential Manager is done with the autherizing
 	 * the client for the first time. See isClientAuthorized() and authorizeClient().
 	 * success specifies the success of the authorization, authID is the authentication
-	 * ID in case its not same as SID of the client.
+	 * ID in case its not same as SID of the client.
 	 */
 	void clientAuthorizationFinished(bool success,SmfClientAuthID authID );
 
@@ -166,20 +162,20 @@
 	 * This slot is called as a result of trigger from Plugin manager when the 
 	 * parsed data is available.
 	 * @param requestID The request ID for which result is available
-	 * @param parsedData Serialized data
+	 * @param parsedData Serialized data
 	 */
 	void resultsAvailable(int requestID,QByteArray* parsedData,SmfError error);
 
 	/*
 	 * Services the client request by sending the requested data.
-	 * Note:- This will be handled by private implementation.
+	 * Note:- This will be handled by private implementation.
 	 */
 	void serviceClient(QByteArray* parsedData);
 	
 	
 	/*
 	 * This slot is called for every cleanup timer expiry, in this slot, we need
-	 * to call SmfDataStoreManager's API to refresh data store
+	 * to call SmfDataStoreManager's API to refresh data store
 	 */
 	void timerExpired(){};
 	
@@ -187,25 +183,25 @@
 	 * This method is called every time timerExpired slot is trigerred
 	 * Fetches the last saved requests through Transport Manager and Plugin Manager
 	 * Who will save the last request (Tranport Manager or Data Store Manager) TBD later
-	 * 
+	 * 
 	 */
 	void runSavedRequest(){};
 	
 	/*
 	 * This slot is called when the data store updates are available as a result of
 	 * "runSavedRequest()".
-	 * Note:- The "10.4.1.11	updateDatastore" can be merged with this 
+	 * Note:- The "10.4.1.11	updateDatastore" can be merged with this 
 	 */
 	void dataStoreUpdateAvailable(QByteArray* respData){Q_UNUSED(respData)};
 	
 	/**
-	 * Request the CM to get the authentication keys for the given pluginID
+	 * Request the CM to get the authentication keys for the given pluginID
 	 */
 	void getAuthenticationKeys(int pluginID,QStringList& keys,QStringList& urls);
 	
 	/**
 	 * Server calls this method when it receives message from the CM
-	 * that authentication keys for the pluginID has expired
+	 * that authentication keys for the pluginID has expired
 	 */
 	void authenticationKeysExpired(NotificationType type,SmfPluginID id);
 signals:
@@ -213,7 +209,7 @@
 private:
 /*
  * Starts the clean-up timer for data store refresh, called from the "startServer()"
- * timeOutValue should be picked out from SmfSettingsAuthManager's API
+ * timeOutValue should be picked out from SmfSettingsAuthManager's API
  */
 bool startCleanupTimer(int timeOutValue){Q_UNUSED(timeOutValue) return true;};