int QWebSettings::fontSize(FontSize type) const
{
- return d->fontSizes.value(type);
+ int defaultValue = 0;
+ if (d->settings) {
+ QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
+ defaultValue = global->fontSizes.value(type);
+ }
+ return d->fontSizes.value(type, defaultValue);
}
void QWebSettings::resetFontSize(FontSize type)
QString QWebSettings::fontFamily(FontType type) const
{
- return d->fontFamilies.value(type);
+ QString defaultValue;
+ if (d->settings) {
+ QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
+ defaultValue = global->fontFamilies.value(type);
+ }
+ return d->fontFamilies.value(type, defaultValue);
}
void QWebSettings::resetFontFamily(FontType type)
bool QWebSettings::testAttribute(WebAttribute attr) const
{
- return d->attributes.value(attr);
+ bool defaultValue = false;
+ if (d->settings) {
+ QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
+ defaultValue = global->attributes.value(attr);
+ }
+ return d->attributes.value(attr, defaultValue);
}
void QWebSettings::clearAttribute(WebAttribute attr)
+2007-11-07 Simon Hausmann <hausmann@kde.org>
+
+ Reviewed by Lars.
+
+ Changed the getter functions in QWebSettings to transparently resolve against the default settings.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettings::fontSize):
+ (QWebSettings::fontFamily):
+ (QWebSettings::testAttribute):
+
2007-11-07 Simon Hausmann <hausmann@kde.org>
Reviewed by Lars.