Commit 844c7450 authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

BUILD FIX (r39641): Fix more silly errors

        Fixes the following compilation errors:

            WebIconDatabase.cpp
            ..\WebIconDatabase.cpp(85) : error C2065: 'standardPrefs' : undeclared identifier
            ..\WebIconDatabase.cpp(85) : error C2227: left of '->iconDatabaseLocation' must point to class/struct/union/generic type
                    type is ''unknown-type''
            ..\WebIconDatabase.cpp(241) : error C2575: 'isEnabled' : only member functions and bases can be virtual
            ..\WebIconDatabase.cpp(248) : error C2575: 'setEnabled' : only member functions and bases can be virtual
            ..\WebIconDatabase.cpp(253) : error C3861: 'shutDownIconDatabase': identifier not found
            ..\WebIconDatabase.cpp(256) : error C3861: 'startUpIconDatabase': identifier not found

        * WebIconDatabase.cpp:
        (WebIconDatabase::startUpIconDatabase): Redeclare standardPrefs
        since this was in init() but not in this method after it was
        extracted from init().
        (isEnabled): Don't use "virtual" in method implementation
        (silly copy-paste error).
        (setEnabled): Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@39645 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9c8d83fe
2009-01-06 David Kilzer <ddkilzer@apple.com>
BUILD FIX (r39641): Fix more silly errors
Fixes the following compilation errors:
WebIconDatabase.cpp
..\WebIconDatabase.cpp(85) : error C2065: 'standardPrefs' : undeclared identifier
..\WebIconDatabase.cpp(85) : error C2227: left of '->iconDatabaseLocation' must point to class/struct/union/generic type
type is ''unknown-type''
..\WebIconDatabase.cpp(241) : error C2575: 'isEnabled' : only member functions and bases can be virtual
..\WebIconDatabase.cpp(248) : error C2575: 'setEnabled' : only member functions and bases can be virtual
..\WebIconDatabase.cpp(253) : error C3861: 'shutDownIconDatabase': identifier not found
..\WebIconDatabase.cpp(256) : error C3861: 'startUpIconDatabase': identifier not found
* WebIconDatabase.cpp:
(WebIconDatabase::startUpIconDatabase): Redeclare standardPrefs
since this was in init() but not in this method after it was
extracted from init().
(isEnabled): Don't use "virtual" in method implementation
(silly copy-paste error).
(setEnabled): Ditto.
2009-01-06 David Kilzer <ddkilzer@apple.com>
BUILD FIX (r39641): Remove STDMETHODCALLTYPE from method declarations in IWebIconDatabase.idl
......
......@@ -79,6 +79,8 @@ void WebIconDatabase::init()
void WebIconDatabase::startUpIconDatabase()
{
WebPreferences* standardPrefs = WebPreferences::sharedStandardPreferences();
iconDatabase()->setClient(this);
BSTR prefDatabasePath = 0;
......@@ -236,14 +238,14 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::iconURLForURL(
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE isEnabled(
HRESULT STDMETHODCALLTYPE isEnabled(
/* [retval][out] */ BOOL *result)
{
*result = iconDatabase()->isEnabled();
return S_OK;
}
virtual HRESULT STDMETHODCALLTYPE setEnabled(
HRESULT STDMETHODCALLTYPE setEnabled(
/* [in] */ BOOL flag)
{
BOOL currentlyEnabled;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment