Rename KInstance and KAboutData to avoid conflicts with KDE4

master
Timothy Pearson 12 years ago
parent d54595ad39
commit ff21f0eee2

@ -39,7 +39,7 @@ extern "C" {
#include <framework/mlt_pool.h> #include <framework/mlt_pool.h>
#ifdef USE_KDE #ifdef USE_KDE
static KInstance *instance = 0L; static TDEInstance *instance = 0L;
#endif #endif
static void qimage_delete( void *data ) static void qimage_delete( void *data )
@ -78,7 +78,7 @@ void init_qimage()
{ {
#ifdef USE_KDE #ifdef USE_KDE
if (!instance) { if (!instance) {
instance = new KInstance("qimage_prod"); instance = new TDEInstance("qimage_prod");
KImageIO::registerFormats(); KImageIO::registerFormats();
} }
#endif #endif

Loading…
Cancel
Save