Changeset 14720 for S60/trunk/S60WebUi

Timestamp:

06/04/06 13:12:57 (3 years ago)

Author:

brmorris

Message:

2006-06-04 Zalan <zalan.bujtas@nokia.com>

Reviewed by Sachin/Bradley

This commit introduces S60 3.1 support to S60WebKit's
Reindeer UI and WebCore (part 2 of 3).

Location:

S60/trunk/S60WebUi

Files:

• HomePage/src/BookmarkPageGen.cpp (modified) (2 diffs)
• HomePage/src/SettingsPageGen.cpp (modified) (2 diffs)
• WebUi/src/WebUiObserver.cpp (modified) (4 diffs)

S60/trunk/S60WebUi/HomePage/src/BookmarkPageGen.cpp

@@ -193 +193 @@
         }      
    
+#ifdef __WINS__
     // Save the newly created bokmarkpage html page as a file
     RFile pageFile;
@@ -201 +202 @@
         pageFile.Close();
         }
+#endif // __WINS__
 
     CleanupStack::PopAndDestroy(cleanupCount); // fs, templateFile, templateStr, modifiedStr

S60/trunk/S60WebUi/HomePage/src/SettingsPageGen.cpp

@@ -190 +190 @@
         }
       
+#ifdef __WINS__
     // Save the newly created settingspage html page as a file
     RFile pageFile;
@@ -198 +199 @@
         pageFile.Close();
         }
+#endif // __WINS__
 
     // Clean up all memory before we return

S60/trunk/S60WebUi/WebUi/src/WebUiObserver.cpp

@@ -10 +10 @@
 *    All rights reserved.
 *
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *
 *    Please see file patentlicense.txt for further grants.
@@ -59 +59 @@
 #include <genericparam.h>
 #else
-#ifndef __BROWSER_GOS
+#ifndef __BROWSER_SDK
 #include "AiwGenericParam.h"
 #endif
@@ -504 +504 @@
                 break;
                 }
-            }   // end of switch
+            } // end of switch
         }