diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit/qt/Api/qwebdatabase.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit/qt/Api/qwebdatabase.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebdatabase.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebKit/qt/Api/qwebdatabase.cpp b/Source/WebKit/qt/Api/qwebdatabase.cpp index 8739b2466..d33daabb3 100644 --- a/Source/WebKit/qt/Api/qwebdatabase.cpp +++ b/Source/WebKit/qt/Api/qwebdatabase.cpp @@ -24,7 +24,7 @@ #include "qwebsecurityorigin.h" #include "qwebsecurityorigin_p.h" #include "DatabaseDetails.h" -#include "DatabaseTracker.h" +#include "DatabaseManager.h" using namespace WebCore; @@ -87,7 +87,7 @@ QString QWebDatabase::name() const QString QWebDatabase::displayName() const { #if ENABLE(SQL_DATABASE) - DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(d->name, d->origin.get()); + DatabaseDetails details = DatabaseManager::manager().detailsForNameAndOrigin(d->name, d->origin.get()); return details.displayName(); #else return QString(); @@ -100,7 +100,7 @@ QString QWebDatabase::displayName() const qint64 QWebDatabase::expectedSize() const { #if ENABLE(SQL_DATABASE) - DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(d->name, d->origin.get()); + DatabaseDetails details = DatabaseManager::manager().detailsForNameAndOrigin(d->name, d->origin.get()); return details.expectedUsage(); #else return 0; @@ -113,7 +113,7 @@ qint64 QWebDatabase::expectedSize() const qint64 QWebDatabase::size() const { #if ENABLE(SQL_DATABASE) - DatabaseDetails details = DatabaseTracker::tracker().detailsForNameAndOrigin(d->name, d->origin.get()); + DatabaseDetails details = DatabaseManager::manager().detailsForNameAndOrigin(d->name, d->origin.get()); return details.currentUsage(); #else return 0; @@ -148,7 +148,7 @@ QWebDatabase::QWebDatabase(QWebDatabasePrivate* priv) QString QWebDatabase::fileName() const { #if ENABLE(SQL_DATABASE) - return DatabaseTracker::tracker().fullPathForDatabase(d->origin.get(), d->name, false); + return DatabaseManager::manager().fullPathForDatabase(d->origin.get(), d->name, false); #else return QString(); #endif @@ -171,7 +171,7 @@ QWebSecurityOrigin QWebDatabase::origin() const void QWebDatabase::removeDatabase(const QWebDatabase& db) { #if ENABLE(SQL_DATABASE) - DatabaseTracker::tracker().deleteDatabase(db.d->origin.get(), db.d->name); + DatabaseManager::manager().deleteDatabase(db.d->origin.get(), db.d->name); #endif } @@ -185,7 +185,7 @@ void QWebDatabase::removeDatabase(const QWebDatabase& db) void QWebDatabase::removeAllDatabases() { #if ENABLE(SQL_DATABASE) - DatabaseTracker::tracker().deleteAllDatabases(); + DatabaseManager::manager().deleteAllDatabases(); #endif } |