diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp --- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp Tue Nov 24 09:02:20 2009 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp Thu Dec 17 09:20:16 2009 +0200 @@ -1,45 +1,22 @@ /* -* ============================================================================== -* Name : BrCtl.cpp -* Part of : WebKit \ BrowserControl -* Description : Implementation of the Browser Control -* Version : 3.1 -* -* Copyright (c) 2006, Nokia Corporation -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: +* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". * -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided with the -* distribution. -* * Neither the name of the Nokia Corporation nor the names of its -* contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: * -* 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 SUHC -* DAMAGE. +* Description: Implementation of the Browser Control * -* Please see file patentlicense.txt for further grants. -* ============================================================================== */ + // INCLUDE FILES -#include +#include #include <../bidi.h> #include #include @@ -55,7 +32,7 @@ #endif #include #include -#include +#include //tot:fixme //#include @@ -91,7 +68,7 @@ #include "WebCursor.h" #include "WebUtil.h" #include "WebCharsetData.h" -#include "HttpCacheManager.h" +#include "httpcachemanager.h" #include "ResourceLoaderDelegate.h" #include "EventHandler.h" #include "timer.h"