Merge in properly updated header

3 files changed, 58 insertions, 50 deletions

diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver_p.h b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver_p.h
index 55c9cf8d67..03b2015a90 100644
--- a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver_p.h
+++ b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver_p.h
@@ -1,43 +1,43 @@
 /****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+ **
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ ** All rights reserved.
+ ** Contact: Nokia Corporation (qt-info@nokia.com)
+ **
+ ** This file is part of the Qt Mobility Components.
+ **
+ ** $QT_BEGIN_LICENSE:LGPL$
+ ** No Commercial Usage
+ ** This file contains pre-release code and may not be distributed.
+ ** You may use this file in accordance with the terms and conditions
+ ** contained in the Technology Preview License Agreement accompanying
+ ** this package.
+ **
+ ** GNU Lesser General Public License Usage
+ ** Alternatively, this file may be used under the terms of the GNU Lesser
+ ** General Public License version 2.1 as published by the Free Software
+ ** Foundation and appearing in the file LICENSE.LGPL included in the
+ ** packaging of this file.  Please review the following information to
+ ** ensure the GNU Lesser General Public License version 2.1 requirements
+ ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ **
+ ** In addition, as a special exception, Nokia gives you certain additional
+ ** rights.  These rights are described in the Nokia Qt LGPL Exception
+ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ **
+ ** If you have questions regarding the use of this file, please contact
+ ** Nokia at qt-info@nokia.com.
+ **
+ **
+ **
+ **
+ **
+ **
+ **
+ **
+ ** $QT_END_LICENSE$
+ **
+ ****************************************************************************/
 #ifndef PSPATHMAPPERSERVER_H
 #define PSPATHMAPPERSERVER_H
 
@@ -50,21 +50,28 @@ QTM_BEGIN_NAMESPACE
 // needed for creating server thread.
 const TUint KDefaultHeapSize = 0x10000;
 
-class CPSPathMapperServer : public CServer2
+class CPSPathMapperServer: public CServer2
 {
-    public:
-        CPSPathMapperServer();
-        CSession2 *NewSessionL(const TVersion &aVersion, const RMessage2 &aMessage) const;
+public:
+    CPSPathMapperServer();
+    CSession2 *NewSessionL(const TVersion &aVersion, const RMessage2 &aMessage) const;
 
-    public:
-        static void PanicServer(TPSPathMapperServerPanic aPanic);
+public:
+    static void PanicServer(TPSPathMapperServerPanic aPanic);
 
-    private:
-        PathMapper iPathMapper;
+    void IncreaseSessions();
+    void DecreaseSessions();
+
+    void Shutdown();
+
+private:
+    static const TInt timeoutInterval;
+    int iSessionCount;
+    CPeriodic *iPeriodic;
+    PathMapper iPathMapper;
 };
 
 QTM_END_NAMESPACE
 
 #endif  //PSPATHMAPPERSERVER_H
-
 // End of File
diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp
index e6905fc1ef..c3ee61d62c 100644
--- a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp
+++ b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp
@@ -43,7 +43,7 @@
 #include "pspathmappersession_p.h"
 #include "pspathmapperserver.pan"
 #include "pathmapper_symbian_p.h"
-#include "pspathmapperserver.h"
+#include "pspathmapperserver_p.h"
 #include <QDataStream>
 #include <QSet>
 
diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession_p.h b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession_p.h
index 61221b49f4..b474f501db 100644
--- a/src/publishsubscribe/psmapperserver_symbian/pspathmappersession_p.h
+++ b/src/publishsubscribe/psmapperserver_symbian/pspathmappersession_p.h
@@ -54,7 +54,7 @@ class PathMapper;
 class CPSPathMapperServerSession : public CSession2
 {
 public:
-    CPSPathMapperServerSession(const PathMapper &aPathMapper);
+    CPSPathMapperServerSession(const PathMapper &aPathMapper, CPSPathMapperServer& aServer);
     virtual ~CPSPathMapperServerSession();
 
     void ServiceL(const RMessage2 &aMessage);
@@ -73,6 +73,7 @@ protected:
 private:
     const PathMapper &iPathMapper;
     QByteArray iResultByteArray;
+    CPSPathMapperServer& iServer;
 };
 
 QTM_END_NAMESPACE