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/khtmlimage.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/khtmlimage.cpp')
| -rw-r--r-- | khtml/khtmlimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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() |