diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /khtml/html | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khtml/html')
| -rw-r--r-- | khtml/html/html_formimpl.cpp | 10 | ||||
| -rw-r--r-- | khtml/html/htmltokenizer.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index b7ae2a8f4..7477679bc 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -238,7 +238,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) if(view && view->part()) enc = view->part()->encoding(); } - if((codec = KGlobal::charsets()->codecForName(enc.latin1()))) + if((codec = TDEGlobal::charsets()->codecForName(enc.latin1()))) break; } } @@ -305,8 +305,8 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) TQString val = static_cast<HTMLInputElementImpl*>(current)->value().string().stripWhiteSpace(); if (!val.isEmpty() && TQDir::isRelativePath(val) && - TQFile::exists(KGlobalSettings::documentPath() + val)) { - path.setPath(KGlobalSettings::documentPath() + val); + TQFile::exists(TDEGlobalSettings::documentPath() + val)) { + path.setPath(TDEGlobalSettings::documentPath() + val); } else { path = KURL::fromPathOrURL(val); } @@ -1609,8 +1609,8 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis TQString val = value().string(); if (!val.isEmpty() && TQDir::isRelativePath(val) && - TQFile::exists(KGlobalSettings::documentPath() + val)) { - fileurl.setPath(KGlobalSettings::documentPath() + val); + TQFile::exists(TDEGlobalSettings::documentPath() + val)) { + fileurl.setPath(TDEGlobalSettings::documentPath() + val); } else { fileurl = KURL::fromPathOrURL(val); } diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 2329e2325..50e3ea69e 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -129,7 +129,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view) buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; - charsets = KGlobal::charsets(); + charsets = TDEGlobal::charsets(); parser = new KHTMLParser(_view, _doc); m_executingScript = 0; m_autoCloseTimer = 0; @@ -144,7 +144,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; - charsets = KGlobal::charsets(); + charsets = TDEGlobal::charsets(); parser = new KHTMLParser( i, _doc ); m_executingScript = 0; m_autoCloseTimer = 0; |