summaryrefslogtreecommitdiffstats
path: root/tdehtml/misc
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/misc')
-rw-r--r--tdehtml/misc/decoder.h4
-rw-r--r--tdehtml/misc/htmltags.h4
-rw-r--r--tdehtml/misc/loader.cpp26
-rw-r--r--tdehtml/misc/loader.h24
-rw-r--r--tdehtml/misc/maketags4
-rw-r--r--tdehtml/misc/stringit.h4
6 files changed, 33 insertions, 33 deletions
diff --git a/tdehtml/misc/decoder.h b/tdehtml/misc/decoder.h
index 2fcda7904..163e44ca7 100644
--- a/tdehtml/misc/decoder.h
+++ b/tdehtml/misc/decoder.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KHTMLDECODER_H
-#define KHTMLDECODER_H
+#ifndef TDEHTMLDECODER_H
+#define TDEHTMLDECODER_H
#include <tqstring.h>
class TQTextCodec;
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index a2fb0fe55..d8fbb3236 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -1,8 +1,8 @@
/* This file is automatically generated from htmltags.in by maketags, do not edit */
/* Copyright 1999 Lars Knoll */
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
+#ifndef TDEHTML_TAGS_H
+#define TDEHTML_TAGS_H
#include "dom/dom_string.h"
#include <kglobal.h>
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 5cd18f29b..6f19d01aa 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -486,7 +486,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheContro
setAccept( acceptHeader );
m_showAnimations = dl->showAnimations();
- if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
+ if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
m_wasBlocked = true;
CachedObject::finish();
}
@@ -735,13 +735,13 @@ void CachedImage::movieStatus(int status)
}
if((status == TQMovie::EndOfMovie && (!m || m->frameNumber() <= 1)) ||
- ((status == TQMovie::EndOfLoop) && (m_showAnimations == KHTMLSettings::KAnimationLoopOnce)) ||
- ((status == TQMovie::EndOfFrame) && (m_showAnimations == KHTMLSettings::KAnimationDisabled))
+ ((status == TQMovie::EndOfLoop) && (m_showAnimations == TDEHTMLSettings::KAnimationLoopOnce)) ||
+ ((status == TQMovie::EndOfFrame) && (m_showAnimations == TDEHTMLSettings::KAnimationDisabled))
)
{
if(imgSource)
{
- setShowAnimations( KHTMLSettings::KAnimationDisabled );
+ setShowAnimations( TDEHTMLSettings::KAnimationDisabled );
// monochrome alphamasked images are usually about 10000 times
// faster to draw, so this is worth the hack
@@ -779,10 +779,10 @@ void CachedImage::movieResize(const TQSize& /*s*/)
do_notify(m->framePixmap(), TQRect());
}
-void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
+void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
{
m_showAnimations = showAnimations;
- if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) {
+ if ( (m_showAnimations == TDEHTMLSettings::KAnimationDisabled) && imgSource ) {
imgSource->cleanBuffer();
delete p;
p = new TQPixmap(m->framePixmap());
@@ -941,13 +941,13 @@ Request::~Request()
// ------------------------------------------------------------------------------------------
-DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc)
+DocLoader::DocLoader(TDEHTMLPart* part, DocumentImpl* doc)
{
m_cachePolicy = TDEIO::CC_Verify;
m_expireDate = 0;
m_creationDate = time(0);
m_bautoloadImages = true;
- m_showAnimations = KHTMLSettings::KAnimationEnabled;
+ m_showAnimations = TDEHTMLSettings::KAnimationEnabled;
m_part = part;
m_doc = doc;
@@ -1052,8 +1052,8 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co
CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const TQString& charset)
{
DOCLOADER_SECCHECK(true);
- if ( ! KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
- KHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
+ if ( ! TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
+ TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
return 0L;
CachedScript* s = Cache::requestObject<CachedScript, CachedObject::Script>( this, fullURL, 0 );
@@ -1086,7 +1086,7 @@ void DocLoader::setAutoloadImages( bool enable )
}
}
-void DocLoader::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
+void DocLoader::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
{
if ( showAnimations == m_showAnimations ) return;
m_showAnimations = showAnimations;
@@ -1162,7 +1162,7 @@ void Loader::servePendingRequests()
{
job->addMetaData( "referrer", req->m_docLoader->doc()->URL().url() );
- KHTMLPart *part = req->m_docLoader->part();
+ TDEHTMLPart *part = req->m_docLoader->part();
if (part )
{
job->addMetaData( "cross-domain", part->toplevelURL().url() );
@@ -1356,7 +1356,7 @@ void Cache::init()
nullPixmap = new TQPixmap;
if ( !brokenPixmap )
- brokenPixmap = new TQPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
+ brokenPixmap = new TQPixmap(TDEHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState));
if ( !blockedPixmap ) {
blockedPixmap = new TQPixmap();
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index fa00b4ffb..f885ec33e 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -55,7 +55,7 @@
#include <dom/dom_string.h>
class TQMovie;
-class KHTMLPart;
+class TDEHTMLPart;
namespace TDEIO {
class Job;
@@ -183,7 +183,7 @@ namespace tdehtml
CachedObject* m_next;
CachedObject* m_prev;
friend class Cache;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLPart;
};
@@ -286,7 +286,7 @@ namespace tdehtml
const TQString& suggestedTitle() const { return m_suggestedFilename; }
#endif
- void setShowAnimations( KHTMLSettings::KAnimationAdvice );
+ void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
@@ -331,10 +331,10 @@ namespace tdehtml
bool typeChecked : 1;
bool isFullyTransparent : 1;
bool monochrome : 1;
- KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+ TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
friend class Cache;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLPart;
};
/**
@@ -345,7 +345,7 @@ namespace tdehtml
class DocLoader
{
public:
- DocLoader(KHTMLPart*, DOM::DocumentImpl*);
+ DocLoader(TDEHTMLPart*, DOM::DocumentImpl*);
~DocLoader();
CachedImage *requestImage( const DOM::DOMString &url);
@@ -355,16 +355,16 @@ namespace tdehtml
bool autoloadImages() const { return m_bautoloadImages; }
TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; }
- KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
+ TDEHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
time_t expireDate() const { return m_expireDate; }
- KHTMLPart* part() const { return m_part; }
+ TDEHTMLPart* part() const { return m_part; }
DOM::DocumentImpl* doc() const { return m_doc; }
void setCacheCreationDate( time_t );
void setExpireDate( time_t, bool relative );
void setAutoloadImages( bool );
void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
- void setShowAnimations( KHTMLSettings::KAnimationAdvice );
+ void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
void pauseAnimations();
void resumeAnimations();
void insertCachedObject( CachedObject* o ) const;
@@ -375,7 +375,7 @@ namespace tdehtml
friend class Cache;
friend class DOM::DocumentImpl;
- friend class ::KHTMLPart;
+ friend class ::TDEHTMLPart;
TQStringList m_reloadedURLs;
mutable TQPtrDict<CachedObject> m_docObjects;
@@ -383,8 +383,8 @@ namespace tdehtml
time_t m_creationDate;
TDEIO::CacheControl m_cachePolicy;
bool m_bautoloadImages : 1;
- KHTMLSettings::KAnimationAdvice m_showAnimations : 2;
- KHTMLPart* m_part;
+ TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
+ TDEHTMLPart* m_part;
DOM::DocumentImpl* m_doc;
};
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index a460cf8e4..b2b472892 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -37,8 +37,8 @@ print header <<EOF;
/* This file is automatically generated from htmltags.in by maketags, do not edit */
/* Copyright 1999 Lars Knoll */
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
+#ifndef TDEHTML_TAGS_H
+#define TDEHTML_TAGS_H
#include "dom/dom_string.h"
#include <kglobal.h>
diff --git a/tdehtml/misc/stringit.h b/tdehtml/misc/stringit.h
index a93a59e4d..74cdd471e 100644
--- a/tdehtml/misc/stringit.h
+++ b/tdehtml/misc/stringit.h
@@ -23,8 +23,8 @@
//
// KDE HTML Widget -- String class
-#ifndef KHTMLSTRING_H
-#define KHTMLSTRING_H
+#ifndef TDEHTMLSTRING_H
+#define TDEHTMLSTRING_H
#include "dom/dom_string.h"