From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- khtml/kmultipart/kmultipart.cpp | 6 +++--- khtml/kmultipart/kmultipart.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'khtml/kmultipart') diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 55f37f397..65be07e83 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo() emit m_extension->infoMessage( str ); } -KAboutData* KMultiPart::createAboutData() +TDEAboutData* KMultiPart::createAboutData() { - KAboutData* aboutData = new KAboutData( "kmultipart", I18N_NOOP("KMultiPart"), + TDEAboutData* aboutData = new TDEAboutData( "kmultipart", I18N_NOOP("KMultiPart"), "0.1", I18N_NOOP( "Embeddable component for multipart/mixed" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2001, David Faure "); return aboutData; } diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index f3bf95219..7ba5ba2fe 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -29,7 +29,7 @@ #include class KHTMLPart; -class KInstance; +class TDEInstance; class KTempFile; class KLineParser; @@ -49,7 +49,7 @@ public: virtual bool closeURL(); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); protected: virtual void guiActivateEvent( KParts::GUIActivateEvent *e ); -- cgit v1.2.1