1 files changed, 10 insertions, 56 deletions

diff --git a/src/gui/s60framework/qs60mainapplication_p.h b/src/gui/s60framework/qs60mainapplication_p.h
index 572bbd3..863d872 100644
--- a/src/gui/s60framework/qs60mainapplication_p.h
+++ b/src/gui/s60framework/qs60mainapplication_p.h
@@ -1,9 +1,10 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -20,10 +21,9 @@
 ** 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.
+** 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.
@@ -46,67 +46,21 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
 //
 // We mean it.
 //
 
-// INCLUDES
-#include <aknapp.h>
-
 #include <qglobal.h>
 
-// CLASS DECLARATION
+#include <apparc.h>
 
 QT_BEGIN_NAMESPACE
 
-CApaApplication* NewApplication();
-
-static TUid ProcessUid()
-{
-    RProcess me;
-    TSecureId securId = me.SecureId();
-    me.Close();
-    return securId.operator TUid();
-}
-
-/**
-* QS60MainApplication application class.
-* Provides factory to create concrete document object.
-* An instance of QS60MainApplication is the application part of the
-* AVKON application framework for the QtS60Main example application.
-*/
-class QS60MainApplication : public CAknApplication
-{
-public: // Functions from base classes
-
-    /**
-     * From CApaApplication, AppDllUid.
-     * @return Application's UID (KUidQtS60MainApp).
-     */
-    TUid AppDllUid() const;
-
-    /**
-     * From CApaApplication, ResourceFileName
-     * @return Application's resource filename (KUidQtS60MainApp).
-     */
-    TFileName ResourceFileName() const;
-
-protected: // Functions from base classes
-
-    /**
-     * From CApaApplication, CreateDocumentL.
-     * Creates QS60MainDocument document object. The returned
-     * pointer in not owned by the QS60MainApplication object.
-     * @return A pointer to the created document object.
-     */
-    CApaDocument* CreateDocumentL();
-};
+CApaApplication *newS60Application();
 
 QT_END_NAMESPACE
 
 #endif // QS60MAINAPPLICATION_P_H
-
-// End of File