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/khtmlimage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'khtml/khtmlimage.cpp') diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index a8ee4d7ef..7782f1786 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -36,11 +36,11 @@ K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory ) -KInstance *KHTMLImageFactory::s_instance = 0; +TDEInstance *KHTMLImageFactory::s_instance = 0; KHTMLImageFactory::KHTMLImageFactory() { - s_instance = new KInstance( "khtmlimage" ); + s_instance = new TDEInstance( "khtmlimage" ); } KHTMLImageFactory::~KHTMLImageFactory() -- cgit v1.2.3