1 files changed, 8 insertions, 22 deletions

diff --git a/Source/WebKit/qt/Api/qwebsecurityorigin.cpp b/Source/WebKit/qt/Api/qwebsecurityorigin.cpp
index a76ee975c..9b7932cfc 100644
--- a/Source/WebKit/qt/Api/qwebsecurityorigin.cpp
+++ b/Source/WebKit/qt/Api/qwebsecurityorigin.cpp
@@ -22,7 +22,7 @@
 
 #include "ApplicationCacheStorage.h"
 #include "DatabaseManager.h"
-#include "KURL.h"
+#include "URL.h"
 #include "SchemeRegistry.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
@@ -121,11 +121,7 @@ int QWebSecurityOrigin::port() const
 */
 qint64 QWebSecurityOrigin::databaseUsage() const
 {
-#if ENABLE(SQL_DATABASE)
-    return DatabaseManager::manager().usageForOrigin(d->origin.get());
-#else
-    return 0;
-#endif
+    return DatabaseManager::singleton().usageForOrigin(d->origin.get());
 }
 
 /*!
@@ -133,11 +129,7 @@ qint64 QWebSecurityOrigin::databaseUsage() const
 */
 qint64 QWebSecurityOrigin::databaseQuota() const
 {
-#if ENABLE(SQL_DATABASE)
-    return DatabaseManager::manager().quotaForOrigin(d->origin.get());
-#else
-    return 0;
-#endif
+    return DatabaseManager::singleton().quotaForOrigin(d->origin.get());
 }
 
 /*!
@@ -149,14 +141,12 @@ qint64 QWebSecurityOrigin::databaseQuota() const
 */
 void QWebSecurityOrigin::setDatabaseQuota(qint64 quota)
 {
-#if ENABLE(SQL_DATABASE)
-    DatabaseManager::manager().setQuota(d->origin.get(), quota);
-#endif
+    DatabaseManager::singleton().setQuota(d->origin.get(), quota);
 }
 
 void QWebSecurityOrigin::setApplicationCacheQuota(qint64 quota)
 {
-    WebCore::cacheStorage().storeUpdatedQuotaForOrigin(d->origin.get(), quota);
+    WebCore::ApplicationCacheStorage::singleton().storeUpdatedQuotaForOrigin(d->origin.get(), quota);
 }
 /*!
     Destroys the security origin.
@@ -180,15 +170,13 @@ QList<QWebSecurityOrigin> QWebSecurityOrigin::allOrigins()
 {
     QList<QWebSecurityOrigin> webOrigins;
 
-#if ENABLE(SQL_DATABASE)
     Vector<RefPtr<SecurityOrigin> > coreOrigins;
-    DatabaseManager::manager().origins(coreOrigins);
+    DatabaseManager::singleton().origins(coreOrigins);
 
     for (unsigned i = 0; i < coreOrigins.size(); ++i) {
         QWebSecurityOriginPrivate* priv = new QWebSecurityOriginPrivate(coreOrigins[i].get());
         webOrigins.append(priv);
     }
-#endif
 
     return webOrigins;
 }
@@ -200,10 +188,9 @@ QList<QWebDatabase> QWebSecurityOrigin::databases() const
 {
     QList<QWebDatabase> databases;
 
-#if ENABLE(SQL_DATABASE)
     Vector<String> nameVector;
 
-    if (!DatabaseManager::manager().databaseNamesForOrigin(d->origin.get(), nameVector))
+    if (!DatabaseManager::singleton().databaseNamesForOrigin(d->origin.get(), nameVector))
         return databases;
     for (unsigned i = 0; i < nameVector.size(); ++i) {
         QWebDatabasePrivate* priv = new QWebDatabasePrivate();
@@ -212,7 +199,6 @@ QList<QWebDatabase> QWebSecurityOrigin::databases() const
         QWebDatabase webDatabase(priv);
         databases.append(webDatabase);
     }
-#endif
 
     return databases;
 }
@@ -273,7 +259,7 @@ QStringList QWebSecurityOrigin::localSchemes()
 */
 QWebSecurityOrigin::QWebSecurityOrigin(const QUrl& url)
 {
-    d = new QWebSecurityOriginPrivate(SecurityOrigin::create(KURL(url)));
+    d = new QWebSecurityOriginPrivate(SecurityOrigin::create(URL(url)));
 }
 
 /*!