summaryrefslogtreecommitdiffstats
path: root/khtml/kmultipart/kmultipart.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /khtml/kmultipart/kmultipart.cpp
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khtml/kmultipart/kmultipart.cpp')
-rw-r--r--khtml/kmultipart/kmultipart.cpp6
1 files changed, 3 insertions, 3 deletions
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 <david@mandrakesoft.com>");
return aboutData;
}