summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/Mainpage.dox2
-rw-r--r--kmail/Makefile.am2
-rw-r--r--kmail/interfaces/htmlwriter.h2
-rw-r--r--kmail/kmmessage.cpp2
-rw-r--r--kmail/kmmessage.h2
-rw-r--r--kmail/kmreaderwin.cpp8
-rw-r--r--kmail/kmreaderwin.h10
-rw-r--r--kmail/tdehtmlparthtmlwriter.cpp2
-rw-r--r--kmail/tdehtmlparthtmlwriter.h12
9 files changed, 21 insertions, 21 deletions
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 42201dad..3121e2d9 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -776,7 +776,7 @@ What happens when a message is to displayed in the reader window?
new way - by using AttachmentStrategy::Hidden). The HTML generation
is delegated to BodyPartFormatters, while the HTML is written to
HTMLWriters, which abstract away HTML sinks. One of those is
- KHTMLPartHTMLWriter, which writes to the KHTMLPart in the
+ TDEHTMLPartHTMLWriter, which writes to the TDEHTMLPart in the
readerwindow. This is the current state of the code. The goal of the
ongoing refactoring is to make the HTML generation blissfully
ignorant of the readerwindow and to allow display plugins that can
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index 5f8cc6e4..1f398140 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
../certmanager/lib/libkleopatra.la $(INDEXLIB) \
../libkcal/libkcal.la \
- $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
+ $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_KABC)
kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
diff --git a/kmail/interfaces/htmlwriter.h b/kmail/interfaces/htmlwriter.h
index 93235016..179841c1 100644
--- a/kmail/interfaces/htmlwriter.h
+++ b/kmail/interfaces/htmlwriter.h
@@ -64,7 +64,7 @@ namespace KMail {
* @deprecated KMail should be ported to Interface::HtmlWriter. This
* interface exposes internal working models. The queueing
* vs. writing() issues exposed here should be hidden by using two
- * different implementations of KHTMLPartHtmlWriter: one for
+ * different implementations of TDEHTMLPartHtmlWriter: one for
* queueing, and one for writing. This should be fixed before the
* release, so we an keep the plugin interface stable.
*
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 5b4f8cf9..da63f203 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -800,7 +800,7 @@ TQString KMMessage::asPlainTextFromObjectTree( partNode *root, bool aStripSignat
// html -> plaintext conversion, if necessary:
if ( isHTML && mDecodeHTML ) {
- KHTMLPart htmlPart;
+ TDEHTMLPart htmlPart;
htmlPart.setOnlyLocalReferences( true );
htmlPart.setMetaRefreshEnabled( false );
htmlPart.setPluginsEnabled( false );
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 5045b0e6..a1600657 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -678,7 +678,7 @@ public:
static TQString generateMessageId( const TQString& addr );
/** Convert '<' into "&lt;" resp. '>' into "&gt;" in order to
- * prevent their interpretation by KHTML.
+ * prevent their interpretation by TDEHTML.
* Does *not* use the TQt replace function but runs a very fast C code
* the same way as lf2crlf() does.
*/
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 2405a3e5..d1c6c0a1 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -393,7 +393,7 @@ void KMReaderWin::createWidgets() {
setStyleDependantFrameWidth();
mBox->setFrameStyle( mMimePartTree->frameStyle() );
mColorBar = new HtmlStatusBar( mBox, "mColorBar" );
- mViewer = new KHTMLPart( mBox, "mViewer" );
+ mViewer = new TDEHTMLPart( mBox, "mViewer" );
mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
mSplitter->setResizeMode( mMimePartTree, TQSplitter::KeepSize );
}
@@ -1033,7 +1033,7 @@ void KMReaderWin::contactStatusChanged( const TQString &uid)
kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl;
kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl;
TQString newPresence = kmkernel->imProxy()->presenceString( uid );
- if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() )
+ if ( newPresence.isNull() ) // TDEHTML crashes if you setNodeValue( TQString() )
newPresence = TQString::fromLatin1( "ENOIMRUNNING" );
n.firstChild().setNodeValue( newPresence );
// kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl;
@@ -2685,7 +2685,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
if ( e->type() == TQEvent::MouseMove ) {
TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
- // Handle this ourselves instead of connecting to mViewer::onURL(), since KHTML misses some
+ // Handle this ourselves instead of connecting to mViewer::onURL(), since TDEHTML misses some
// notifications in case we started a drag ourselves
slotUrlOn( linkForNode( mViewer->nodeUnderMouse() ) );
@@ -2695,7 +2695,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
mCanStartDrag = false;
slotUrlOn( TQString() );
- // HACK: Send a mouse release event to the KHTMLView, as otherwise that will be missed in
+ // HACK: Send a mouse release event to the TDEHTMLView, as otherwise that will be missed in
// case we started a drag. If the event is missed, the HTML view gets into a wrong
// state, in which funny things like unsolicited drags start to happen.
TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index b8dd3f9f..96199452 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -35,7 +35,7 @@ class KSelectAction;
class KRadioAction;
class KToggleAction;
class TDEConfigBase;
-class KHTMLPart;
+class TDEHTMLPart;
class KURL;
class KMFolder;
@@ -239,7 +239,7 @@ public:
bool isFixedFont() { return mUseFixedFont; }
void setUseFixedFont( bool useFixedFont ) { mUseFixedFont = useFixedFont; }
- /** Return the HtmlWriter connected to the KHTMLPart we use */
+ /** Return the HtmlWriter connected to the TDEHTMLPart we use */
KMail::HtmlWriter * htmlWriter() { return mHtmlWriter; }
// Action to reply to a message
@@ -279,9 +279,9 @@ public:
void setUpdateAttachment( bool update = true ) { mAtmUpdate = update; }
- /** Access to the KHTMLPart used for the viewer. Use with
+ /** Access to the TDEHTMLPart used for the viewer. Use with
care! */
- KHTMLPart * htmlPart() const { return mViewer; }
+ TDEHTMLPart * htmlPart() const { return mViewer; }
/** Returns the current message or 0 if none. */
KMMessage* message(KMFolder** folder=0) const;
@@ -554,7 +554,7 @@ private:
TQHBox *mBox;
KMail::HtmlStatusBar *mColorBar;
KMMimePartTree* mMimePartTree;
- KHTMLPart *mViewer;
+ TDEHTMLPart *mViewer;
const KMail::AttachmentStrategy * mAttachmentStrategy;
const KMail::HeaderStrategy * mHeaderStrategy;
diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp
index 7321e128..5450509e 100644
--- a/kmail/tdehtmlparthtmlwriter.cpp
+++ b/kmail/tdehtmlparthtmlwriter.cpp
@@ -46,7 +46,7 @@
namespace KMail {
- KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( KHTMLPart * part,
+ KHtmlPartHtmlWriter::KHtmlPartHtmlWriter( TDEHTMLPart * part,
TQObject * parent, const char * name )
: TQObject( parent, name ), HtmlWriter(),
mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended )
diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h
index 52f16fd4..5d9af2e1 100644
--- a/kmail/tdehtmlparthtmlwriter.h
+++ b/kmail/tdehtmlparthtmlwriter.h
@@ -29,8 +29,8 @@
your version.
*/
-#ifndef __KMAIL_KHTMLPARTHTMLWRITER_H__
-#define __KMAIL_KHTMLPARTHTMLWRITER_H__
+#ifndef __KMAIL_TDEHTMLPARTHTMLWRITER_H__
+#define __KMAIL_TDEHTMLPARTHTMLWRITER_H__
#include "interfaces/htmlwriter.h"
#include <tqobject.h>
@@ -39,7 +39,7 @@
#include <tqtimer.h>
class TQString;
-class KHTMLPart;
+class TDEHTMLPart;
namespace KMail {
@@ -49,7 +49,7 @@ namespace KMail {
public:
// Key is Content-Id, value is URL
typedef TQMap<TQString, TQString> EmbeddedPartMap;
- KHtmlPartHtmlWriter( KHTMLPart * part,
+ KHtmlPartHtmlWriter( TDEHTMLPart * part,
TQObject * parent=0, const char * name = 0 );
virtual ~KHtmlPartHtmlWriter();
@@ -68,7 +68,7 @@ namespace KMail {
void resolveCidUrls();
private:
- KHTMLPart * mHtmlPart;
+ TDEHTMLPart * mHtmlPart;
TQStringList mHtmlQueue;
TQTimer mHtmlTimer;
enum State {
@@ -81,4 +81,4 @@ namespace KMail {
} // namespace KMail
-#endif // __KMAIL_KHTMLPARTHTMLWRITER_H__
+#endif // __KMAIL_TDEHTMLPARTHTMLWRITER_H__
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 10:38:11 +0000