Mercurial Mercurial > oss > FCL > sf > incubator > python / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/misc/pys60-fix-3rded-sdk.diff
author Vijayan <ts.vijayan@nokia.com>
Tue, 16 Feb 2010 10:07:05 +0530
changeset 0 ca70ae20a155
permissions -rw-r--r--
Base Python2.0 code
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     1
 
diff -u include_pristine/apaserverapp.h include/apaserverapp.h
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     2
 
--- include_pristine/apaserverapp.h	2006-07-03 18:21:52.162351600 +0300
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     3
 
+++ include/apaserverapp.h	2006-07-03 19:21:46.121331300 +0300
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     4
 
@@ -97,11 +97,14 @@
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     5
 
 	a command ID from the UI if exit was triggered from the UI, or an error code
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     6
 
 	if the server app exited unexpectedly. */
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     7
 
 	virtual void HandleServerAppExit(TInt aReason) = 0;
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     8
 
+
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
     9
 
 protected:
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    10
 
-	IMPORT_C MApaServerAppExitObserver();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    11
 
+  //XXX PyS60 mod
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    12
 
+	//IMPORT_C MApaServerAppExitObserver();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    13
 
 private:
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    14
 
-	IMPORT_C virtual void MApaServerAppExitObserver_Reserved1();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    15
 
-	IMPORT_C virtual void MApaServerAppExitObserver_Reserved2();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    16
 
+  //XXX PyS60 mod
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    17
 
+	//IMPORT_C virtual void MApaServerAppExitObserver_Reserved1();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    18
 
+	//IMPORT_C virtual void MApaServerAppExitObserver_Reserved2();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    19
 
 private:
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    20
 
 	TInt iMApaServerAppExitObserver_Reserved1;
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    21
 
 	};
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    22
 
diff -u include_pristine/apparc.h include/apparc.h
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    23
 
--- include_pristine/apparc.h	2006-07-03 18:21:52.212422600 +0300
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    24
 
+++ include/apparc.h	2006-07-03 19:24:05.671734700 +0300
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    25
 
@@ -583,8 +583,9 @@
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    26
 
 protected:
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    27
 
 	IMPORT_C MApaEmbeddedDocObserver();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    28
 
 private:
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    29
 
-	IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved1();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    30
 
-	IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved2();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    31
 
+	// XXX PyS60 mod
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    32
 
+	//IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved1();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    33
 
+	//IMPORT_C virtual void MApaEmbeddedDocObserver_Reserved2();
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    34
 
 private:
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    35
 
 	TInt iMApaEmbeddedDocObserver_Reserved1;
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    36
 
 	};
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    37
 
diff -u include_pristine/e32def.h include/e32def.h
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    38
 
--- include_pristine/e32def.h	2006-07-03 18:21:54.065049600 +0300
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    39
 
+++ include/e32def.h	2006-07-03 18:22:43.134629600 +0300
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    40
 
@@ -2703,7 +2703,9 @@
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    41
 
 /**
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    42
 
 @internalComponent
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    43
 
 */
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    44
 
+#if defined(__cplusplus)
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    45
 
 static const char* const KSuppressPlatSecDiagnosticMagicValue = (const char*)1;
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    46
 
+#endif
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    47
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    48
 
 #ifndef __REMOVE_PLATSEC_DIAGNOSTIC_STRINGS__
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    49
 
 /**
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    50
 
@@ -2766,7 +2768,10 @@
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    51
 
 @publishedPartner
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    52
 
 @released
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    53
 
 */
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    54
 
+
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    55
 
+#if defined(__cplusplus)
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    56
 
 static const char* const KSuppressPlatSecDiagnostic = KSuppressPlatSecDiagnosticMagicValue;
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    57
 
+#endif
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    58
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    59
 
 #else /* __REMOVE_PLATSEC_DIAGNOSTIC_STRINGS__ */
ca70ae20a155 Base Python2.0 code
Vijayan <ts.vijayan@nokia.com>
parents:
diff changeset 
    60
FCL/sf/incubator/python