diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /khtml/java/kjavaappletviewer.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khtml/java/kjavaappletviewer.cpp')
| -rw-r--r-- | khtml/java/kjavaappletviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index 5948dea22..05c2eb7d0 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -48,10 +48,10 @@ K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory) -KInstance *KJavaAppletViewerFactory::s_instance = 0; +TDEInstance *KJavaAppletViewerFactory::s_instance = 0; KJavaAppletViewerFactory::KJavaAppletViewerFactory () { - s_instance = new KInstance ("kjava"); + s_instance = new TDEInstance ("kjava"); } KJavaAppletViewerFactory::~KJavaAppletViewerFactory () { @@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) { m_browserextension->infoMessage(msg); } -KAboutData* KJavaAppletViewer::createAboutData () { - return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0"); +TDEAboutData* KJavaAppletViewer::createAboutData () { + return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0"); } //--------------------------------------------------------------------- |