From ff21f0eee2934c71d725fde493fd28a2a2c8d0dd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:03:29 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- src/modules/qimage/qimage_wrapper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp index f6c6d54..4d549da 100644 --- a/src/modules/qimage/qimage_wrapper.cpp +++ b/src/modules/qimage/qimage_wrapper.cpp @@ -39,7 +39,7 @@ extern "C" { #include #ifdef USE_KDE -static KInstance *instance = 0L; +static TDEInstance *instance = 0L; #endif static void qimage_delete( void *data ) @@ -78,7 +78,7 @@ void init_qimage() { #ifdef USE_KDE if (!instance) { - instance = new KInstance("qimage_prod"); + instance = new TDEInstance("qimage_prod"); KImageIO::registerFormats(); } #endif