summaryrefslogtreecommitdiffstats
path: root/khtml/html/html_headimpl.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/html/html_headimpl.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/html/html_headimpl.cpp')
-rw-r--r--khtml/html/html_headimpl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/khtml/html/html_headimpl.cpp b/khtml/html/html_headimpl.cpp
index 0f85206b9..d7154e936 100644
--- a/khtml/html/html_headimpl.cpp
+++ b/khtml/html/html_headimpl.cpp
@@ -148,7 +148,7 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
// disabling: recheck alternate status
TQString rel = getAttribute(ATTR_REL).string().lower();
TQString type = getAttribute(ATTR_TYPE).string().lower();
- m_alternate = (type.tqcontains("text/css") || rel.tqcontains("stylesheet")) && rel.tqcontains("alternate");
+ m_alternate = (type.contains("text/css") || rel.contains("stylesheet")) && rel.contains("alternate");
}
if (isLoading())
break;
@@ -179,19 +179,19 @@ void HTMLLinkElementImpl::process()
// IE extension: location of small icon for locationbar / bookmarks
// Uses both "shortcut icon" and "icon"
- if ( part && rel.tqcontains("icon") && !m_url.isEmpty() && !part->parentPart())
+ if ( part && rel.contains("icon") && !m_url.isEmpty() && !part->parentPart())
part->browserExtension()->setIconURL( KURL(m_url.string()) );
// Stylesheet
else if (!m_isDisabled &&
- (type.tqcontains("text/css") || rel.tqcontains("stylesheet"))) {
+ (type.contains("text/css") || rel.contains("stylesheet"))) {
// no need to load style sheets which aren't for the screen output
// ### there may be in some situations e.g. for an editor or script to manipulate
- if( m_media.isNull() || m_media.tqcontains("screen") || m_media.tqcontains("all") || m_media.tqcontains("print") ) {
+ if( m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print") ) {
m_loading = true;
// Add ourselves as a pending sheet, but only if we aren't an alternate
// stylesheet. Alternate stylesheets don't hold up render tree construction.
- m_alternate = rel.tqcontains("alternate");
+ m_alternate = rel.contains("alternate");
if (!isAlternate())
getDocument()->addPendingSheet();
@@ -572,7 +572,7 @@ void HTMLStyleElementImpl::childrenChanged()
m_loading = false;
if ((m_type.isEmpty() || m_type == "text/css") // Type must be empty or CSS
- && (m_media.isNull() || m_media.tqcontains("screen") || m_media.tqcontains("all") || m_media.tqcontains("print"))) {
+ && (m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print"))) {
getDocument()->addPendingSheet();
m_loading = true;
m_sheet = new CSSStyleSheetImpl(this);