Rename KInstance and KAboutData to avoid conflicts with KDE4

12 years ago · ff21f0eee2
parent d54595ad39
commit ff21f0eee2
1 changed files with 2 additions and 2 deletions
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@ -39,7 +39,7 @@ extern "C" {
 #include <framework/mlt_pool.h>

 #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